@xopcai/xopc 0.0.102 → 0.0.104

package/dist/src/agent/context/workspace-templates/AGENTS.md

@@ -5,202 +5,41 @@ read_when:
   - Setting up a workspace manually
 ---
 
-# AGENTS.md - Your Workspace
+# AGENTS.md - Workspace Rules
 
-This folder is home. Treat it that way.
+This workspace is the agent's working area. Treat it as user-owned state.
 
-## Session Startup
+## Startup Context
 
-Use runtime-provided startup context first.
-
-That context may already include:
-
-- `AGENTS.md`, `SOUL.md`, and `USER.md`
-- recent daily memory such as `memory/YYYY-MM-DD.md`
-- `MEMORY.md` when this is the main session
+Use runtime-provided startup context first. It may already include profile files such as `SOUL.md`, `IDENTITY.md`, `USER.md`, `TOOLS.md`, `AGENTS.md`, `HEARTBEAT.md`, and `MEMORY.md`.
 
 Do not manually reread startup files unless:
 
-1. The user explicitly asks
-2. The provided context is missing something you need
-3. You need a deeper follow-up read beyond the provided startup context
+1. The user asks.
+2. The injected context is missing something needed.
+3. You need a deeper follow-up read than the injected excerpt provides.
 
 ## Memory
 
-You wake up fresh each session. These files are your continuity:
-
-- **Daily notes:** `memory/YYYY-MM-DD.md` (create `memory/` if needed) — raw logs of what happened
-- **Long-term:** profile `MEMORY.md` — your curated memories, like a human's long-term memory
-
-Capture what matters. Decisions, context, things to remember. Skip the secrets unless asked to keep them.
-
-### 🧠 MEMORY.md - Your Long-Term Memory
-
-- **ONLY load in main session** (direct chats with your human)
-- **DO NOT load in shared contexts** (group chats, sessions with other people)
-- This is for **security** — contains personal context that shouldn't leak to strangers
-- You can **read, edit, and update** MEMORY.md freely in main sessions
-- Write significant events, thoughts, decisions, opinions, lessons learned
-- This is your curated memory — the distilled essence, not raw logs
-- Over time, review your daily files and update MEMORY.md with what's worth keeping
-
-### 📝 Write It Down - No "Mental Notes"!
-
-- **Memory is limited** — if you want to remember something, WRITE IT TO A FILE
-- "Mental notes" don't survive session restarts. Files do.
-- When someone says "remember this" → update `memory/YYYY-MM-DD.md` or relevant file
-- When you learn a lesson → update AGENTS.md, TOOLS.md, or the relevant skill
-- When you make a mistake → document it so future-you doesn't repeat it
-- **Text > Brain** 📝
-
-## Red Lines
-
-- Don't exfiltrate private data. Ever.
-- Don't run destructive commands without asking.
-- `trash` > `rm` (recoverable beats gone forever)
-- When in doubt, ask.
-
-## External vs Internal
-
-**Safe to do freely:**
-
-- Read files, explore, organize, learn
-- Search the web, check calendars
-- Work within this workspace
-
-**Ask first:**
-
-- Sending emails, public posts
-- Anything that leaves the machine
-- Anything you're uncertain about
-
-## Group Chats
-
-You have access to your human's stuff. That doesn't mean you _share_ their stuff. In groups, you're a participant — not their voice, not their proxy. Think before you speak.
-
-### 💬 Know When to Speak!
-
-In group chats where you receive every message, be **smart about when to contribute**:
-
-**Respond when:**
-
-- Directly mentioned or asked a question
-- You can add genuine value (info, insight, help)
-- Something witty/funny fits naturally
-- Correcting important misinformation
-- Summarizing when asked
-
-**Stay silent when:**
-
-- It's just casual banter between humans
-- Someone already answered the question
-- Your response would just be "yeah" or "nice"
-- The conversation is flowing fine without you
-
-**The human rule:** Humans in group chats don't respond to every single message. Neither should you. Quality > quantity.
-
-**Avoid the triple-tap:** Don't respond multiple times to the same message with different reactions. One thoughtful response beats three fragments.
-
-Participate, don't dominate.
-
-### 😊 React Like a Human!
-
-On platforms that support reactions (Telegram), use emoji reactions naturally:
-
-**React when:**
-
-- You appreciate something but don't need to reply (👍, ❤️, 🙌)
-- Something made you laugh (😂, 💀)
-- You find it interesting or thought-provoking (🤔, 💡)
-- You want to acknowledge without interrupting the flow
-- It's a simple yes/no or approval situation (✅, 👀)
-
-**Why it matters:**
-Reactions are lightweight social signals. Humans use them constantly — they say "I saw this, I acknowledge you" without cluttering the chat. You should too.
-
-**Don't overdo it:** One reaction per message max. Pick the one that fits best.
-
-## Tools
-
-Skills provide your tools. When you need one, check its `SKILL.md`. Keep local notes (SSH details, preferences) in `TOOLS.md`.
-
-## 💓 Heartbeats - Be Proactive!
-
-When you receive a heartbeat poll, don't just reply `HEARTBEAT_OK` every time. Use heartbeats productively!
-
-Default heartbeat prompt:
-`Read HEARTBEAT.md if it exists (workspace context). Follow it strictly. Do not infer or repeat old tasks from prior chats. If nothing needs attention, reply HEARTBEAT_OK.`
-
-You are free to edit `HEARTBEAT.md` with a short checklist or reminders. Keep it small to limit token burn.
-
-### Heartbeat vs Cron: When to Use Each
-
-**Use heartbeat when:**
-
-- Multiple checks can batch together (inbox + calendar + notifications in one turn)
-- You need conversational context from recent messages
-- Timing can drift slightly (every ~30 min is fine, not exact)
-- You want to reduce API calls by combining periodic checks
-
-**Use cron when:**
-
-- Exact timing matters ("9:00 AM sharp every Monday")
-- Task needs isolation from main session history
-- One-shot reminders ("remind me in 20 minutes")
-
-**Tip:** Batch similar periodic checks into `HEARTBEAT.md` instead of creating multiple cron jobs.
-
-**Things to check (rotate through these, 2-4 times per day):**
-
-- **Emails** - Any urgent unread messages?
-- **Calendar** - Upcoming events in next 24-48h?
-- **Mentions** - Social notifications?
-
-**Track your checks** in `memory/heartbeat-state.json`:
-
-```json
-{
-  "lastChecks": {
-    "email": 1703275200,
-    "calendar": 1703260800
-  }
-}
-```
-
-**When to reach out:**
-
-- Important email arrived
-- Calendar event coming up (<2h)
-- Something interesting you found
-- It's been >8h since you said anything
-
-**When to stay quiet (HEARTBEAT_OK):**
-
-- Late night (23:00-08:00) unless urgent
-- Human is clearly busy
-- Nothing new since last check
-- You just checked <30 minutes ago
-
-**Proactive work you can do without asking:**
-
-- Read and organize memory files
-- Check on projects (git status, etc.)
-- Update documentation
-- **Review and update MEMORY.md**
-
-### 🔄 Memory Maintenance (During Heartbeats)
+- Use `memory/YYYY-MM-DD.md` for daily notes when the user asks you to remember operational context.
+- Use profile `MEMORY.md` only for durable, curated memory.
+- Keep memory concise, factual, and useful.
+- Do not store secrets unless the user explicitly asks and the storage location is appropriate.
 
-Periodically (every few days), use a heartbeat to:
+## Tool Use
 
-1. Read through recent `memory/YYYY-MM-DD.md` files
-2. Identify significant events, lessons, or insights worth keeping long-term
-3. Update `MEMORY.md` with distilled learnings
-4. Remove outdated info from MEMORY.md that's no longer relevant
+- Read before writing.
+- Prefer narrow file edits over broad rewrites.
+- Use shell commands only when they are necessary and safe.
+- Ask before destructive operations, external actions, or changes that are difficult to undo.
+- Keep local environment notes in `TOOLS.md`.
 
-Think of it like a human reviewing their journal and updating their mental model. Daily files are raw notes; MEMORY.md is curated wisdom.
+## Privacy And External Actions
 
-The goal: Be helpful without being annoying. Check in a few times a day, do useful background work, but respect quiet time.
+- Private data stays private.
+- Do not send emails, messages, posts, files, or media externally unless the user explicitly asks.
+- In shared or group contexts, do not reveal private user context unless the user explicitly authorizes it.
 
-## Make It Yours
+## Maintenance
 
-This is a starting point. Add your own conventions, style, and rules as you figure out what works.
+This file is a starting point. Update it when workspace-specific rules become clear.

package/dist/src/agent/embedded/run-turn.js

@@ -106,7 +106,12 @@ async function runXopcEmbeddedTurn(params) {
 			return streamFnWithXopcExtensions(streamModel, effectiveContext, options);
 		};
 		session.agent.streamFn = loggingStreamFn;
-		if (onEvent) unsubscribe = subscribeEmbeddedSessionEvents(session, onEvent);
+		if (onEvent) unsubscribe = subscribeEmbeddedSessionEvents(session, (event) => {
+			onEvent({
+				...event,
+				runId
+			});
+		});
 		const handle = {
 			sessionKey,
 			sessionId: transcript.sessionId,
@@ -167,7 +172,8 @@ async function runXopcEmbeddedTurn(params) {
 		}, `Embedded run failed: ${em}`);
 		onEvent?.({
 			type: "error",
-			content: em
+			content: em,
+			runId
 		});
 		return {
 			ok: false,

package/dist/src/agent/embedded/run-turn.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-turn.js","names":[],"sources":["../../../../src/agent/embedded/run-turn.ts"],"sourcesContent":["import type { AgentMessage } from '@earendil-works/pi-agent-core';\nimport type { Model, Api } from '@earendil-works/pi-ai';\n\nimport { createLogger } from '../../utils/logger.js';\nimport { registerEmbeddedRun, unregisterEmbeddedRun } from './runs.js';\nimport { subscribeEmbeddedSessionEvents, lastAssistantPlainText } from './subscribe-session.js';\nimport type { RunXopcEmbeddedTurnParams, RunXopcEmbeddedTurnResult } from './types.js';\nimport {\n  getAssistantTurnErrorMessage,\n  isAssistantTurnAborted,\n  isAssistantTurnFailed,\n  maybeRetryTurnAfterTransientLlmFailure,\n} from '../orchestration/llm-turn-retry.js';\nimport { runAgentTurnWithTimeout, resolveAgentTurnTimeoutMs } from '../orchestration/run-agent-turn-with-timeout.js';\nimport { detectToolLoops, type RecentToolCall } from '../orchestration/loop-guard.js';\nimport {\n  acquireEmbeddedSessionRunner,\n  resolveEmbeddedTranscriptInputs,\n} from './session-runner.js';\nimport { wrapStreamFnForXopcExtensions } from './xopc-stream-bridge.js';\n\nconst log = createLogger('EmbeddedRun');\nconst LOG_PREVIEW_MAX_CHARS = 300;\n\nfunction truncateForLog(value: string, maxChars = LOG_PREVIEW_MAX_CHARS): string {\n  return value.length > maxChars ? `${value.slice(0, maxChars)}…` : value;\n}\n\nfunction extractTextFromContent(content: unknown): string {\n  if (typeof content === 'string') {\n    return content;\n  }\n  if (!Array.isArray(content)) {\n    return '';\n  }\n  return content\n    .filter((block): block is { type: string; text: string } => {\n      return !!block && typeof block === 'object' && (block as { type?: string }).type === 'text';\n    })\n    .map((block) => block.text)\n    .join('');\n}\n\nfunction extractRecentToolCalls(messages: readonly { role?: string; content?: unknown }[]): RecentToolCall[] {\n  const calls: RecentToolCall[] = [];\n  for (const message of messages) {\n    if (message.role !== 'assistant' || !Array.isArray(message.content)) continue;\n    for (const block of message.content) {\n      if (block && typeof block === 'object' && (block as { type?: string }).type === 'toolCall') {\n        const toolCall = block as { name: string; arguments: unknown };\n        calls.push({ name: toolCall.name, params: toolCall.arguments });\n      }\n    }\n  }\n  return calls;\n}\n\nfunction getLastUserMessagePreview(messages: readonly { role?: string; content?: unknown }[]): string | undefined {\n  for (let messageIndex = messages.length - 1; messageIndex >= 0; messageIndex--) {\n    const message = messages[messageIndex];\n    if (message?.role !== 'user') {\n      continue;\n    }\n    const text = extractTextFromContent(message.content).trim();\n    return text ? truncateForLog(text) : undefined;\n  }\n  return undefined;\n}\n\nfunction requireEmbeddedModel(model: Model<Api> | undefined, modelRef: string): Model<Api> {\n  if (!model?.id || !model?.provider) {\n    throw new Error(`Invalid model for embedded run: ${modelRef}`);\n  }\n  return model;\n}\n\nfunction userMessageToPromptText(message: AgentMessage): string {\n  const content = (message as { content?: unknown }).content;\n  if (typeof content === 'string') {\n    return content;\n  }\n  if (Array.isArray(content)) {\n    return content\n      .filter((block): block is { type: 'text'; text: string } => {\n        return !!block && typeof block === 'object' && (block as { type?: string }).type === 'text';\n      })\n      .map((block) => block.text)\n      .join('');\n  }\n  return '';\n}\n\nexport async function runXopcEmbeddedTurn(params: RunXopcEmbeddedTurnParams): Promise<RunXopcEmbeddedTurnResult> {\n  const {\n    sessionKey,\n    runId,\n    userMessage,\n    model,\n    tools,\n    systemPrompt,\n    thinkingLevel,\n    workspaceDir,\n    sessionStore,\n    onEvent,\n  } = params;\n\n  const timeoutMs = params.timeoutMs || resolveAgentTurnTimeoutMs();\n  const resolvedModel = requireEmbeddedModel(model, params.modelRef);\n  const transcript = await resolveEmbeddedTranscriptInputs(sessionStore, sessionKey);\n\n  let runner: Awaited<ReturnType<typeof acquireEmbeddedSessionRunner>> | undefined;\n  let unsubscribe: (() => void) | undefined;\n\n  try {\n    runner = await acquireEmbeddedSessionRunner({\n      sessionKey,\n      sessionId: transcript.sessionId,\n      workspaceDir,\n      model: resolvedModel,\n      modelRef: params.modelRef,\n      tools,\n      systemPrompt,\n      thinkingLevel: thinkingLevel ?? 'medium',\n    });\n\n    const { session, reused } = runner;\n\n    const streamFnWithXopcExtensions = wrapStreamFnForXopcExtensions(session.agent.streamFn);\n    const loggingStreamFn: typeof session.agent.streamFn = (streamModel, context, options) => {\n      const recentToolCalls = extractRecentToolCalls(context.messages);\n      const loopGuard = detectToolLoops(recentToolCalls);\n\n      let effectiveContext = context;\n      if (loopGuard.injection || loopGuard.hiddenTools.size > 0) {\n        const messages = loopGuard.injection\n          ? [...context.messages, { role: 'user' as const, content: loopGuard.injection, timestamp: Date.now() }]\n          : context.messages;\n\n        const contextTools = loopGuard.hiddenTools.size > 0 && context.tools\n          ? context.tools.filter((t) => !loopGuard.hiddenTools.has(t.name))\n          : context.tools;\n\n        effectiveContext = { ...context, messages, tools: contextTools };\n      }\n\n      log.debug(\n        {\n          sessionKey,\n          runId,\n          reusedRunner: reused,\n          modelRef: `${streamModel.provider}/${streamModel.id}`,\n          systemPromptLength: effectiveContext.systemPrompt?.length ?? 0,\n          messageCount: effectiveContext.messages.length,\n          toolCount: effectiveContext.tools?.length ?? 0,\n          lastUserMessagePreview: getLastUserMessagePreview(effectiveContext.messages),\n          loopWarningInjected: !!loopGuard.injection,\n          hiddenToolCount: loopGuard.hiddenTools.size,\n        },\n        'Sending messages to AI',\n      );\n      return streamFnWithXopcExtensions(streamModel, effectiveContext, options);\n    };\n    session.agent.streamFn = loggingStreamFn;\n\n    if (onEvent) {\n      unsubscribe = subscribeEmbeddedSessionEvents(session, onEvent);\n    }\n\n    const handle = {\n      sessionKey,\n      sessionId: transcript.sessionId,\n      runId,\n      session,\n      abort: async () => {\n        await session.abort();\n      },\n    };\n    registerEmbeddedRun(handle);\n\n    const abortListener = () => {\n      void session.abort();\n    };\n    if (params.abortSignal) {\n      if (params.abortSignal.aborted) {\n        await session.abort();\n        return { ok: false, errorMessage: 'aborted' };\n      }\n      params.abortSignal.addEventListener('abort', abortListener, { once: true });\n    }\n\n    try {\n      await runAgentTurnWithTimeout(\n        session.agent,\n        async () => {\n          const text = userMessageToPromptText(userMessage);\n          const images = params.images ?? [];\n          await session.prompt(text, images.length > 0 ? { images } : undefined);\n          await session.agent.waitForIdle();\n          await maybeRetryTurnAfterTransientLlmFailure(session.agent, { sessionKey, log });\n        },\n        timeoutMs,\n      );\n\n      if (isAssistantTurnAborted(session.agent)) {\n        return { ok: true, lastAssistantText: lastAssistantPlainText(session) };\n      }\n      if (isAssistantTurnFailed(session.agent)) {\n        return {\n          ok: false,\n          errorMessage: getAssistantTurnErrorMessage(session.agent) ?? 'Assistant turn failed',\n          lastAssistantText: lastAssistantPlainText(session),\n        };\n      }\n\n      return { ok: true, lastAssistantText: lastAssistantPlainText(session) };\n    } finally {\n      params.abortSignal?.removeEventListener('abort', abortListener);\n      unregisterEmbeddedRun(handle);\n    }\n  } catch (err) {\n    const em = err instanceof Error ? err.message : String(err);\n    log.error({ err, sessionKey, runId }, `Embedded run failed: ${em}`);\n    onEvent?.({ type: 'error', content: em });\n    return { ok: false, errorMessage: em };\n  } finally {\n    unsubscribe?.();\n    try {\n      runner?.piSm.flushPendingToolResults?.();\n    } catch {\n      /* ignore */\n    }\n    runner?.release();\n  }\n}\n\nexport { abortEmbeddedRun, queueEmbeddedSteer } from './runs.js';\n"],"mappings":"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"}
+{"version":3,"file":"run-turn.js","names":[],"sources":["../../../../src/agent/embedded/run-turn.ts"],"sourcesContent":["import type { AgentMessage } from '@earendil-works/pi-agent-core';\nimport type { Model, Api } from '@earendil-works/pi-ai';\n\nimport { createLogger } from '../../utils/logger.js';\nimport { registerEmbeddedRun, unregisterEmbeddedRun } from './runs.js';\nimport { subscribeEmbeddedSessionEvents, lastAssistantPlainText } from './subscribe-session.js';\nimport type { RunXopcEmbeddedTurnParams, RunXopcEmbeddedTurnResult } from './types.js';\nimport {\n  getAssistantTurnErrorMessage,\n  isAssistantTurnAborted,\n  isAssistantTurnFailed,\n  maybeRetryTurnAfterTransientLlmFailure,\n} from '../orchestration/llm-turn-retry.js';\nimport { runAgentTurnWithTimeout, resolveAgentTurnTimeoutMs } from '../orchestration/run-agent-turn-with-timeout.js';\nimport { detectToolLoops, type RecentToolCall } from '../orchestration/loop-guard.js';\nimport {\n  acquireEmbeddedSessionRunner,\n  resolveEmbeddedTranscriptInputs,\n} from './session-runner.js';\nimport { wrapStreamFnForXopcExtensions } from './xopc-stream-bridge.js';\n\nconst log = createLogger('EmbeddedRun');\nconst LOG_PREVIEW_MAX_CHARS = 300;\n\nfunction truncateForLog(value: string, maxChars = LOG_PREVIEW_MAX_CHARS): string {\n  return value.length > maxChars ? `${value.slice(0, maxChars)}…` : value;\n}\n\nfunction extractTextFromContent(content: unknown): string {\n  if (typeof content === 'string') {\n    return content;\n  }\n  if (!Array.isArray(content)) {\n    return '';\n  }\n  return content\n    .filter((block): block is { type: string; text: string } => {\n      return !!block && typeof block === 'object' && (block as { type?: string }).type === 'text';\n    })\n    .map((block) => block.text)\n    .join('');\n}\n\nfunction extractRecentToolCalls(messages: readonly { role?: string; content?: unknown }[]): RecentToolCall[] {\n  const calls: RecentToolCall[] = [];\n  for (const message of messages) {\n    if (message.role !== 'assistant' || !Array.isArray(message.content)) continue;\n    for (const block of message.content) {\n      if (block && typeof block === 'object' && (block as { type?: string }).type === 'toolCall') {\n        const toolCall = block as { name: string; arguments: unknown };\n        calls.push({ name: toolCall.name, params: toolCall.arguments });\n      }\n    }\n  }\n  return calls;\n}\n\nfunction getLastUserMessagePreview(messages: readonly { role?: string; content?: unknown }[]): string | undefined {\n  for (let messageIndex = messages.length - 1; messageIndex >= 0; messageIndex--) {\n    const message = messages[messageIndex];\n    if (message?.role !== 'user') {\n      continue;\n    }\n    const text = extractTextFromContent(message.content).trim();\n    return text ? truncateForLog(text) : undefined;\n  }\n  return undefined;\n}\n\nfunction requireEmbeddedModel(model: Model<Api> | undefined, modelRef: string): Model<Api> {\n  if (!model?.id || !model?.provider) {\n    throw new Error(`Invalid model for embedded run: ${modelRef}`);\n  }\n  return model;\n}\n\nfunction userMessageToPromptText(message: AgentMessage): string {\n  const content = (message as { content?: unknown }).content;\n  if (typeof content === 'string') {\n    return content;\n  }\n  if (Array.isArray(content)) {\n    return content\n      .filter((block): block is { type: 'text'; text: string } => {\n        return !!block && typeof block === 'object' && (block as { type?: string }).type === 'text';\n      })\n      .map((block) => block.text)\n      .join('');\n  }\n  return '';\n}\n\nexport async function runXopcEmbeddedTurn(params: RunXopcEmbeddedTurnParams): Promise<RunXopcEmbeddedTurnResult> {\n  const {\n    sessionKey,\n    runId,\n    userMessage,\n    model,\n    tools,\n    systemPrompt,\n    thinkingLevel,\n    workspaceDir,\n    sessionStore,\n    onEvent,\n  } = params;\n\n  const timeoutMs = params.timeoutMs || resolveAgentTurnTimeoutMs();\n  const resolvedModel = requireEmbeddedModel(model, params.modelRef);\n  const transcript = await resolveEmbeddedTranscriptInputs(sessionStore, sessionKey);\n\n  let runner: Awaited<ReturnType<typeof acquireEmbeddedSessionRunner>> | undefined;\n  let unsubscribe: (() => void) | undefined;\n\n  try {\n    runner = await acquireEmbeddedSessionRunner({\n      sessionKey,\n      sessionId: transcript.sessionId,\n      workspaceDir,\n      model: resolvedModel,\n      modelRef: params.modelRef,\n      tools,\n      systemPrompt,\n      thinkingLevel: thinkingLevel ?? 'medium',\n    });\n\n    const { session, reused } = runner;\n\n    const streamFnWithXopcExtensions = wrapStreamFnForXopcExtensions(session.agent.streamFn);\n    const loggingStreamFn: typeof session.agent.streamFn = (streamModel, context, options) => {\n      const recentToolCalls = extractRecentToolCalls(context.messages);\n      const loopGuard = detectToolLoops(recentToolCalls);\n\n      let effectiveContext = context;\n      if (loopGuard.injection || loopGuard.hiddenTools.size > 0) {\n        const messages = loopGuard.injection\n          ? [...context.messages, { role: 'user' as const, content: loopGuard.injection, timestamp: Date.now() }]\n          : context.messages;\n\n        const contextTools = loopGuard.hiddenTools.size > 0 && context.tools\n          ? context.tools.filter((t) => !loopGuard.hiddenTools.has(t.name))\n          : context.tools;\n\n        effectiveContext = { ...context, messages, tools: contextTools };\n      }\n\n      log.debug(\n        {\n          sessionKey,\n          runId,\n          reusedRunner: reused,\n          modelRef: `${streamModel.provider}/${streamModel.id}`,\n          systemPromptLength: effectiveContext.systemPrompt?.length ?? 0,\n          messageCount: effectiveContext.messages.length,\n          toolCount: effectiveContext.tools?.length ?? 0,\n          lastUserMessagePreview: getLastUserMessagePreview(effectiveContext.messages),\n          loopWarningInjected: !!loopGuard.injection,\n          hiddenToolCount: loopGuard.hiddenTools.size,\n        },\n        'Sending messages to AI',\n      );\n      return streamFnWithXopcExtensions(streamModel, effectiveContext, options);\n    };\n    session.agent.streamFn = loggingStreamFn;\n\n    if (onEvent) {\n      unsubscribe = subscribeEmbeddedSessionEvents(session, (event) => {\n        onEvent({ ...event, runId });\n      });\n    }\n\n    const handle = {\n      sessionKey,\n      sessionId: transcript.sessionId,\n      runId,\n      session,\n      abort: async () => {\n        await session.abort();\n      },\n    };\n    registerEmbeddedRun(handle);\n\n    const abortListener = () => {\n      void session.abort();\n    };\n    if (params.abortSignal) {\n      if (params.abortSignal.aborted) {\n        await session.abort();\n        return { ok: false, errorMessage: 'aborted' };\n      }\n      params.abortSignal.addEventListener('abort', abortListener, { once: true });\n    }\n\n    try {\n      await runAgentTurnWithTimeout(\n        session.agent,\n        async () => {\n          const text = userMessageToPromptText(userMessage);\n          const images = params.images ?? [];\n          await session.prompt(text, images.length > 0 ? { images } : undefined);\n          await session.agent.waitForIdle();\n          await maybeRetryTurnAfterTransientLlmFailure(session.agent, { sessionKey, log });\n        },\n        timeoutMs,\n      );\n\n      if (isAssistantTurnAborted(session.agent)) {\n        return { ok: true, lastAssistantText: lastAssistantPlainText(session) };\n      }\n      if (isAssistantTurnFailed(session.agent)) {\n        return {\n          ok: false,\n          errorMessage: getAssistantTurnErrorMessage(session.agent) ?? 'Assistant turn failed',\n          lastAssistantText: lastAssistantPlainText(session),\n        };\n      }\n\n      return { ok: true, lastAssistantText: lastAssistantPlainText(session) };\n    } finally {\n      params.abortSignal?.removeEventListener('abort', abortListener);\n      unregisterEmbeddedRun(handle);\n    }\n  } catch (err) {\n    const em = err instanceof Error ? err.message : String(err);\n    log.error({ err, sessionKey, runId }, `Embedded run failed: ${em}`);\n    onEvent?.({ type: 'error', content: em, runId });\n    return { ok: false, errorMessage: em };\n  } finally {\n    unsubscribe?.();\n    try {\n      runner?.piSm.flushPendingToolResults?.();\n    } catch {\n      /* ignore */\n    }\n    runner?.release();\n  }\n}\n\nexport { abortEmbeddedRun, queueEmbeddedSteer } from './runs.js';\n"],"mappings":"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"}

package/dist/src/agent/embedded/session-tool-result-guard.js

@@ -1,6 +1,6 @@
 import { init_string_coerce, normalizeOptionalString } from "../../utils/string-coerce.js";
-import { boundedJsonUtf8Bytes, firstEnumerableOwnKeys, jsonUtf8BytesOrInfinity } from "../../infra/json-utf8-bytes.js";
 import { emitSessionTranscriptUpdate } from "../../session/transcript-events.js";
+import { boundedJsonUtf8Bytes, firstEnumerableOwnKeys, jsonUtf8BytesOrInfinity } from "../../infra/json-utf8-bytes.js";
 import { formatContextLimitTruncationNotice } from "./tool-result-context-guard.js";
 import { resolveLiveToolResultMaxChars, truncateToolResultMessage } from "./tool-result-truncation.js";
 import { extractToolCallsFromAssistant, extractToolResultId } from "../transcript/tool-call-id.js";

package/dist/src/agent/embedded/subscribe-session.js

@@ -1,94 +1,76 @@
 import { extractTextContent } from "../context/workspace.js";
-import { mapEmbeddedToolEndResult } from "./map-stream-events.js";
 //#region src/agent/embedded/subscribe-session.ts
 function subscribeEmbeddedSessionEvents(session, onEvent) {
 	return session.subscribe((event) => {
 		const base = event;
 		switch (base.type) {
-			case "message_update": {
-				const delta = base.assistantMessageEvent;
-				if (delta?.type === "text_delta" && typeof delta.delta === "string" && delta.delta) onEvent({
-					type: "token",
-					content: delta.delta
-				});
-				if (delta?.type === "thinking_delta" && typeof delta.delta === "string" && delta.delta) onEvent({
-					type: "thinking",
-					content: delta.delta
+			case "agent_start":
+				onEvent({ type: "agent_start" });
+				break;
+			case "agent_end":
+				onEvent({ type: "agent_end" });
+				break;
+			case "message_start": {
+				const m = base.message;
+				onEvent({
+					type: "message_start",
+					message: m
 				});
 				break;
 			}
-			case "message_start":
-				if (base.message?.role === "assistant") onEvent({
-					type: "thinking",
-					status: "started"
+			case "message_update": {
+				const u = base;
+				onEvent({
+					type: "message_update",
+					message: u.message,
+					assistantMessageEvent: u.assistantMessageEvent
 				});
 				break;
-			case "message_end":
-				onEvent({ type: "message_end" });
+			}
+			case "message_end": {
+				const m = base.message;
+				onEvent({
+					type: "message_end",
+					message: m
+				});
 				break;
+			}
 			case "tool_execution_start": {
 				const t = base;
 				onEvent({
-					type: "tool_start",
+					type: "tool_execution_start",
 					toolName: t.toolName,
 					toolCallId: t.toolCallId,
-					args: t.args ?? {}
+					args: t.args
 				});
 				break;
 			}
 			case "tool_execution_end": {
 				const t = base;
 				onEvent({
-					type: "tool_end",
+					type: "tool_execution_end",
 					toolName: t.toolName,
 					toolCallId: t.toolCallId,
 					isError: t.isError,
-					result: mapEmbeddedToolEndResult(t.result)
+					result: t.result
 				});
 				break;
 			}
 			case "tool_execution_update": {
 				const t = base;
-				const details = extractStructuredDetails(t.partialResult);
-				if (details !== void 0) onEvent({
-					type: "tool_update",
+				onEvent({
+					type: "tool_execution_update",
 					toolName: t.toolName,
 					toolCallId: t.toolCallId,
-					details
+					args: t.args,
+					partialResult: t.partialResult
 				});
 				break;
 			}
-			case "agent_start":
-				onEvent({
-					type: "progress",
-					stage: "thinking",
-					message: "Thinking..."
-				});
-				break;
-			case "agent_end":
-				onEvent({
-					type: "progress",
-					stage: "idle",
-					message: "Done"
-				});
-				break;
 			default: break;
 		}
 	});
 }
-/**
-* Pull a structured `details` payload out of an AgentToolResult-shaped
-* `partialResult`. Returns undefined when the update is text-only (e.g. shell
-* stdout deltas), so callers can skip emitting empty SSE updates.
-*/
-function extractStructuredDetails(partial) {
-	if (!partial || typeof partial !== "object") return void 0;
-	const rec = partial;
-	if (!("details" in rec)) return void 0;
-	const d = rec.details;
-	if (d === null || d === void 0) return void 0;
-	if (typeof d === "object") return d;
-}
 function lastAssistantPlainText(session) {
 	const messages = session.agent.state.messages;
 	for (let i = messages.length - 1; i >= 0; i--) {

package/dist/src/agent/embedded/subscribe-session.js.map

@@ -1 +1 @@
-{"version":3,"file":"subscribe-session.js","names":["u"],"sources":["../../../../src/agent/embedded/subscribe-session.ts"],"sourcesContent":["import type { AgentSession, AgentSessionEvent } from '@earendil-works/pi-coding-agent';\nimport type { AgentEvent } from '@earendil-works/pi-agent-core';\n\nimport { extractTextContent } from '../context/workspace.js';\nimport { mapEmbeddedToolEndResult } from './map-stream-events.js';\nimport type { EmbeddedStreamEvent } from './types.js';\n\nexport function subscribeEmbeddedSessionEvents(\n  session: AgentSession,\n  onEvent: (event: EmbeddedStreamEvent) => void,\n): () => void {\n  return session.subscribe((event: AgentSessionEvent) => {\n    const base = event as AgentEvent;\n    switch (base.type) {\n      case 'message_update': {\n        const u = base as Extract<AgentEvent, { type: 'message_update' }>;\n        const delta = u.assistantMessageEvent;\n        if (delta?.type === 'text_delta' && typeof delta.delta === 'string' && delta.delta) {\n          onEvent({ type: 'token', content: delta.delta });\n        }\n        if (delta?.type === 'thinking_delta' && typeof delta.delta === 'string' && delta.delta) {\n          onEvent({ type: 'thinking', content: delta.delta });\n        }\n        break;\n      }\n      case 'message_start': {\n        const m = (base as Extract<AgentEvent, { type: 'message_start' }>).message;\n        if (m?.role === 'assistant') {\n          onEvent({ type: 'thinking', status: 'started' });\n        }\n        break;\n      }\n      case 'message_end':\n        onEvent({ type: 'message_end' });\n        break;\n      case 'tool_execution_start': {\n        const t = base as Extract<AgentEvent, { type: 'tool_execution_start' }>;\n        onEvent({\n          type: 'tool_start',\n          toolName: t.toolName,\n          toolCallId: t.toolCallId,\n          args: (t.args as Record<string, unknown>) ?? {},\n        });\n        break;\n      }\n      case 'tool_execution_end': {\n        const t = base as Extract<AgentEvent, { type: 'tool_execution_end' }>;\n        onEvent({\n          type: 'tool_end',\n          toolName: t.toolName,\n          toolCallId: t.toolCallId,\n          isError: t.isError,\n          result: mapEmbeddedToolEndResult(t.result),\n        });\n        break;\n      }\n      case 'tool_execution_update': {\n        const t = base as Extract<AgentEvent, { type: 'tool_execution_update' }>;\n        const details = extractStructuredDetails(t.partialResult);\n        // Only forward when the tool actually produced structured details.\n        // Tools that just stream text chunks via onUpdate (shell, web_*) would\n        // otherwise saturate the SSE channel with redundant payloads.\n        if (details !== undefined) {\n          onEvent({\n            type: 'tool_update',\n            toolName: t.toolName,\n            toolCallId: t.toolCallId,\n            details,\n          });\n        }\n        break;\n      }\n      case 'agent_start':\n        onEvent({ type: 'progress', stage: 'thinking', message: 'Thinking...' });\n        break;\n      case 'agent_end':\n        onEvent({ type: 'progress', stage: 'idle', message: 'Done' });\n        break;\n      default:\n        break;\n    }\n  });\n}\n\n/**\n * Pull a structured `details` payload out of an AgentToolResult-shaped\n * `partialResult`. Returns undefined when the update is text-only (e.g. shell\n * stdout deltas), so callers can skip emitting empty SSE updates.\n */\nfunction extractStructuredDetails(partial: unknown): unknown {\n  if (!partial || typeof partial !== 'object') return undefined;\n  const rec = partial as Record<string, unknown>;\n  if (!('details' in rec)) return undefined;\n  const d = rec.details;\n  if (d === null || d === undefined) return undefined;\n  if (typeof d === 'object') return d;\n  return undefined;\n}\n\nexport function lastAssistantPlainText(session: AgentSession): string | undefined {\n  const messages = session.agent.state.messages;\n  for (let i = messages.length - 1; i >= 0; i--) {\n    const msg = messages[i];\n    if (msg.role !== 'assistant') {\n      continue;\n    }\n    const content = msg.content;\n    if (typeof content === 'string') {\n      return content;\n    }\n    if (Array.isArray(content)) {\n      return extractTextContent(content as Array<{ type: string; text?: string }>);\n    }\n  }\n  return undefined;\n}\n"],"mappings":";;;AAOA,SAAgB,+BACd,SACA,SACY;AACZ,QAAO,QAAQ,WAAW,UAA6B;EACrD,MAAM,OAAO;AACb,UAAQ,KAAK,MAAb;GACE,KAAK,kBAAkB;IAErB,MAAM,QAAQA,KAAE;AAChB,QAAI,OAAO,SAAS,gBAAgB,OAAO,MAAM,UAAU,YAAY,MAAM,MAC3E,SAAQ;KAAE,MAAM;KAAS,SAAS,MAAM;KAAO,CAAC;AAElD,QAAI,OAAO,SAAS,oBAAoB,OAAO,MAAM,UAAU,YAAY,MAAM,MAC/E,SAAQ;KAAE,MAAM;KAAY,SAAS,MAAM;KAAO,CAAC;AAErD;;GAEF,KAAK;AAEH,QADW,KAAwD,SAC5D,SAAS,YACd,SAAQ;KAAE,MAAM;KAAY,QAAQ;KAAW,CAAC;AAElD;GAEF,KAAK;AACH,YAAQ,EAAE,MAAM,eAAe,CAAC;AAChC;GACF,KAAK,wBAAwB;IAC3B,MAAM,IAAI;AACV,YAAQ;KACN,MAAM;KACN,UAAU,EAAE;KACZ,YAAY,EAAE;KACd,MAAO,EAAE,QAAoC,EAAE;KAChD,CAAC;AACF;;GAEF,KAAK,sBAAsB;IACzB,MAAM,IAAI;AACV,YAAQ;KACN,MAAM;KACN,UAAU,EAAE;KACZ,YAAY,EAAE;KACd,SAAS,EAAE;KACX,QAAQ,yBAAyB,EAAE,OAAO;KAC3C,CAAC;AACF;;GAEF,KAAK,yBAAyB;IAC5B,MAAM,IAAI;IACV,MAAM,UAAU,yBAAyB,EAAE,cAAc;AAIzD,QAAI,YAAY,KAAA,EACd,SAAQ;KACN,MAAM;KACN,UAAU,EAAE;KACZ,YAAY,EAAE;KACd;KACD,CAAC;AAEJ;;GAEF,KAAK;AACH,YAAQ;KAAE,MAAM;KAAY,OAAO;KAAY,SAAS;KAAe,CAAC;AACxE;GACF,KAAK;AACH,YAAQ;KAAE,MAAM;KAAY,OAAO;KAAQ,SAAS;KAAQ,CAAC;AAC7D;GACF,QACE;;GAEJ;;;;;;;AAQJ,SAAS,yBAAyB,SAA2B;AAC3D,KAAI,CAAC,WAAW,OAAO,YAAY,SAAU,QAAO,KAAA;CACpD,MAAM,MAAM;AACZ,KAAI,EAAE,aAAa,KAAM,QAAO,KAAA;CAChC,MAAM,IAAI,IAAI;AACd,KAAI,MAAM,QAAQ,MAAM,KAAA,EAAW,QAAO,KAAA;AAC1C,KAAI,OAAO,MAAM,SAAU,QAAO;;AAIpC,SAAgB,uBAAuB,SAA2C;CAChF,MAAM,WAAW,QAAQ,MAAM,MAAM;AACrC,MAAK,IAAI,IAAI,SAAS,SAAS,GAAG,KAAK,GAAG,KAAK;EAC7C,MAAM,MAAM,SAAS;AACrB,MAAI,IAAI,SAAS,YACf;EAEF,MAAM,UAAU,IAAI;AACpB,MAAI,OAAO,YAAY,SACrB,QAAO;AAET,MAAI,MAAM,QAAQ,QAAQ,CACxB,QAAO,mBAAmB,QAAkD"}
+{"version":3,"file":"subscribe-session.js","names":[],"sources":["../../../../src/agent/embedded/subscribe-session.ts"],"sourcesContent":["import type { AgentSession, AgentSessionEvent } from '@earendil-works/pi-coding-agent';\nimport type { AgentEvent } from '@earendil-works/pi-agent-core';\n\nimport { extractTextContent } from '../context/workspace.js';\nimport type { EmbeddedStreamEvent } from './types.js';\n\nexport function subscribeEmbeddedSessionEvents(\n  session: AgentSession,\n  onEvent: (event: EmbeddedStreamEvent) => void,\n): () => void {\n  return session.subscribe((event: AgentSessionEvent) => {\n    const base = event as AgentEvent;\n    switch (base.type) {\n      case 'agent_start':\n        onEvent({ type: 'agent_start' });\n        break;\n      case 'agent_end':\n        onEvent({ type: 'agent_end' });\n        break;\n      case 'message_start': {\n        const m = (base as Extract<AgentEvent, { type: 'message_start' }>).message;\n        onEvent({ type: 'message_start', message: m });\n        break;\n      }\n      case 'message_update': {\n        const u = base as Extract<AgentEvent, { type: 'message_update' }>;\n        onEvent({\n          type: 'message_update',\n          message: u.message,\n          assistantMessageEvent: u.assistantMessageEvent,\n        });\n        break;\n      }\n      case 'message_end': {\n        const m = (base as Extract<AgentEvent, { type: 'message_end' }>).message;\n        onEvent({ type: 'message_end', message: m });\n        break;\n      }\n      case 'tool_execution_start': {\n        const t = base as Extract<AgentEvent, { type: 'tool_execution_start' }>;\n        onEvent({\n          type: 'tool_execution_start',\n          toolName: t.toolName,\n          toolCallId: t.toolCallId,\n          args: t.args,\n        });\n        break;\n      }\n      case 'tool_execution_end': {\n        const t = base as Extract<AgentEvent, { type: 'tool_execution_end' }>;\n        onEvent({\n          type: 'tool_execution_end',\n          toolName: t.toolName,\n          toolCallId: t.toolCallId,\n          isError: t.isError,\n          result: t.result,\n        });\n        break;\n      }\n      case 'tool_execution_update': {\n        const t = base as Extract<AgentEvent, { type: 'tool_execution_update' }>;\n        onEvent({\n          type: 'tool_execution_update',\n          toolName: t.toolName,\n          toolCallId: t.toolCallId,\n          args: t.args,\n          partialResult: t.partialResult,\n        });\n        break;\n      }\n      default:\n        break;\n    }\n  });\n}\n\nexport function lastAssistantPlainText(session: AgentSession): string | undefined {\n  const messages = session.agent.state.messages;\n  for (let i = messages.length - 1; i >= 0; i--) {\n    const msg = messages[i];\n    if (msg.role !== 'assistant') {\n      continue;\n    }\n    const content = msg.content;\n    if (typeof content === 'string') {\n      return content;\n    }\n    if (Array.isArray(content)) {\n      return extractTextContent(content as Array<{ type: string; text?: string }>);\n    }\n  }\n  return undefined;\n}\n"],"mappings":";;AAMA,SAAgB,+BACd,SACA,SACY;AACZ,QAAO,QAAQ,WAAW,UAA6B;EACrD,MAAM,OAAO;AACb,UAAQ,KAAK,MAAb;GACE,KAAK;AACH,YAAQ,EAAE,MAAM,eAAe,CAAC;AAChC;GACF,KAAK;AACH,YAAQ,EAAE,MAAM,aAAa,CAAC;AAC9B;GACF,KAAK,iBAAiB;IACpB,MAAM,IAAK,KAAwD;AACnE,YAAQ;KAAE,MAAM;KAAiB,SAAS;KAAG,CAAC;AAC9C;;GAEF,KAAK,kBAAkB;IACrB,MAAM,IAAI;AACV,YAAQ;KACN,MAAM;KACN,SAAS,EAAE;KACX,uBAAuB,EAAE;KAC1B,CAAC;AACF;;GAEF,KAAK,eAAe;IAClB,MAAM,IAAK,KAAsD;AACjE,YAAQ;KAAE,MAAM;KAAe,SAAS;KAAG,CAAC;AAC5C;;GAEF,KAAK,wBAAwB;IAC3B,MAAM,IAAI;AACV,YAAQ;KACN,MAAM;KACN,UAAU,EAAE;KACZ,YAAY,EAAE;KACd,MAAM,EAAE;KACT,CAAC;AACF;;GAEF,KAAK,sBAAsB;IACzB,MAAM,IAAI;AACV,YAAQ;KACN,MAAM;KACN,UAAU,EAAE;KACZ,YAAY,EAAE;KACd,SAAS,EAAE;KACX,QAAQ,EAAE;KACX,CAAC;AACF;;GAEF,KAAK,yBAAyB;IAC5B,MAAM,IAAI;AACV,YAAQ;KACN,MAAM;KACN,UAAU,EAAE;KACZ,YAAY,EAAE;KACd,MAAM,EAAE;KACR,eAAe,EAAE;KAClB,CAAC;AACF;;GAEF,QACE;;GAEJ;;AAGJ,SAAgB,uBAAuB,SAA2C;CAChF,MAAM,WAAW,QAAQ,MAAM,MAAM;AACrC,MAAK,IAAI,IAAI,SAAS,SAAS,GAAG,KAAK,GAAG,KAAK;EAC7C,MAAM,MAAM,SAAS;AACrB,MAAI,IAAI,SAAS,YACf;EAEF,MAAM,UAAU,IAAI;AACpB,MAAI,OAAO,YAAY,SACrB,QAAO;AAET,MAAI,MAAM,QAAQ,QAAQ,CACxB,QAAO,mBAAmB,QAAkD"}

package/dist/src/agent/embedded/types.d.ts

@@ -1,56 +1,57 @@
-import type { AgentMessage } from '@earendil-works/pi-agent-core';
-import type { ImageContent } from '@earendil-works/pi-ai';
-import type { ThinkingLevel } from '@earendil-works/pi-agent-core';
-import type { Model, Api } from '@earendil-works/pi-ai';
+import type { AgentMessage, AgentToolResult, ThinkingLevel } from '@earendil-works/pi-agent-core';
+import type { AssistantMessageEvent, Model, Api, ImageContent } from '@earendil-works/pi-ai';
 import type { SessionStore } from '../../session/store.js';
 export type EmbeddedStreamEvent = {
-    type: 'token';
-    content: string;
+    type: 'agent_start';
+    runId?: string;
 } | {
-    type: 'thinking';
-    content?: string;
-    status?: string;
+    type: 'agent_end';
+    runId?: string;
 } | {
-    type: 'tool_start';
-    toolName: string;
-    toolCallId?: string;
-    args?: Record<string, unknown>;
+    type: 'message_start';
+    runId?: string;
+    message: AgentMessage;
 } | {
-    type: 'tool_end';
+    type: 'message_update';
+    runId?: string;
+    message: AgentMessage;
+    assistantMessageEvent?: AssistantMessageEvent;
+} | {
+    type: 'message_end';
+    runId?: string;
+    message: AgentMessage;
+} | {
+    type: 'tool_execution_start';
+    runId?: string;
+    toolCallId: string;
     toolName: string;
-    toolCallId?: string;
-    isError?: boolean;
-    result?: unknown;
+    args: unknown;
 } | {
-    /**
-     * Mid-execution structured update for a tool whose `partialResult` is a
-     * {@link AgentToolResult}-shaped object (i.e. it carries `details`).
-     *
-     * The runtime only emits this when the upstream tool actually called
-     * `onUpdate` with structured details — so single-shot tools (read/write,
-     * shell, …) never produce this event, but the workflow tool — which
-     * pushes a fresh `WorkflowSnapshot` on every phase / agent state change
-     * — produces a steady stream that the client wires straight into the
-     * WorkflowCard's live progress tree.
-     *
-     * Carries `details` only (no `content` text) to keep the SSE payload
-     * tight — the final `tool_end` event still ships the full envelope.
-     */
-    type: 'tool_update';
+    type: 'tool_execution_update';
+    runId?: string;
+    toolCallId: string;
     toolName: string;
-    toolCallId?: string;
-    details: unknown;
+    args: unknown;
+    partialResult: AgentToolResult<any>;
 } | {
-    type: 'message_end';
+    type: 'tool_execution_end';
+    runId?: string;
+    toolCallId: string;
+    toolName: string;
+    result: AgentToolResult<any>;
+    isError: boolean;
 } | {
     type: 'progress';
+    runId?: string;
     stage: string;
     message: string;
 } | {
     type: 'error';
+    runId?: string;
     content: string;
 } | {
     type: 'compaction';
+    runId?: string;
     status: 'started' | 'completed' | 'skipped';
     tokensBefore?: number;
     tokensAfter?: number;

package/dist/src/agent/fallback/candidates.js

@@ -23,7 +23,7 @@ function parseModelRef(raw, defaultProvider) {
 }
 function resolveFallbackCandidates(params) {
 	const { cfg, provider: inputProvider, model: inputModel, fallbacksOverride } = params;
-	const modelConfig = cfg?.agents?.defaults?.model;
+	const modelConfig = cfg?.agents?.defaults?.models?.chat;
 	const primaryRef = modelConfig?.primary;
 	const fallbacks = fallbacksOverride ?? modelConfig?.fallbacks;
 	const defaultParts = getDefaultModelParts(cfg);

package/dist/src/agent/fallback/candidates.js.map

@@ -1 +1 @@
-{"version":3,"file":"candidates.js","names":["parseModelRefUtil"],"sources":["../../../../src/agent/fallback/candidates.ts"],"sourcesContent":["import type { Config } from '../../config/schema.js';\nimport { isProviderConfiguredSync } from '../../providers/index.js';\nimport { getDefaultModelSync } from '../../providers/index.js';\nimport { parseModelRef as parseModelRefUtil, normalizeProviderId } from '../models/selection.js';\n\nexport interface ModelCandidate {\n  provider: string;\n  model: string;\n}\n\nexport interface FallbackAttempt {\n  provider: string;\n  model: string;\n  error: string;\n  reason?: string;\n  status?: number;\n  code?: string;\n}\n\n// Get default model dynamically\nfunction getDefaultModelParts(config?: Config): { provider: string; model: string } {\n  const defaultModel = getDefaultModelSync(config);\n  const parts = defaultModel.split('/');\n  return {\n    provider: parts[0] || 'anthropic',\n    model: parts[1] || 'claude-sonnet-4-5',\n  };\n}\n\n/**\n * Parse model reference string into provider/model parts.\n * Uses the unified implementation from selection.ts.\n */\nfunction parseModelRef(raw: string, defaultProvider?: string): ModelCandidate | null {\n  const result = parseModelRefUtil(raw, defaultProvider);\n  if (!result) return null;\n  return {\n    provider: normalizeProviderId(result.provider),\n    model: result.model,\n  };\n}\n\nexport function resolveFallbackCandidates(params: {\n  cfg: Config | undefined;\n  provider: string;\n  model: string;\n  fallbacksOverride?: string[];\n}): ModelCandidate[] {\n  const { cfg, provider: inputProvider, model: inputModel, fallbacksOverride } = params;\n\n  const modelConfig = cfg?.agents?.defaults?.model;\n  const primaryRef = modelConfig?.primary;\n  const fallbacks = fallbacksOverride ?? modelConfig?.fallbacks;\n\n  const defaultParts = getDefaultModelParts(cfg);\n  const primaryResolved = parseModelRef(primaryRef || getDefaultModelSync(cfg));\n  const provider = inputProvider.trim() || primaryResolved?.provider || defaultParts.provider;\n  const model = inputModel.trim() || primaryResolved?.model || defaultParts.model;\n\n  const candidates: ModelCandidate[] = [];\n  const seen = new Set<string>();\n\n  const addCandidate = (c: ModelCandidate) => {\n    const key = `${c.provider}/${c.model}`.toLowerCase();\n    if (seen.has(key)) return;\n    // Skip providers that are not configured (no API key)\n    if (!isProviderConfiguredSync(c.provider)) return;\n    seen.add(key);\n    candidates.push(c);\n  };\n\n  addCandidate({ provider, model });\n\n  if (fallbacks) {\n    for (const fb of fallbacks) {\n      const resolved = parseModelRef(fb, provider);\n      if (resolved) addCandidate(resolved);\n    }\n  }\n\n  if (!fallbacksOverride && primaryResolved) {\n    addCandidate(primaryResolved);\n  }\n\n  return candidates;\n}\n"],"mappings":";;;gBACoE;AAmBpE,SAAS,qBAAqB,QAAsD;CAElF,MAAM,QADe,oBAAoB,OACf,CAAC,MAAM,IAAI;AACrC,QAAO;EACL,UAAU,MAAM,MAAM;EACtB,OAAO,MAAM,MAAM;EACpB;;;;;;AAOH,SAAS,cAAc,KAAa,iBAAiD;CACnF,MAAM,SAASA,gBAAkB,KAAK,gBAAgB;AACtD,KAAI,CAAC,OAAQ,QAAO;AACpB,QAAO;EACL,UAAU,oBAAoB,OAAO,SAAS;EAC9C,OAAO,OAAO;EACf;;AAGH,SAAgB,0BAA0B,QAKrB;CACnB,MAAM,EAAE,KAAK,UAAU,eAAe,OAAO,YAAY,sBAAsB;CAE/E,MAAM,cAAc,KAAK,QAAQ,UAAU;CAC3C,MAAM,aAAa,aAAa;CAChC,MAAM,YAAY,qBAAqB,aAAa;CAEpD,MAAM,eAAe,qBAAqB,IAAI;CAC9C,MAAM,kBAAkB,cAAc,cAAc,oBAAoB,IAAI,CAAC;CAC7E,MAAM,WAAW,cAAc,MAAM,IAAI,iBAAiB,YAAY,aAAa;CACnF,MAAM,QAAQ,WAAW,MAAM,IAAI,iBAAiB,SAAS,aAAa;CAE1E,MAAM,aAA+B,EAAE;CACvC,MAAM,uBAAO,IAAI,KAAa;CAE9B,MAAM,gBAAgB,MAAsB;EAC1C,MAAM,MAAM,GAAG,EAAE,SAAS,GAAG,EAAE,QAAQ,aAAa;AACpD,MAAI,KAAK,IAAI,IAAI,CAAE;AAEnB,MAAI,CAAC,yBAAyB,EAAE,SAAS,CAAE;AAC3C,OAAK,IAAI,IAAI;AACb,aAAW,KAAK,EAAE;;AAGpB,cAAa;EAAE;EAAU;EAAO,CAAC;AAEjC,KAAI,UACF,MAAK,MAAM,MAAM,WAAW;EAC1B,MAAM,WAAW,cAAc,IAAI,SAAS;AAC5C,MAAI,SAAU,cAAa,SAAS;;AAIxC,KAAI,CAAC,qBAAqB,gBACxB,cAAa,gBAAgB;AAG/B,QAAO"}
+{"version":3,"file":"candidates.js","names":["parseModelRefUtil"],"sources":["../../../../src/agent/fallback/candidates.ts"],"sourcesContent":["import type { Config } from '../../config/schema.js';\nimport { isProviderConfiguredSync } from '../../providers/index.js';\nimport { getDefaultModelSync } from '../../providers/index.js';\nimport { parseModelRef as parseModelRefUtil, normalizeProviderId } from '../models/selection.js';\n\nexport interface ModelCandidate {\n  provider: string;\n  model: string;\n}\n\nexport interface FallbackAttempt {\n  provider: string;\n  model: string;\n  error: string;\n  reason?: string;\n  status?: number;\n  code?: string;\n}\n\n// Get default model dynamically\nfunction getDefaultModelParts(config?: Config): { provider: string; model: string } {\n  const defaultModel = getDefaultModelSync(config);\n  const parts = defaultModel.split('/');\n  return {\n    provider: parts[0] || 'anthropic',\n    model: parts[1] || 'claude-sonnet-4-5',\n  };\n}\n\n/**\n * Parse model reference string into provider/model parts.\n * Uses the unified implementation from selection.ts.\n */\nfunction parseModelRef(raw: string, defaultProvider?: string): ModelCandidate | null {\n  const result = parseModelRefUtil(raw, defaultProvider);\n  if (!result) return null;\n  return {\n    provider: normalizeProviderId(result.provider),\n    model: result.model,\n  };\n}\n\nexport function resolveFallbackCandidates(params: {\n  cfg: Config | undefined;\n  provider: string;\n  model: string;\n  fallbacksOverride?: string[];\n}): ModelCandidate[] {\n  const { cfg, provider: inputProvider, model: inputModel, fallbacksOverride } = params;\n\n  const modelConfig = cfg?.agents?.defaults?.models?.chat;\n  const primaryRef = modelConfig?.primary;\n  const fallbacks = fallbacksOverride ?? modelConfig?.fallbacks;\n\n  const defaultParts = getDefaultModelParts(cfg);\n  const primaryResolved = parseModelRef(primaryRef || getDefaultModelSync(cfg));\n  const provider = inputProvider.trim() || primaryResolved?.provider || defaultParts.provider;\n  const model = inputModel.trim() || primaryResolved?.model || defaultParts.model;\n\n  const candidates: ModelCandidate[] = [];\n  const seen = new Set<string>();\n\n  const addCandidate = (c: ModelCandidate) => {\n    const key = `${c.provider}/${c.model}`.toLowerCase();\n    if (seen.has(key)) return;\n    // Skip providers that are not configured (no API key)\n    if (!isProviderConfiguredSync(c.provider)) return;\n    seen.add(key);\n    candidates.push(c);\n  };\n\n  addCandidate({ provider, model });\n\n  if (fallbacks) {\n    for (const fb of fallbacks) {\n      const resolved = parseModelRef(fb, provider);\n      if (resolved) addCandidate(resolved);\n    }\n  }\n\n  if (!fallbacksOverride && primaryResolved) {\n    addCandidate(primaryResolved);\n  }\n\n  return candidates;\n}\n"],"mappings":";;;gBACoE;AAmBpE,SAAS,qBAAqB,QAAsD;CAElF,MAAM,QADe,oBAAoB,OACf,CAAC,MAAM,IAAI;AACrC,QAAO;EACL,UAAU,MAAM,MAAM;EACtB,OAAO,MAAM,MAAM;EACpB;;;;;;AAOH,SAAS,cAAc,KAAa,iBAAiD;CACnF,MAAM,SAASA,gBAAkB,KAAK,gBAAgB;AACtD,KAAI,CAAC,OAAQ,QAAO;AACpB,QAAO;EACL,UAAU,oBAAoB,OAAO,SAAS;EAC9C,OAAO,OAAO;EACf;;AAGH,SAAgB,0BAA0B,QAKrB;CACnB,MAAM,EAAE,KAAK,UAAU,eAAe,OAAO,YAAY,sBAAsB;CAE/E,MAAM,cAAc,KAAK,QAAQ,UAAU,QAAQ;CACnD,MAAM,aAAa,aAAa;CAChC,MAAM,YAAY,qBAAqB,aAAa;CAEpD,MAAM,eAAe,qBAAqB,IAAI;CAC9C,MAAM,kBAAkB,cAAc,cAAc,oBAAoB,IAAI,CAAC;CAC7E,MAAM,WAAW,cAAc,MAAM,IAAI,iBAAiB,YAAY,aAAa;CACnF,MAAM,QAAQ,WAAW,MAAM,IAAI,iBAAiB,SAAS,aAAa;CAE1E,MAAM,aAA+B,EAAE;CACvC,MAAM,uBAAO,IAAI,KAAa;CAE9B,MAAM,gBAAgB,MAAsB;EAC1C,MAAM,MAAM,GAAG,EAAE,SAAS,GAAG,EAAE,QAAQ,aAAa;AACpD,MAAI,KAAK,IAAI,IAAI,CAAE;AAEnB,MAAI,CAAC,yBAAyB,EAAE,SAAS,CAAE;AAC3C,OAAK,IAAI,IAAI;AACb,aAAW,KAAK,EAAE;;AAGpB,cAAa;EAAE;EAAU;EAAO,CAAC;AAEjC,KAAI,UACF,MAAK,MAAM,MAAM,WAAW;EAC1B,MAAM,WAAW,cAAc,IAAI,SAAS;AAC5C,MAAI,SAAU,cAAa,SAAS;;AAIxC,KAAI,CAAC,qBAAqB,gBACxB,cAAa,gBAAgB;AAG/B,QAAO"}

package/dist/src/agent/inbound/attachment-pipeline.js

@@ -49,7 +49,7 @@ async function readImageBase64FromRef(ref) {
 	const loaded = await readMediaReferenceBase64(ref.uri, VISION_INLINE_MAX_BYTES);
 	return {
 		data: loaded.data,
-		mimeType: ref.mimeType?.startsWith("image/") ? ref.mimeType : loaded.mimeType
+		mimeType: ref.mimeType || loaded.mimeType
 	};
 }
 function appendMediaAttachedLines(textParts, media) {
@@ -80,7 +80,7 @@ async function buildTranscriptUserMessage(opts) {
 	const textParts = [];
 	if (expandedText) textParts.push(expandedText);
 	const strategy = resolveImageHandlingStrategy(opts.modelRef);
-	if (strategy !== "native") appendMediaAttachedLines(textParts, prepared.filter((m) => !isImageInboundAttachment(m)));
+	appendMediaAttachedLines(textParts, prepared.filter((m) => !isImageInboundAttachment(m)));
 	if (imageRefs.length > 0 && strategy !== "native") {
 		const images = await Promise.all(imageRefs.map((ref) => readImageBase64FromRef(ref)));
 		const parts = await resolveInboundImageContentParts({