@xopcai/xopc 0.0.99 → 0.0.100

package/dist/src/agent/service/build-direct-message-content.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-direct-message-content.js","names":[],"sources":["../../../../src/agent/service/build-direct-message-content.ts"],"sourcesContent":["import type { Config } from '../../config/schema.js';\nimport { getAgentDefaultModelRef } from '../../config/schema.js';\nimport { getDefaultModelSync } from '../../providers/index.js';\nimport { formatInboundFileTextBlock } from '../../channels/attachments/inbound-persist.js';\nimport { expandAtFileMentionsInPlainText } from '../context/expand-at-file-mentions.js';\nimport { resolveInboundImageContentParts } from '../image/inbound-image-handling.js';\nimport { resolveAgentHomeDir, resolveDefaultAgentId } from '../agent-scope.js';\nimport { extractProfileAgentId } from '../../config/agent-profile.js';\nimport type { AgentInstanceGateway } from '../agent-instance-gateway.js';\nimport type { ModelManager } from '../models/index.js';\n\nexport type DirectInboundAttachment = {\n  type: string;\n  mimeType?: string;\n  data?: string;\n  name?: string;\n  size?: number;\n  workspaceRelativePath?: string;\n};\n\nexport type DirectMessagePart =\n  | { type: 'text'; text: string }\n  | { type: 'image'; data: string; mimeType: string };\n\n/**\n * Build user message parts (text + resolved images/files) for direct / webchat turns.\n */\nexport async function buildDirectUserMessageContent(opts: {\n  content: string;\n  attachments?: DirectInboundAttachment[];\n  sessionKey?: string;\n  config: Config;\n  agentManager: AgentInstanceGateway;\n  modelManager: ModelManager;\n}): Promise<DirectMessagePart[]> {\n  const { content, attachments, sessionKey, config, agentManager, modelManager } = opts;\n  const messageContent: DirectMessagePart[] = [];\n  const sk = sessionKey ?? '';\n\n  if (content.trim()) {\n    let textPart = content;\n    if (/@file:/.test(textPart)) {\n      const wsKey = sk !== '' ? sk : 'agent:main:main';\n      const root = agentManager.getResolvedWorkspaceForSession(wsKey);\n      textPart = await expandAtFileMentionsInPlainText(textPart, root);\n    }\n    messageContent.push({ type: 'text', text: textPart });\n  }\n\n  if (!attachments?.length) {\n    return messageContent;\n  }\n\n  const modelRef =\n    sk !== ''\n      ? modelManager.getModelForSession(sk)\n      : getAgentDefaultModelRef(config) ?? getDefaultModelSync(config);\n\n  const storageRoot =\n    sk !== ''\n      ? resolveAgentHomeDir(config, extractProfileAgentId(sk, config))\n      : resolveAgentHomeDir(config, resolveDefaultAgentId(config));\n\n  let i = 0;\n  while (i < attachments.length) {\n    const att = attachments[i]!;\n    const isImage =\n      att.type === 'image' ||\n      att.type === 'photo' ||\n      Boolean(att.mimeType?.startsWith('image/'));\n\n    if (isImage) {\n      const group: Array<{ data: string; mimeType: string }> = [];\n      while (i < attachments.length) {\n        const a = attachments[i]!;\n        const img = a.type === 'image' || a.type === 'photo' || Boolean(a.mimeType?.startsWith('image/'));\n        if (!img) {\n          break;\n        }\n        if (!a.data || a.data.length === 0) {\n          i += 1;\n          continue;\n        }\n        group.push({ data: a.data, mimeType: a.mimeType || 'image/png' });\n        i += 1;\n      }\n      if (group.length > 0) {\n        const parts = await resolveInboundImageContentParts({\n          modelRef: modelRef || getDefaultModelSync(config),\n          cfg: config,\n          userTextForContext: content.trim() ? content : '',\n          images: group,\n        });\n        messageContent.push(...parts);\n      }\n    } else {\n      const fileBlock = formatInboundFileTextBlock(att, storageRoot);\n      messageContent.push({ type: 'text', text: fileBlock });\n      i += 1;\n    }\n  }\n\n  return messageContent;\n}\n"],"mappings":";;;;;;;;aACiE;gBACF;kBAIgB;;;;AAqB/E,eAAsB,8BAA8B,MAOnB;CAC/B,MAAM,EAAE,SAAS,aAAa,YAAY,QAAQ,cAAc,iBAAiB;CACjF,MAAM,iBAAsC,EAAE;CAC9C,MAAM,KAAK,cAAc;AAEzB,KAAI,QAAQ,MAAM,EAAE;EAClB,IAAI,WAAW;AACf,MAAI,SAAS,KAAK,SAAS,EAAE;GAC3B,MAAM,QAAQ,OAAO,KAAK,KAAK;GAC/B,MAAM,OAAO,aAAa,+BAA+B,MAAM;AAC/D,cAAW,MAAM,gCAAgC,UAAU,KAAK;;AAElE,iBAAe,KAAK;GAAE,MAAM;GAAQ,MAAM;GAAU,CAAC;;AAGvD,KAAI,CAAC,aAAa,OAChB,QAAO;CAGT,MAAM,WACJ,OAAO,KACH,aAAa,mBAAmB,GAAG,GACnC,wBAAwB,OAAO,IAAI,oBAAoB,OAAO;CAEpE,MAAM,cACJ,OAAO,KACH,oBAAoB,QAAQ,sBAAsB,IAAI,OAAO,CAAC,GAC9D,oBAAoB,QAAQ,sBAAsB,OAAO,CAAC;CAEhE,IAAI,IAAI;AACR,QAAO,IAAI,YAAY,QAAQ;EAC7B,MAAM,MAAM,YAAY;AAMxB,MAJE,IAAI,SAAS,WACb,IAAI,SAAS,WACb,QAAQ,IAAI,UAAU,WAAW,SAAS,CAAC,EAEhC;GACX,MAAM,QAAmD,EAAE;AAC3D,UAAO,IAAI,YAAY,QAAQ;IAC7B,MAAM,IAAI,YAAY;AAEtB,QAAI,EADQ,EAAE,SAAS,WAAW,EAAE,SAAS,WAAW,QAAQ,EAAE,UAAU,WAAW,SAAS,CAAC,EAE/F;AAEF,QAAI,CAAC,EAAE,QAAQ,EAAE,KAAK,WAAW,GAAG;AAClC,UAAK;AACL;;AAEF,UAAM,KAAK;KAAE,MAAM,EAAE;KAAM,UAAU,EAAE,YAAY;KAAa,CAAC;AACjE,SAAK;;AAEP,OAAI,MAAM,SAAS,GAAG;IACpB,MAAM,QAAQ,MAAM,gCAAgC;KAClD,UAAU,YAAY,oBAAoB,OAAO;KACjD,KAAK;KACL,oBAAoB,QAAQ,MAAM,GAAG,UAAU;KAC/C,QAAQ;KACT,CAAC;AACF,mBAAe,KAAK,GAAG,MAAM;;SAE1B;GACL,MAAM,YAAY,2BAA2B,KAAK,YAAY;AAC9D,kBAAe,KAAK;IAAE,MAAM;IAAQ,MAAM;IAAW,CAAC;AACtD,QAAK;;;AAIT,QAAO"}
+{"version":3,"file":"build-direct-message-content.js","names":[],"sources":["../../../../src/agent/service/build-direct-message-content.ts"],"sourcesContent":["import type { Config } from '../../config/schema.js';\nimport { getAgentDefaultModelRef } from '../../config/schema.js';\nimport { getDefaultModelSync } from '../../providers/index.js';\nimport type { MediaRef } from '../../channels/attachments/inbound-persist.js';\nimport { buildTranscriptUserMessage } from '../inbound/attachment-pipeline.js';\nimport type { AgentInstanceGateway } from '../agent-instance-gateway.js';\nimport type { ModelManager } from '../models/index.js';\n\nexport type { InboundAttachmentInput as DirectInboundWireAttachment } from '../../channels/attachments/inbound-persist.js';\nexport type { MediaRef as DirectInboundAttachment } from '../../channels/attachments/inbound-persist.js';\n\nexport async function buildDirectUserMessageContent(opts: {\n  content: string;\n  attachments?: MediaRef[];\n  sessionKey?: string;\n  config: Config;\n  agentManager: AgentInstanceGateway;\n  modelManager: ModelManager;\n}) {\n  const sk = opts.sessionKey ?? '';\n  const modelRef =\n    sk !== ''\n      ? opts.modelManager.getModelForSession(sk)\n      : getAgentDefaultModelRef(opts.config) ?? getDefaultModelSync(opts.config);\n\n  return buildTranscriptUserMessage({\n    text: opts.content,\n    prepared: opts.attachments,\n    sessionKey: sk,\n    modelRef: modelRef || getDefaultModelSync(opts.config),\n    config: opts.config,\n    agentManager: opts.agentManager,\n  });\n}\n"],"mappings":";;;;aACiE;gBACF;AAS/D,eAAsB,8BAA8B,MAOjD;CACD,MAAM,KAAK,KAAK,cAAc;CAC9B,MAAM,WACJ,OAAO,KACH,KAAK,aAAa,mBAAmB,GAAG,GACxC,wBAAwB,KAAK,OAAO,IAAI,oBAAoB,KAAK,OAAO;AAE9E,QAAO,2BAA2B;EAChC,MAAM,KAAK;EACX,UAAU,KAAK;EACf,YAAY;EACZ,UAAU,YAAY,oBAAoB,KAAK,OAAO;EACtD,QAAQ,KAAK;EACb,cAAc,KAAK;EACpB,CAAC"}

package/dist/src/agent/service/direct-turn-helpers.d.ts

@@ -5,13 +5,13 @@
  * the entry points only manage their I/O specifics (event sink, voice STT,
  * TTS, transcript persistence).
  */
+import type { AgentMessage } from '@earendil-works/pi-agent-core';
 import type { CommandHandler } from '../messaging/command-handler.js';
 import type { SessionStore } from '../../session/index.js';
 import type { Config } from '../../config/schema.js';
 import type { AgentInstanceGateway } from '../agent-instance-gateway.js';
 import type { ModelManager } from '../models/index.js';
 import type { EmbeddedStreamEvent } from '../embedded/types.js';
-import type { AgentMessage } from '@earendil-works/pi-agent-core';
 export interface HydratePerTurnStateDeps {
     hydrateSessionWorkspaceFromStore: (sessionKey: string) => Promise<void>;
     hydrateSessionModelFromStore: (sessionKey: string) => Promise<void>;

package/dist/src/agent/service/direct-turn-helpers.js

@@ -1,3 +1,4 @@
+import { hydrateUserTurnForLlm } from "../inbound/attachment-pipeline.js";
 import { extractAgentUserPlainText } from "../memory/user-message-text.js";
 import { shouldSkipResetOverlapCommand } from "../../session/reset-triggers.js";
 import { parseSlashCommand } from "../../chat-commands/command-parse.js";
@@ -73,10 +74,16 @@ async function tryRunSlashCommand(deps, ctx, content, options) {
 async function runDirectAgentTurn(deps, input) {
 	const userPlain = extractAgentUserPlainText(input.userMessage);
 	const userMessageForModel = await deps.agentManager.applyMemoryPrefetchToUserMessage(input.userMessage, input.sessionKey);
+	const modelRef = deps.modelManager.getModelForSession(input.sessionKey);
+	const llmImages = (await hydrateUserTurnForLlm({
+		message: input.userMessage,
+		modelRef
+	})).images;
 	const result = await runEmbeddedTurnForSession({
 		sessionKey: input.sessionKey,
 		runId: crypto.randomUUID(),
 		userMessage: userMessageForModel,
+		llmImages,
 		sessionStore: deps.sessionStore,
 		agentManager: deps.agentManager,
 		modelManager: deps.modelManager,

package/dist/src/agent/service/direct-turn-helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"direct-turn-helpers.js","names":[],"sources":["../../../../src/agent/service/direct-turn-helpers.ts"],"sourcesContent":["/**\n * Shared building blocks for the two direct-turn entry points (streaming\n * webchat SSE and one-shot CLI). Both flows do the same hydrate → maybe-slash\n * → run-embedded-turn → after-turn dance; this module captures that core so\n * the entry points only manage their I/O specifics (event sink, voice STT,\n * TTS, transcript persistence).\n */\n\nimport crypto from 'node:crypto';\n\nimport { commandRegistry } from '../../chat-commands/index.js';\nimport { parseSlashCommand } from '../../chat-commands/command-parse.js';\nimport { shouldSkipResetOverlapCommand } from '../../session/reset-triggers.js';\nimport type { CommandHandler } from '../messaging/command-handler.js';\nimport type { SessionStore } from '../../session/index.js';\nimport type { Config } from '../../config/schema.js';\nimport type { AgentInstanceGateway } from '../agent-instance-gateway.js';\nimport type { ModelManager } from '../models/index.js';\nimport { extractAgentUserPlainText } from '../memory/user-message-text.js';\nimport { runEmbeddedTurnForSession } from '../embedded/run-for-session.js';\nimport type { EmbeddedStreamEvent } from '../embedded/types.js';\nimport type { AgentMessage } from '@earendil-works/pi-agent-core';\n\nexport interface HydratePerTurnStateDeps {\n  hydrateSessionWorkspaceFromStore: (sessionKey: string) => Promise<void>;\n  hydrateSessionModelFromStore: (sessionKey: string) => Promise<void>;\n  applyResolvedThinkingLevel: (sessionKey: string, thinking?: string | null) => Promise<void>;\n}\n\n/** Workspace + model + thinking level — common prep before any direct turn. */\nexport async function hydratePerTurnState(\n  deps: HydratePerTurnStateDeps,\n  sessionKey: string,\n  thinking?: string,\n): Promise<void> {\n  await deps.hydrateSessionWorkspaceFromStore(sessionKey);\n  await deps.hydrateSessionModelFromStore(sessionKey);\n  await deps.applyResolvedThinkingLevel(sessionKey, thinking);\n}\n\nexport interface SlashCommandOutcome {\n  /** True if the input parsed as a registered slash command (handled or not). */\n  matched: boolean;\n  /** Aggregated user-visible reply text (assistant view). */\n  aggregatedText: string;\n  /** The parsed command name when matched. */\n  command?: string;\n}\n\nexport interface TryRunSlashCommandDeps {\n  commandHandler: Pick<CommandHandler, 'executeCommandAndAggregateReply'>;\n  log: { warn: (obj: Record<string, unknown>, msg: string) => void };\n}\n\n/**\n * Detect a slash command and, if registered, execute it and aggregate the reply\n * text. Errors thrown inside the command surface as `aggregatedText` so callers\n * can persist the receipt or stream it as a token.\n */\nexport async function tryRunSlashCommand(\n  deps: TryRunSlashCommandDeps,\n  ctx: {\n    sessionKey: string;\n    channel: string;\n    chatId: string;\n    senderId?: string;\n    isGroup?: boolean;\n    inboundMetadata?: Record<string, unknown>;\n  },\n  content: string,\n  options?: { skipResetCommands?: boolean },\n): Promise<SlashCommandOutcome> {\n  const parsed = parseSlashCommand(content);\n  if (!parsed) {\n    return { matched: false, aggregatedText: '' };\n  }\n  if (options?.skipResetCommands && shouldSkipResetOverlapCommand(parsed.command, true)) {\n    return { matched: false, aggregatedText: '' };\n  }\n  if (!commandRegistry.has(parsed.command)) {\n    return { matched: false, aggregatedText: '' };\n  }\n  try {\n    const { aggregatedText } = await deps.commandHandler.executeCommandAndAggregateReply(\n      parsed.command,\n      parsed.args,\n      {\n        sessionKey: ctx.sessionKey,\n        channel: ctx.channel,\n        chatId: ctx.chatId,\n        senderId: ctx.senderId ?? '',\n        isGroup: ctx.isGroup ?? false,\n        inboundMetadata: ctx.inboundMetadata ?? {},\n      },\n    );\n    return { matched: true, aggregatedText: aggregatedText ?? '', command: parsed.command };\n  } catch (err) {\n    const em = err instanceof Error ? err.message : String(err);\n    deps.log.warn(\n      { err, sessionKey: ctx.sessionKey, command: parsed.command },\n      `Slash command failed: ${em}`,\n    );\n    return { matched: true, aggregatedText: `Command error: ${em}`, command: parsed.command };\n  }\n}\n\nexport interface RunDirectAgentTurnDeps {\n  sessionStore: SessionStore;\n  agentManager: AgentInstanceGateway;\n  modelManager: ModelManager;\n  config: Config | undefined;\n}\n\nexport interface RunDirectAgentTurnInput {\n  sessionKey: string;\n  userMessage: AgentMessage;\n  abortSignal?: AbortSignal;\n  onEvent?: (event: EmbeddedStreamEvent) => void;\n}\n\nexport interface RunDirectAgentTurnResult {\n  ok: boolean;\n  errorMessage?: string;\n  lastAssistantText?: string;\n}\n\n/**\n * Convert a user message into an embedded turn, including the standard memory\n * prefetch + background-review nudge wiring used by every direct entry point.\n */\nexport async function runDirectAgentTurn(\n  deps: RunDirectAgentTurnDeps,\n  input: RunDirectAgentTurnInput,\n): Promise<RunDirectAgentTurnResult> {\n  const userPlain = extractAgentUserPlainText(input.userMessage);\n  const userMessageForModel = await deps.agentManager.applyMemoryPrefetchToUserMessage(\n    input.userMessage,\n    input.sessionKey,\n  );\n\n  const result = await runEmbeddedTurnForSession({\n    sessionKey: input.sessionKey,\n    runId: crypto.randomUUID(),\n    userMessage: userMessageForModel,\n    sessionStore: deps.sessionStore,\n    agentManager: deps.agentManager,\n    modelManager: deps.modelManager,\n    getConfig: () => deps.config,\n    abortSignal: input.abortSignal,\n    beforeTurn: () => deps.agentManager.beginBackgroundReviewUserTurn(input.sessionKey),\n    onEvent: input.onEvent,\n  });\n\n  deps.agentManager.afterAgentTurn(input.sessionKey, userPlain);\n  deps.agentManager.scheduleBackgroundReviewAfterUserTurn(input.sessionKey);\n\n  return result;\n}\n"],"mappings":";;;;;;;;;;;;;;;;AA8BA,eAAsB,oBACpB,MACA,YACA,UACe;AACf,OAAM,KAAK,iCAAiC,WAAW;AACvD,OAAM,KAAK,6BAA6B,WAAW;AACnD,OAAM,KAAK,2BAA2B,YAAY,SAAS;;;;;;;AAsB7D,eAAsB,mBACpB,MACA,KAQA,SACA,SAC8B;CAC9B,MAAM,SAAS,kBAAkB,QAAQ;AACzC,KAAI,CAAC,OACH,QAAO;EAAE,SAAS;EAAO,gBAAgB;EAAI;AAE/C,KAAI,SAAS,qBAAqB,8BAA8B,OAAO,SAAS,KAAK,CACnF,QAAO;EAAE,SAAS;EAAO,gBAAgB;EAAI;AAE/C,KAAI,CAAC,gBAAgB,IAAI,OAAO,QAAQ,CACtC,QAAO;EAAE,SAAS;EAAO,gBAAgB;EAAI;AAE/C,KAAI;EACF,MAAM,EAAE,mBAAmB,MAAM,KAAK,eAAe,gCACnD,OAAO,SACP,OAAO,MACP;GACE,YAAY,IAAI;GAChB,SAAS,IAAI;GACb,QAAQ,IAAI;GACZ,UAAU,IAAI,YAAY;GAC1B,SAAS,IAAI,WAAW;GACxB,iBAAiB,IAAI,mBAAmB,EAAE;GAC3C,CACF;AACD,SAAO;GAAE,SAAS;GAAM,gBAAgB,kBAAkB;GAAI,SAAS,OAAO;GAAS;UAChF,KAAK;EACZ,MAAM,KAAK,eAAe,QAAQ,IAAI,UAAU,OAAO,IAAI;AAC3D,OAAK,IAAI,KACP;GAAE;GAAK,YAAY,IAAI;GAAY,SAAS,OAAO;GAAS,EAC5D,yBAAyB,KAC1B;AACD,SAAO;GAAE,SAAS;GAAM,gBAAgB,kBAAkB;GAAM,SAAS,OAAO;GAAS;;;;;;;AA4B7F,eAAsB,mBACpB,MACA,OACmC;CACnC,MAAM,YAAY,0BAA0B,MAAM,YAAY;CAC9D,MAAM,sBAAsB,MAAM,KAAK,aAAa,iCAClD,MAAM,aACN,MAAM,WACP;CAED,MAAM,SAAS,MAAM,0BAA0B;EAC7C,YAAY,MAAM;EAClB,OAAO,OAAO,YAAY;EAC1B,aAAa;EACb,cAAc,KAAK;EACnB,cAAc,KAAK;EACnB,cAAc,KAAK;EACnB,iBAAiB,KAAK;EACtB,aAAa,MAAM;EACnB,kBAAkB,KAAK,aAAa,8BAA8B,MAAM,WAAW;EACnF,SAAS,MAAM;EAChB,CAAC;AAEF,MAAK,aAAa,eAAe,MAAM,YAAY,UAAU;AAC7D,MAAK,aAAa,sCAAsC,MAAM,WAAW;AAEzE,QAAO"}
+{"version":3,"file":"direct-turn-helpers.js","names":[],"sources":["../../../../src/agent/service/direct-turn-helpers.ts"],"sourcesContent":["/**\n * Shared building blocks for the two direct-turn entry points (streaming\n * webchat SSE and one-shot CLI). Both flows do the same hydrate → maybe-slash\n * → run-embedded-turn → after-turn dance; this module captures that core so\n * the entry points only manage their I/O specifics (event sink, voice STT,\n * TTS, transcript persistence).\n */\n\nimport crypto from 'node:crypto';\n\nimport type { AgentMessage } from '@earendil-works/pi-agent-core';\n\nimport { commandRegistry } from '../../chat-commands/index.js';\nimport { parseSlashCommand } from '../../chat-commands/command-parse.js';\nimport { shouldSkipResetOverlapCommand } from '../../session/reset-triggers.js';\nimport { hydrateUserTurnForLlm, type TranscriptUserMessage } from '../inbound/attachment-pipeline.js';\nimport type { CommandHandler } from '../messaging/command-handler.js';\nimport type { SessionStore } from '../../session/index.js';\nimport type { Config } from '../../config/schema.js';\nimport type { AgentInstanceGateway } from '../agent-instance-gateway.js';\nimport type { ModelManager } from '../models/index.js';\nimport { extractAgentUserPlainText } from '../memory/user-message-text.js';\nimport { runEmbeddedTurnForSession } from '../embedded/run-for-session.js';\nimport type { EmbeddedStreamEvent } from '../embedded/types.js';\n\nexport interface HydratePerTurnStateDeps {\n  hydrateSessionWorkspaceFromStore: (sessionKey: string) => Promise<void>;\n  hydrateSessionModelFromStore: (sessionKey: string) => Promise<void>;\n  applyResolvedThinkingLevel: (sessionKey: string, thinking?: string | null) => Promise<void>;\n}\n\n/** Workspace + model + thinking level — common prep before any direct turn. */\nexport async function hydratePerTurnState(\n  deps: HydratePerTurnStateDeps,\n  sessionKey: string,\n  thinking?: string,\n): Promise<void> {\n  await deps.hydrateSessionWorkspaceFromStore(sessionKey);\n  await deps.hydrateSessionModelFromStore(sessionKey);\n  await deps.applyResolvedThinkingLevel(sessionKey, thinking);\n}\n\nexport interface SlashCommandOutcome {\n  /** True if the input parsed as a registered slash command (handled or not). */\n  matched: boolean;\n  /** Aggregated user-visible reply text (assistant view). */\n  aggregatedText: string;\n  /** The parsed command name when matched. */\n  command?: string;\n}\n\nexport interface TryRunSlashCommandDeps {\n  commandHandler: Pick<CommandHandler, 'executeCommandAndAggregateReply'>;\n  log: { warn: (obj: Record<string, unknown>, msg: string) => void };\n}\n\n/**\n * Detect a slash command and, if registered, execute it and aggregate the reply\n * text. Errors thrown inside the command surface as `aggregatedText` so callers\n * can persist the receipt or stream it as a token.\n */\nexport async function tryRunSlashCommand(\n  deps: TryRunSlashCommandDeps,\n  ctx: {\n    sessionKey: string;\n    channel: string;\n    chatId: string;\n    senderId?: string;\n    isGroup?: boolean;\n    inboundMetadata?: Record<string, unknown>;\n  },\n  content: string,\n  options?: { skipResetCommands?: boolean },\n): Promise<SlashCommandOutcome> {\n  const parsed = parseSlashCommand(content);\n  if (!parsed) {\n    return { matched: false, aggregatedText: '' };\n  }\n  if (options?.skipResetCommands && shouldSkipResetOverlapCommand(parsed.command, true)) {\n    return { matched: false, aggregatedText: '' };\n  }\n  if (!commandRegistry.has(parsed.command)) {\n    return { matched: false, aggregatedText: '' };\n  }\n  try {\n    const { aggregatedText } = await deps.commandHandler.executeCommandAndAggregateReply(\n      parsed.command,\n      parsed.args,\n      {\n        sessionKey: ctx.sessionKey,\n        channel: ctx.channel,\n        chatId: ctx.chatId,\n        senderId: ctx.senderId ?? '',\n        isGroup: ctx.isGroup ?? false,\n        inboundMetadata: ctx.inboundMetadata ?? {},\n      },\n    );\n    return { matched: true, aggregatedText: aggregatedText ?? '', command: parsed.command };\n  } catch (err) {\n    const em = err instanceof Error ? err.message : String(err);\n    deps.log.warn(\n      { err, sessionKey: ctx.sessionKey, command: parsed.command },\n      `Slash command failed: ${em}`,\n    );\n    return { matched: true, aggregatedText: `Command error: ${em}`, command: parsed.command };\n  }\n}\n\nexport interface RunDirectAgentTurnDeps {\n  sessionStore: SessionStore;\n  agentManager: AgentInstanceGateway;\n  modelManager: ModelManager;\n  config: Config | undefined;\n}\n\nexport interface RunDirectAgentTurnInput {\n  sessionKey: string;\n  userMessage: AgentMessage;\n  abortSignal?: AbortSignal;\n  onEvent?: (event: EmbeddedStreamEvent) => void;\n}\n\nexport interface RunDirectAgentTurnResult {\n  ok: boolean;\n  errorMessage?: string;\n  lastAssistantText?: string;\n}\n\n/**\n * Convert a user message into an embedded turn, including the standard memory\n * prefetch + background-review nudge wiring used by every direct entry point.\n */\nexport async function runDirectAgentTurn(\n  deps: RunDirectAgentTurnDeps,\n  input: RunDirectAgentTurnInput,\n): Promise<RunDirectAgentTurnResult> {\n  const userPlain = extractAgentUserPlainText(input.userMessage);\n  const userMessageForModel = await deps.agentManager.applyMemoryPrefetchToUserMessage(\n    input.userMessage,\n    input.sessionKey,\n  );\n\n  const modelRef = deps.modelManager.getModelForSession(input.sessionKey);\n  const llmTurn = await hydrateUserTurnForLlm({\n    message: input.userMessage as TranscriptUserMessage,\n    modelRef,\n  });\n  const llmImages = llmTurn.images;\n\n  const result = await runEmbeddedTurnForSession({\n    sessionKey: input.sessionKey,\n    runId: crypto.randomUUID(),\n    userMessage: userMessageForModel,\n    llmImages,\n    sessionStore: deps.sessionStore,\n    agentManager: deps.agentManager,\n    modelManager: deps.modelManager,\n    getConfig: () => deps.config,\n    abortSignal: input.abortSignal,\n    beforeTurn: () => deps.agentManager.beginBackgroundReviewUserTurn(input.sessionKey),\n    onEvent: input.onEvent,\n  });\n\n  deps.agentManager.afterAgentTurn(input.sessionKey, userPlain);\n  deps.agentManager.scheduleBackgroundReviewAfterUserTurn(input.sessionKey);\n\n  return result;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;AAgCA,eAAsB,oBACpB,MACA,YACA,UACe;AACf,OAAM,KAAK,iCAAiC,WAAW;AACvD,OAAM,KAAK,6BAA6B,WAAW;AACnD,OAAM,KAAK,2BAA2B,YAAY,SAAS;;;;;;;AAsB7D,eAAsB,mBACpB,MACA,KAQA,SACA,SAC8B;CAC9B,MAAM,SAAS,kBAAkB,QAAQ;AACzC,KAAI,CAAC,OACH,QAAO;EAAE,SAAS;EAAO,gBAAgB;EAAI;AAE/C,KAAI,SAAS,qBAAqB,8BAA8B,OAAO,SAAS,KAAK,CACnF,QAAO;EAAE,SAAS;EAAO,gBAAgB;EAAI;AAE/C,KAAI,CAAC,gBAAgB,IAAI,OAAO,QAAQ,CACtC,QAAO;EAAE,SAAS;EAAO,gBAAgB;EAAI;AAE/C,KAAI;EACF,MAAM,EAAE,mBAAmB,MAAM,KAAK,eAAe,gCACnD,OAAO,SACP,OAAO,MACP;GACE,YAAY,IAAI;GAChB,SAAS,IAAI;GACb,QAAQ,IAAI;GACZ,UAAU,IAAI,YAAY;GAC1B,SAAS,IAAI,WAAW;GACxB,iBAAiB,IAAI,mBAAmB,EAAE;GAC3C,CACF;AACD,SAAO;GAAE,SAAS;GAAM,gBAAgB,kBAAkB;GAAI,SAAS,OAAO;GAAS;UAChF,KAAK;EACZ,MAAM,KAAK,eAAe,QAAQ,IAAI,UAAU,OAAO,IAAI;AAC3D,OAAK,IAAI,KACP;GAAE;GAAK,YAAY,IAAI;GAAY,SAAS,OAAO;GAAS,EAC5D,yBAAyB,KAC1B;AACD,SAAO;GAAE,SAAS;GAAM,gBAAgB,kBAAkB;GAAM,SAAS,OAAO;GAAS;;;;;;;AA4B7F,eAAsB,mBACpB,MACA,OACmC;CACnC,MAAM,YAAY,0BAA0B,MAAM,YAAY;CAC9D,MAAM,sBAAsB,MAAM,KAAK,aAAa,iCAClD,MAAM,aACN,MAAM,WACP;CAED,MAAM,WAAW,KAAK,aAAa,mBAAmB,MAAM,WAAW;CAKvE,MAAM,aAAY,MAJI,sBAAsB;EAC1C,SAAS,MAAM;EACf;EACD,CAAC,EACwB;CAE1B,MAAM,SAAS,MAAM,0BAA0B;EAC7C,YAAY,MAAM;EAClB,OAAO,OAAO,YAAY;EAC1B,aAAa;EACb;EACA,cAAc,KAAK;EACnB,cAAc,KAAK;EACnB,cAAc,KAAK;EACnB,iBAAiB,KAAK;EACtB,aAAa,MAAM;EACnB,kBAAkB,KAAK,aAAa,8BAA8B,MAAM,WAAW;EACnF,SAAS,MAAM;EAChB,CAAC;AAEF,MAAK,aAAa,eAAe,MAAM,YAAY,UAAU;AAC7D,MAAK,aAAa,sCAAsC,MAAM,WAAW;AAEzE,QAAO"}

package/dist/src/agent/service/process-direct-one-shot.d.ts

@@ -3,8 +3,8 @@ import type { AgentInstanceGateway } from '../agent-instance-gateway.js';
 import type { ModelManager } from '../models/index.js';
 import type { SessionStore } from '../../session/index.js';
 import type { Config } from '../../config/schema.js';
-import { type DirectInboundAttachment } from './build-direct-message-content.js';
 import type { ProcessDirectStreamLog } from './process-direct-streaming.js';
+import type { InboundAttachmentInput, MediaRef } from '../../channels/attachments/inbound-persist.js';
 export type RunProcessDirectDeps = {
     log: ProcessDirectStreamLog;
     config: Config;
@@ -19,7 +19,7 @@ export type RunProcessDirectDeps = {
     sessionStore: SessionStore;
     modelManager: ModelManager;
     applyResolvedThinkingLevel: (sessionKey: string, thinking?: string | null) => Promise<void>;
-    prepareInboundAttachments: (sessionKey: string, attachments?: DirectInboundAttachment[]) => Promise<DirectInboundAttachment[] | undefined>;
+    prepareInboundAttachments: (sessionKey: string, attachments?: InboundAttachmentInput[]) => Promise<MediaRef[] | undefined>;
     commandHandler: Pick<CommandHandler, 'executeCommandAndAggregateReply'>;
     onTurnComplete?: (sessionKey: string, lastAssistantText?: string) => void;
     endDirectRequestContext: () => void;
@@ -31,6 +31,6 @@ export type RunProcessDirectDeps = {
 export declare function runProcessDirect(deps: RunProcessDirectDeps, input: {
     content: string;
     sessionKey: string;
-    attachments?: DirectInboundAttachment[];
+    attachments?: InboundAttachmentInput[];
     thinking?: string;
 }): Promise<string>;

package/dist/src/agent/service/process-direct-one-shot.js

@@ -1,3 +1,4 @@
+import { clearPendingTranscriptUserMessage, setPendingTranscriptUserMessage } from "../inbound/attachment-pipeline.js";
 import { initSessionTurn } from "../../session/init-session-turn.js";
 import "../../session/index.js";
 import { buildDirectUserMessageContent } from "./build-direct-message-content.js";
@@ -37,25 +38,29 @@ async function runProcessDirect(deps, input) {
 			});
 			return slash.aggregatedText ?? "";
 		}
-		const userMessage = {
-			role: "user",
-			content: await buildDirectUserMessageContent({
-				content: turnBody.trimStart().startsWith("/skill:") ? deps.agentManager.expandSkillUserText(turnBody) : turnBody,
-				attachments: prepared,
-				sessionKey: input.sessionKey,
-				config: deps.config,
-				agentManager: deps.agentManager,
-				modelManager: deps.modelManager
-			}),
-			timestamp: Date.now()
-		};
-		const result = await runDirectAgentTurn({
-			...deps,
-			config: deps.config
-		}, {
+		const userMessage = await buildDirectUserMessageContent({
+			content: turnBody.trimStart().startsWith("/skill:") ? deps.agentManager.expandSkillUserText(turnBody) : turnBody,
+			attachments: prepared,
 			sessionKey: input.sessionKey,
-			userMessage
+			config: deps.config,
+			agentManager: deps.agentManager,
+			modelManager: deps.modelManager
 		});
+		const pendingUserMessage = userMessage;
+		setPendingTranscriptUserMessage(input.sessionKey, pendingUserMessage);
+		const result = await (async () => {
+			try {
+				return await runDirectAgentTurn({
+					...deps,
+					config: deps.config
+				}, {
+					sessionKey: input.sessionKey,
+					userMessage
+				});
+			} finally {
+				clearPendingTranscriptUserMessage(input.sessionKey, pendingUserMessage);
+			}
+		})();
 		if (result.lastAssistantText) deps.onTurnComplete?.(input.sessionKey, result.lastAssistantText);
 		return result.lastAssistantText ?? "";
 	} finally {

package/dist/src/agent/service/process-direct-one-shot.js.map

@@ -1 +1 @@
-{"version":3,"file":"process-direct-one-shot.js","names":[],"sources":["../../../../src/agent/service/process-direct-one-shot.ts"],"sourcesContent":["import type { AgentMessage } from '@earendil-works/pi-agent-core';\n\nimport type { CommandHandler } from '../messaging/command-handler.js';\nimport type { AgentInstanceGateway } from '../agent-instance-gateway.js';\nimport type { ModelManager } from '../models/index.js';\nimport type { SessionStore } from '../../session/index.js';\nimport type { Config } from '../../config/schema.js';\nimport { initSessionTurn } from '../../session/index.js';\nimport { buildDirectUserMessageContent, type DirectInboundAttachment } from './build-direct-message-content.js';\nimport type { ProcessDirectStreamLog } from './process-direct-streaming.js';\nimport {\n  hydratePerTurnState,\n  runDirectAgentTurn,\n  tryRunSlashCommand,\n} from './direct-turn-helpers.js';\n\nexport type RunProcessDirectDeps = {\n  log: ProcessDirectStreamLog;\n  config: Config;\n  parseSessionKey: (sessionKey: string) => { channel: string; chatId: string };\n  initSessionContext: (sessionKey: string, channel: string, chatId: string) => void;\n  hydrateSessionWorkspaceFromStore: (sessionKey: string) => Promise<void>;\n  hydrateSessionModelFromStore: (sessionKey: string) => Promise<void>;\n  agentManager: AgentInstanceGateway;\n  sessionStore: SessionStore;\n  modelManager: ModelManager;\n  applyResolvedThinkingLevel: (sessionKey: string, thinking?: string | null) => Promise<void>;\n  prepareInboundAttachments: (\n    sessionKey: string,\n    attachments?: DirectInboundAttachment[],\n  ) => Promise<DirectInboundAttachment[] | undefined>;\n  commandHandler: Pick<CommandHandler, 'executeCommandAndAggregateReply'>;\n  onTurnComplete?: (sessionKey: string, lastAssistantText?: string) => void;\n  endDirectRequestContext: () => void;\n  resetSession: (sessionKey: string) => Promise<{ sessionId: string; previousSessionId: string } | null>;\n};\n\nexport async function runProcessDirect(\n  deps: RunProcessDirectDeps,\n  input: {\n    content: string;\n    sessionKey: string;\n    attachments?: DirectInboundAttachment[];\n    thinking?: string;\n  },\n): Promise<string> {\n  const { channel, chatId } = deps.parseSessionKey(input.sessionKey);\n  deps.initSessionContext(input.sessionKey, channel, chatId);\n\n  try {\n    let turnBody = input.content;\n    let resetTriggeredAtInit = false;\n    const turn = await initSessionTurn({\n      cfg: deps.config,\n      sessionKey: input.sessionKey,\n      body: input.content,\n      resetSession: deps.resetSession,\n    });\n    resetTriggeredAtInit = turn.resetTriggered;\n    if (turn.bareReset && turn.ackMessage) {\n      return turn.ackMessage;\n    }\n    turnBody = turn.bodyStripped;\n\n    await hydratePerTurnState(deps, input.sessionKey, input.thinking);\n    const prepared = await deps.prepareInboundAttachments(input.sessionKey, input.attachments);\n\n    const slash = await tryRunSlashCommand(\n      deps,\n      { sessionKey: input.sessionKey, channel, chatId },\n      turnBody,\n      { skipResetCommands: resetTriggeredAtInit },\n    );\n    if (slash.matched) {\n      const trimmed = slash.aggregatedText.trim();\n      if (trimmed) {\n        await deps.sessionStore.appendTranscriptMessage(input.sessionKey, {\n          role: 'assistant',\n          content: [{ type: 'text', text: trimmed }],\n          timestamp: Date.now(),\n        } as AgentMessage);\n      }\n      return slash.aggregatedText ?? '';\n    }\n\n    const textForDirect = turnBody.trimStart().startsWith('/skill:')\n      ? deps.agentManager.expandSkillUserText(turnBody)\n      : turnBody;\n    const messageContent = await buildDirectUserMessageContent({\n      content: textForDirect,\n      attachments: prepared,\n      sessionKey: input.sessionKey,\n      config: deps.config,\n      agentManager: deps.agentManager,\n      modelManager: deps.modelManager,\n    });\n\n    const userMessage = {\n      role: 'user' as const,\n      content: messageContent,\n      timestamp: Date.now(),\n    };\n\n    const result = await runDirectAgentTurn(\n      { ...deps, config: deps.config },\n      { sessionKey: input.sessionKey, userMessage },\n    );\n\n    if (result.lastAssistantText) {\n      deps.onTurnComplete?.(input.sessionKey, result.lastAssistantText);\n    }\n\n    return result.lastAssistantText ?? '';\n  } finally {\n    deps.endDirectRequestContext();\n  }\n}\n"],"mappings":";;;;;AAqCA,eAAsB,iBACpB,MACA,OAMiB;CACjB,MAAM,EAAE,SAAS,WAAW,KAAK,gBAAgB,MAAM,WAAW;AAClE,MAAK,mBAAmB,MAAM,YAAY,SAAS,OAAO;AAE1D,KAAI;EACF,IAAI,WAAW,MAAM;EACrB,IAAI,uBAAuB;EAC3B,MAAM,OAAO,MAAM,gBAAgB;GACjC,KAAK,KAAK;GACV,YAAY,MAAM;GAClB,MAAM,MAAM;GACZ,cAAc,KAAK;GACpB,CAAC;AACF,yBAAuB,KAAK;AAC5B,MAAI,KAAK,aAAa,KAAK,WACzB,QAAO,KAAK;AAEd,aAAW,KAAK;AAEhB,QAAM,oBAAoB,MAAM,MAAM,YAAY,MAAM,SAAS;EACjE,MAAM,WAAW,MAAM,KAAK,0BAA0B,MAAM,YAAY,MAAM,YAAY;EAE1F,MAAM,QAAQ,MAAM,mBAClB,MACA;GAAE,YAAY,MAAM;GAAY;GAAS;GAAQ,EACjD,UACA,EAAE,mBAAmB,sBAAsB,CAC5C;AACD,MAAI,MAAM,SAAS;GACjB,MAAM,UAAU,MAAM,eAAe,MAAM;AAC3C,OAAI,QACF,OAAM,KAAK,aAAa,wBAAwB,MAAM,YAAY;IAChE,MAAM;IACN,SAAS,CAAC;KAAE,MAAM;KAAQ,MAAM;KAAS,CAAC;IAC1C,WAAW,KAAK,KAAK;IACtB,CAAiB;AAEpB,UAAO,MAAM,kBAAkB;;EAejC,MAAM,cAAc;GAClB,MAAM;GACN,SAAS,MAXkB,8BAA8B;IACzD,SAJoB,SAAS,WAAW,CAAC,WAAW,UAAU,GAC5D,KAAK,aAAa,oBAAoB,SAAS,GAC/C;IAGF,aAAa;IACb,YAAY,MAAM;IAClB,QAAQ,KAAK;IACb,cAAc,KAAK;IACnB,cAAc,KAAK;IACpB,CAAC;GAKA,WAAW,KAAK,KAAK;GACtB;EAED,MAAM,SAAS,MAAM,mBACnB;GAAE,GAAG;GAAM,QAAQ,KAAK;GAAQ,EAChC;GAAE,YAAY,MAAM;GAAY;GAAa,CAC9C;AAED,MAAI,OAAO,kBACT,MAAK,iBAAiB,MAAM,YAAY,OAAO,kBAAkB;AAGnE,SAAO,OAAO,qBAAqB;WAC3B;AACR,OAAK,yBAAyB"}
+{"version":3,"file":"process-direct-one-shot.js","names":[],"sources":["../../../../src/agent/service/process-direct-one-shot.ts"],"sourcesContent":["import type { AgentMessage } from '@earendil-works/pi-agent-core';\n\nimport type { CommandHandler } from '../messaging/command-handler.js';\nimport type { AgentInstanceGateway } from '../agent-instance-gateway.js';\nimport type { ModelManager } from '../models/index.js';\nimport type { SessionStore } from '../../session/index.js';\nimport type { Config } from '../../config/schema.js';\nimport { initSessionTurn } from '../../session/index.js';\nimport {\n  buildDirectUserMessageContent,\n} from './build-direct-message-content.js';\nimport type { ProcessDirectStreamLog } from './process-direct-streaming.js';\nimport type {\n  InboundAttachmentInput,\n  MediaRef,\n} from '../../channels/attachments/inbound-persist.js';\nimport {\n  hydratePerTurnState,\n  runDirectAgentTurn,\n  tryRunSlashCommand,\n} from './direct-turn-helpers.js';\nimport {\n  clearPendingTranscriptUserMessage,\n  setPendingTranscriptUserMessage,\n  type TranscriptUserMessage,\n} from '../inbound/attachment-pipeline.js';\n\nexport type RunProcessDirectDeps = {\n  log: ProcessDirectStreamLog;\n  config: Config;\n  parseSessionKey: (sessionKey: string) => { channel: string; chatId: string };\n  initSessionContext: (sessionKey: string, channel: string, chatId: string) => void;\n  hydrateSessionWorkspaceFromStore: (sessionKey: string) => Promise<void>;\n  hydrateSessionModelFromStore: (sessionKey: string) => Promise<void>;\n  agentManager: AgentInstanceGateway;\n  sessionStore: SessionStore;\n  modelManager: ModelManager;\n  applyResolvedThinkingLevel: (sessionKey: string, thinking?: string | null) => Promise<void>;\n  prepareInboundAttachments: (\n    sessionKey: string,\n    attachments?: InboundAttachmentInput[],\n  ) => Promise<MediaRef[] | undefined>;\n  commandHandler: Pick<CommandHandler, 'executeCommandAndAggregateReply'>;\n  onTurnComplete?: (sessionKey: string, lastAssistantText?: string) => void;\n  endDirectRequestContext: () => void;\n  resetSession: (sessionKey: string) => Promise<{ sessionId: string; previousSessionId: string } | null>;\n};\n\nexport async function runProcessDirect(\n  deps: RunProcessDirectDeps,\n  input: {\n    content: string;\n    sessionKey: string;\n    attachments?: InboundAttachmentInput[];\n    thinking?: string;\n  },\n): Promise<string> {\n  const { channel, chatId } = deps.parseSessionKey(input.sessionKey);\n  deps.initSessionContext(input.sessionKey, channel, chatId);\n\n  try {\n    let turnBody = input.content;\n    let resetTriggeredAtInit = false;\n    const turn = await initSessionTurn({\n      cfg: deps.config,\n      sessionKey: input.sessionKey,\n      body: input.content,\n      resetSession: deps.resetSession,\n    });\n    resetTriggeredAtInit = turn.resetTriggered;\n    if (turn.bareReset && turn.ackMessage) {\n      return turn.ackMessage;\n    }\n    turnBody = turn.bodyStripped;\n\n    await hydratePerTurnState(deps, input.sessionKey, input.thinking);\n    const prepared = await deps.prepareInboundAttachments(input.sessionKey, input.attachments);\n\n    const slash = await tryRunSlashCommand(\n      deps,\n      { sessionKey: input.sessionKey, channel, chatId },\n      turnBody,\n      { skipResetCommands: resetTriggeredAtInit },\n    );\n    if (slash.matched) {\n      const trimmed = slash.aggregatedText.trim();\n      if (trimmed) {\n        await deps.sessionStore.appendTranscriptMessage(input.sessionKey, {\n          role: 'assistant',\n          content: [{ type: 'text', text: trimmed }],\n          timestamp: Date.now(),\n        } as AgentMessage);\n      }\n      return slash.aggregatedText ?? '';\n    }\n\n    const textForDirect = turnBody.trimStart().startsWith('/skill:')\n      ? deps.agentManager.expandSkillUserText(turnBody)\n      : turnBody;\n    const userMessage = await buildDirectUserMessageContent({\n      content: textForDirect,\n      attachments: prepared,\n      sessionKey: input.sessionKey,\n      config: deps.config,\n      agentManager: deps.agentManager,\n      modelManager: deps.modelManager,\n    });\n\n    const pendingUserMessage = userMessage as TranscriptUserMessage;\n    setPendingTranscriptUserMessage(input.sessionKey, pendingUserMessage);\n\n    const result = await (async () => {\n      try {\n        return await runDirectAgentTurn(\n          { ...deps, config: deps.config },\n          {\n            sessionKey: input.sessionKey,\n            userMessage,\n          },\n        );\n      } finally {\n        clearPendingTranscriptUserMessage(input.sessionKey, pendingUserMessage);\n      }\n    })();\n\n    if (result.lastAssistantText) {\n      deps.onTurnComplete?.(input.sessionKey, result.lastAssistantText);\n    }\n\n    return result.lastAssistantText ?? '';\n  } finally {\n    deps.endDirectRequestContext();\n  }\n}\n"],"mappings":";;;;;;AAgDA,eAAsB,iBACpB,MACA,OAMiB;CACjB,MAAM,EAAE,SAAS,WAAW,KAAK,gBAAgB,MAAM,WAAW;AAClE,MAAK,mBAAmB,MAAM,YAAY,SAAS,OAAO;AAE1D,KAAI;EACF,IAAI,WAAW,MAAM;EACrB,IAAI,uBAAuB;EAC3B,MAAM,OAAO,MAAM,gBAAgB;GACjC,KAAK,KAAK;GACV,YAAY,MAAM;GAClB,MAAM,MAAM;GACZ,cAAc,KAAK;GACpB,CAAC;AACF,yBAAuB,KAAK;AAC5B,MAAI,KAAK,aAAa,KAAK,WACzB,QAAO,KAAK;AAEd,aAAW,KAAK;AAEhB,QAAM,oBAAoB,MAAM,MAAM,YAAY,MAAM,SAAS;EACjE,MAAM,WAAW,MAAM,KAAK,0BAA0B,MAAM,YAAY,MAAM,YAAY;EAE1F,MAAM,QAAQ,MAAM,mBAClB,MACA;GAAE,YAAY,MAAM;GAAY;GAAS;GAAQ,EACjD,UACA,EAAE,mBAAmB,sBAAsB,CAC5C;AACD,MAAI,MAAM,SAAS;GACjB,MAAM,UAAU,MAAM,eAAe,MAAM;AAC3C,OAAI,QACF,OAAM,KAAK,aAAa,wBAAwB,MAAM,YAAY;IAChE,MAAM;IACN,SAAS,CAAC;KAAE,MAAM;KAAQ,MAAM;KAAS,CAAC;IAC1C,WAAW,KAAK,KAAK;IACtB,CAAiB;AAEpB,UAAO,MAAM,kBAAkB;;EAMjC,MAAM,cAAc,MAAM,8BAA8B;GACtD,SAJoB,SAAS,WAAW,CAAC,WAAW,UAAU,GAC5D,KAAK,aAAa,oBAAoB,SAAS,GAC/C;GAGF,aAAa;GACb,YAAY,MAAM;GAClB,QAAQ,KAAK;GACb,cAAc,KAAK;GACnB,cAAc,KAAK;GACpB,CAAC;EAEF,MAAM,qBAAqB;AAC3B,kCAAgC,MAAM,YAAY,mBAAmB;EAErE,MAAM,SAAS,OAAO,YAAY;AAChC,OAAI;AACF,WAAO,MAAM,mBACX;KAAE,GAAG;KAAM,QAAQ,KAAK;KAAQ,EAChC;KACE,YAAY,MAAM;KAClB;KACD,CACF;aACO;AACR,sCAAkC,MAAM,YAAY,mBAAmB;;MAEvE;AAEJ,MAAI,OAAO,kBACT,MAAK,iBAAiB,MAAM,YAAY,OAAO,kBAAkB;AAGnE,SAAO,OAAO,qBAAqB;WAC3B;AACR,OAAK,yBAAyB"}

package/dist/src/agent/service/process-direct-streaming.d.ts

@@ -1,18 +1,12 @@
 import type { Config } from '../../config/schema.js';
-import type { InternalAttachmentRoots } from '../../channels/attachments/inbound-persist.js';
+import type { InboundAttachmentInput, MediaRef } from '../../channels/attachments/inbound-persist.js';
 import { type SessionConfigStore, type SessionStore } from '../../session/index.js';
 import type { SessionContext } from '../session/index.js';
 import type { AgentInstanceGateway } from '../agent-instance-gateway.js';
 import type { CommandHandler } from '../messaging/command-handler.js';
 import type { ModelManager } from '../models/index.js';
-export type DirectStreamInboundAttachment = {
-    type: string;
-    mimeType?: string;
-    data?: string;
-    name?: string;
-    size?: number;
-    workspaceRelativePath?: string;
-};
+import { type TranscriptUserMessage } from '../inbound/attachment-pipeline.js';
+export type DirectStreamInboundAttachment = InboundAttachmentInput;
 export type ProcessDirectStreamLog = {
     info: (obj: Record<string, unknown>, msg: string) => void;
     warn: (obj: Record<string, unknown>, msg: string) => void;
@@ -38,17 +32,9 @@ export interface ProcessDirectStreamingDeps {
     applyResolvedThinkingLevel: (sessionKey: string, thinking?: string | null) => Promise<void>;
     getConfig: () => Config | undefined;
     sessionConfigStore: SessionConfigStore;
-    attachmentRootsForSession: (sessionKey: string) => InternalAttachmentRoots;
     commandHandler: Pick<CommandHandler, 'executeCommandAndAggregateReply'>;
-    prepareInboundAttachments: (sessionKey: string, attachments?: DirectStreamInboundAttachment[]) => Promise<DirectStreamInboundAttachment[] | undefined>;
-    buildMessageContent: (content: string, attachments: DirectStreamInboundAttachment[] | undefined, sessionKey: string) => Promise<Array<{
-        type: 'text';
-        text: string;
-    } | {
-        type: 'image';
-        data: string;
-        mimeType: string;
-    }>>;
+    prepareInboundAttachments: (sessionKey: string, attachments?: DirectStreamInboundAttachment[]) => Promise<MediaRef[] | undefined>;
+    buildTranscriptUserMessage: (content: string, prepared: MediaRef[] | undefined, sessionKey: string) => Promise<TranscriptUserMessage>;
     recordPersistentGoalStreamOutcome?: (sessionKey: string, outcome: {
         skipPersistentGoalPostTurn: boolean;
     }) => void;
@@ -58,7 +44,7 @@ export interface ProcessDirectStreamingDeps {
     reloadWebchatTranscript?: (sessionKey: string) => void;
     maybeEmitWebchatTts: (sessionKey: string, hadInboundVoice: boolean) => Promise<{
         type: 'tts_audio';
-        workspaceRelativePath: string;
+        uri: string;
         mimeType: string;
         name: string;
     } | null>;

package/dist/src/agent/service/process-direct-streaming.js

@@ -1,3 +1,5 @@
+import { readAgentMessageContent } from "../memory/agent-message-access.js";
+import { clearPendingTranscriptUserMessage, setPendingTranscriptUserMessage } from "../inbound/attachment-pipeline.js";
 import { formatAgentRunErrorForClient } from "../client-error-format.js";
 import { resolveEffectiveReasoningLevel } from "../../session/thinking-resolve.js";
 import { initSessionTurn } from "../../session/init-session-turn.js";
@@ -77,20 +79,20 @@ async function* runProcessDirectStreaming(deps, input) {
 			}
 			const prepared = await deps.prepareInboundAttachments(sessionKey, input.attachments);
 			const sttCfg = mergeSttConfigFromAppConfig(deps.getConfig()?.tools?.media?.audio, deps.getConfig()?.tools?.media);
-			const voiceMerge = await mergeVoiceTranscriptsIntoUserText(deps.attachmentRootsForSession(sessionKey), prepared, turnBody, sttCfg);
+			const voiceMerge = await mergeVoiceTranscriptsIntoUserText(prepared, turnBody, sttCfg);
 			mergedUserText = voiceMerge.text;
 			inboundVoice = voiceMerge.inboundVoice;
 			if (inboundVoice) {
 				const transcriptParts = [voiceMerge.voiceTranscripts.filter(Boolean).join("\n"), turnBody.trim()].filter(Boolean);
-				const voiceAttachments = (prepared ?? []).filter(isVoiceLikeAttachment).map((att) => ({
-					workspaceRelativePath: att.workspaceRelativePath,
+				const voiceMedia = (prepared ?? []).filter(isVoiceLikeAttachment).map((att) => ({
+					uri: att.uri,
 					mimeType: att.mimeType,
 					name: att.name
 				}));
 				pushVisible({
 					type: "user_transcript",
 					text: transcriptParts.join("\n\n"),
-					attachments: voiceAttachments
+					media: voiceMedia
 				});
 			}
 			const armAbort = () => {
@@ -112,7 +114,8 @@ async function* runProcessDirectStreaming(deps, input) {
 				channel,
 				chatId,
 				senderId: context.senderId,
-				isGroup: context.isGroup
+				isGroup: context.isGroup,
+				inboundMetadata: context.metadata
 			}, mergedUserText, { skipResetCommands: resetTriggeredAtInit });
 			if (slash.matched) {
 				ranSlashCommand = true;
@@ -133,48 +136,44 @@ async function* runProcessDirectStreaming(deps, input) {
 				return;
 			}
 			const textForAgent = mergedUserText.trimStart().startsWith("/skill:") ? deps.agentManager.expandSkillUserText(mergedUserText) : mergedUserText;
-			const userMessage = {
-				role: "user",
-				content: await deps.buildMessageContent(textForAgent, prepared, sessionKey),
-				timestamp: Date.now()
-			};
+			const userMessage = await deps.buildTranscriptUserMessage(textForAgent, prepared, sessionKey);
 			if (channel === "webchat") {
 				pushVisible({
 					type: "user_message",
-					timestamp: userMessage.timestamp,
-					content: userMessage.content,
-					attachments: prepared?.map((att) => ({
-						type: att.type,
-						mimeType: att.mimeType,
-						name: att.name,
-						size: att.size,
-						workspaceRelativePath: att.workspaceRelativePath
-					}))
+					timestamp: userMessage.timestamp ?? Date.now(),
+					content: readAgentMessageContent(userMessage),
+					media: userMessage.media
 				});
 				if (textForAgent.trim()) deps.enqueueProvisionalSessionTitle?.(sessionKey, textForAgent);
 			}
-			const result = await runDirectAgentTurn({
-				sessionStore: deps.sessionStore,
-				agentManager: deps.agentManager,
-				modelManager: deps.modelManager,
-				config: deps.getConfig()
-			}, {
-				sessionKey,
-				userMessage,
-				abortSignal: signal,
-				onEvent: (embeddedEvent) => {
-					const mapped = mapEmbeddedEventToGatewaySse(embeddedEvent);
-					if (mapped) {
-						if (mapped.type === "error" && typeof mapped.content === "string") mapped.content = formatStreamError(mapped.content);
-						pushVisible(mapped);
+			const pendingUserMessage = userMessage;
+			setPendingTranscriptUserMessage(sessionKey, pendingUserMessage);
+			try {
+				const result = await runDirectAgentTurn({
+					sessionStore: deps.sessionStore,
+					agentManager: deps.agentManager,
+					modelManager: deps.modelManager,
+					config: deps.getConfig()
+				}, {
+					sessionKey,
+					userMessage,
+					abortSignal: signal,
+					onEvent: (embeddedEvent) => {
+						const mapped = mapEmbeddedEventToGatewaySse(embeddedEvent);
+						if (mapped) {
+							if (mapped.type === "error" && typeof mapped.content === "string") mapped.content = formatStreamError(mapped.content);
+							pushVisible(mapped);
+						}
 					}
-				}
-			});
-			if (result.lastAssistantText) deps.onTurnComplete?.(sessionKey, result.lastAssistantText);
-			if (!result.ok && result.errorMessage && !abortHandled) pushVisible({
-				type: "error",
-				content: formatStreamError(result.errorMessage)
-			});
+				});
+				if (result.lastAssistantText) deps.onTurnComplete?.(sessionKey, result.lastAssistantText);
+				if (!result.ok && result.errorMessage && !abortHandled) pushVisible({
+					type: "error",
+					content: formatStreamError(result.errorMessage)
+				});
+			} finally {
+				clearPendingTranscriptUserMessage(sessionKey, pendingUserMessage);
+			}
 		} catch (err) {
 			if (!abortHandled) pushVisible({
 				type: "error",

package/dist/src/agent/service/process-direct-streaming.js.map

@@ -1 +1 @@
-{"version":3,"file":"process-direct-streaming.js","names":[],"sources":["../../../../src/agent/service/process-direct-streaming.ts"],"sourcesContent":["import type { AgentMessage } from '@earendil-works/pi-agent-core';\n\nimport type { Config } from '../../config/schema.js';\nimport type { InternalAttachmentRoots } from '../../channels/attachments/inbound-persist.js';\nimport {\n  isVoiceLikeAttachment,\n  mergeVoiceTranscriptsIntoUserText,\n  mergeSttConfigFromAppConfig,\n} from '../../channels/attachments/voice-stt-webchat.js';\nimport {\n  resolveEffectiveReasoningLevel,\n  initSessionTurn,\n  type SessionConfigStore,\n  type SessionStore,\n} from '../../session/index.js';\nimport type { SessionContext } from '../session/index.js';\nimport { applyReasoningVisibilityToSseEvent } from '../streaming/reasoning-visibility-sse.js';\nimport type { ReasoningLevel } from '../transcript/thinking-types.js';\nimport { formatAgentRunErrorForClient } from '../client-error-format.js';\nimport { abortEmbeddedRun } from '../embedded/runs.js';\nimport { mapEmbeddedEventToGatewaySse } from '../embedded/map-stream-events.js';\nimport type { AgentInstanceGateway } from '../agent-instance-gateway.js';\nimport type { CommandHandler } from '../messaging/command-handler.js';\nimport type { ModelManager } from '../models/index.js';\n\nimport { AsyncQueue } from './async-queue.js';\nimport {\n  hydratePerTurnState,\n  runDirectAgentTurn,\n  tryRunSlashCommand,\n} from './direct-turn-helpers.js';\n\nexport type DirectStreamInboundAttachment = {\n  type: string;\n  mimeType?: string;\n  data?: string;\n  name?: string;\n  size?: number;\n  workspaceRelativePath?: string;\n};\n\nexport type ProcessDirectStreamLog = {\n  info: (obj: Record<string, unknown>, msg: string) => void;\n  warn: (obj: Record<string, unknown>, msg: string) => void;\n  debug?: (obj: Record<string, unknown>, msg: string) => void;\n};\n\nexport interface ProcessDirectStreamingDeps {\n  log: ProcessDirectStreamLog;\n  parseSessionKey: (sessionKey: string) => { channel: string; chatId: string };\n  initDirectStreamingSession: (\n    sessionKey: string,\n    channel: string,\n    chatId: string,\n  ) => SessionContext;\n  registerWebchatSsePublisher: (\n    sessionKey: string,\n    publisher: (event: { type: string; [key: string]: unknown }) => void,\n  ) => void;\n  unregisterWebchatSsePublisher: (sessionKey: string) => void;\n  agentManager: AgentInstanceGateway;\n  hydrateSessionWorkspaceFromStore: (sessionKey: string) => Promise<void>;\n  hydrateSessionModelFromStore: (sessionKey: string) => Promise<void>;\n  sessionStore: SessionStore;\n  modelManager: ModelManager;\n  applyResolvedThinkingLevel: (sessionKey: string, thinking?: string | null) => Promise<void>;\n  getConfig: () => Config | undefined;\n  sessionConfigStore: SessionConfigStore;\n  attachmentRootsForSession: (sessionKey: string) => InternalAttachmentRoots;\n  commandHandler: Pick<CommandHandler, 'executeCommandAndAggregateReply'>;\n  prepareInboundAttachments: (\n    sessionKey: string,\n    attachments?: DirectStreamInboundAttachment[],\n  ) => Promise<DirectStreamInboundAttachment[] | undefined>;\n  buildMessageContent: (\n    content: string,\n    attachments: DirectStreamInboundAttachment[] | undefined,\n    sessionKey: string,\n  ) => Promise<Array<{ type: 'text'; text: string } | { type: 'image'; data: string; mimeType: string }>>;\n  recordPersistentGoalStreamOutcome?: (\n    sessionKey: string,\n    outcome: { skipPersistentGoalPostTurn: boolean },\n  ) => void;\n  onTurnComplete?: (sessionKey: string, lastAssistantText?: string) => void;\n  enqueueProvisionalSessionTitle?: (sessionKey: string, userText: string) => void;\n  /** Disk-only transcript sync (slash receipt already streamed as tokens). */\n  reloadWebchatTranscript?: (sessionKey: string) => void;\n  maybeEmitWebchatTts: (\n    sessionKey: string,\n    hadInboundVoice: boolean,\n  ) => Promise<{ type: 'tts_audio'; workspaceRelativePath: string; mimeType: string; name: string } | null>;\n  endDirectRequestContext: () => void;\n  resetSession: (sessionKey: string) => Promise<{ sessionId: string; previousSessionId: string } | null>;\n}\n\nexport interface ProcessDirectStreamingInput {\n  content: string;\n  sessionKey?: string;\n  attachments?: DirectStreamInboundAttachment[];\n  thinking?: string;\n  signal?: AbortSignal;\n}\n\nexport type ProcessDirectStreamingSseEvent = { type: string; [key: string]: unknown };\n\nexport async function* runProcessDirectStreaming(\n  deps: ProcessDirectStreamingDeps,\n  input: ProcessDirectStreamingInput,\n): AsyncGenerator<ProcessDirectStreamingSseEvent, void, unknown> {\n  const sessionKey = input.sessionKey ?? 'agent:main:main';\n  const { channel, chatId } = deps.parseSessionKey(sessionKey);\n  const context = deps.initDirectStreamingSession(sessionKey, channel, chatId);\n\n  const queue = new AsyncQueue<ProcessDirectStreamingSseEvent>();\n  let reasoningLevel: ReasoningLevel = 'stream';\n\n  const pushVisible = (event: ProcessDirectStreamingSseEvent) => {\n    const visible = applyReasoningVisibilityToSseEvent(event, reasoningLevel);\n    if (visible !== null) {\n      queue.push(visible);\n    }\n  };\n\n  const formatStreamError = (raw: string): string => {\n    let provider: string | undefined;\n    let modelRef: string | undefined;\n    try {\n      const resolved = deps.modelManager.getResolvedModelForSession(sessionKey);\n      provider = resolved.provider;\n      modelRef = deps.modelManager.getModelForSession(sessionKey);\n    } catch {\n      /* ignore — format without provider context */\n    }\n    return formatAgentRunErrorForClient(raw, { provider, modelRef });\n  };\n\n  if (channel === 'webchat') {\n    deps.registerWebchatSsePublisher(sessionKey, pushVisible);\n  }\n\n  const signal = input.signal;\n  let userAborted = false;\n  let abortHandled = false;\n  let inboundVoice = false;\n  let ranSlashCommand = false;\n  let mergedUserText = input.content;\n  let webchatSlashReceipt: string | undefined;\n\n  // Kick off the agent task in the background; events stream into `queue` as they happen\n  // and the generator below drains `queue` until the task closes it.\n  const taskPromise = (async () => {\n    try {\n      const cfg = deps.getConfig();\n      let turnBody = input.content;\n      let resetTriggeredAtInit = false;\n      if (cfg) {\n        const turn = await initSessionTurn({\n          cfg,\n          sessionKey,\n          body: input.content,\n          resetSession: deps.resetSession,\n        });\n        resetTriggeredAtInit = turn.resetTriggered;\n        if (turn.bareReset && turn.ackMessage) {\n          ranSlashCommand = true;\n          webchatSlashReceipt = turn.ackMessage;\n          pushVisible({ type: 'token', content: turn.ackMessage });\n          return;\n        }\n        turnBody = turn.bodyStripped;\n        if (turn.isNewSession) {\n          deps.log.debug(\n            {\n              sessionKey,\n              sessionId: turn.sessionId,\n              previousSessionId: turn.previousSessionId,\n              resetTriggered: turn.resetTriggered,\n              staleRollover: turn.staleRollover,\n            },\n            'Session reset boundary at direct turn start',\n          );\n        }\n      }\n\n      await hydratePerTurnState(deps, sessionKey, input.thinking);\n      {\n        const defReason = (deps.getConfig()?.agents?.defaults?.reasoningDefault ?? 'stream') as ReasoningLevel;\n        reasoningLevel = await resolveEffectiveReasoningLevel(deps.sessionConfigStore, sessionKey, defReason);\n      }\n\n      const prepared = await deps.prepareInboundAttachments(sessionKey, input.attachments);\n\n      const sttCfg = mergeSttConfigFromAppConfig(deps.getConfig()?.tools?.media?.audio, deps.getConfig()?.tools?.media);\n      const voiceMerge = await mergeVoiceTranscriptsIntoUserText(\n        deps.attachmentRootsForSession(sessionKey),\n        prepared,\n        turnBody,\n        sttCfg,\n      );\n      mergedUserText = voiceMerge.text;\n      inboundVoice = voiceMerge.inboundVoice;\n\n      if (inboundVoice) {\n        const transcriptParts = [\n          voiceMerge.voiceTranscripts.filter(Boolean).join('\\n'),\n          turnBody.trim(),\n        ].filter(Boolean);\n        const voiceAttachments = (prepared ?? []).filter(isVoiceLikeAttachment).map((att) => ({\n          workspaceRelativePath: att.workspaceRelativePath,\n          mimeType: att.mimeType,\n          name: att.name,\n        }));\n        pushVisible({\n          type: 'user_transcript',\n          text: transcriptParts.join('\\n\\n'),\n          attachments: voiceAttachments,\n        });\n      }\n\n      const armAbort = () => {\n        if (abortHandled) {\n          return;\n        }\n        abortHandled = true;\n        userAborted = true;\n        void abortEmbeddedRun(sessionKey);\n        queue.close();\n      };\n      if (signal) {\n        if (signal.aborted) {\n          armAbort();\n          return;\n        }\n        signal.addEventListener('abort', armAbort, { once: true });\n      }\n\n      const slash = await tryRunSlashCommand(\n        deps,\n        { sessionKey, channel, chatId, senderId: context.senderId, isGroup: context.isGroup },\n        mergedUserText,\n        { skipResetCommands: resetTriggeredAtInit },\n      );\n      if (slash.matched) {\n        ranSlashCommand = true;\n        const text = slash.aggregatedText.trim();\n        if (text) {\n          webchatSlashReceipt = text;\n          pushVisible({ type: 'token', content: text });\n        } else if (channel === 'webchat') {\n          webchatSlashReceipt =\n            'Command finished with no assistant text. If you used `/goal`, a follow-up turn may still be scheduled automatically.';\n          pushVisible({ type: 'token', content: webchatSlashReceipt });\n        }\n        return;\n      }\n\n      const textForAgent = mergedUserText.trimStart().startsWith('/skill:')\n        ? deps.agentManager.expandSkillUserText(mergedUserText)\n        : mergedUserText;\n      const messageContent = await deps.buildMessageContent(textForAgent, prepared, sessionKey);\n\n      const userMessage = {\n        role: 'user' as const,\n        content: messageContent,\n        timestamp: Date.now(),\n      };\n      if (channel === 'webchat') {\n        pushVisible({\n          type: 'user_message',\n          timestamp: userMessage.timestamp,\n          content: userMessage.content,\n          attachments: prepared?.map((att) => ({\n            type: att.type,\n            mimeType: att.mimeType,\n            name: att.name,\n            size: att.size,\n            workspaceRelativePath: att.workspaceRelativePath,\n          })),\n        });\n        if (textForAgent.trim()) {\n          deps.enqueueProvisionalSessionTitle?.(sessionKey, textForAgent);\n        }\n      }\n\n      const result = await runDirectAgentTurn(\n        {\n          sessionStore: deps.sessionStore,\n          agentManager: deps.agentManager,\n          modelManager: deps.modelManager,\n          config: deps.getConfig(),\n        },\n        {\n          sessionKey,\n          userMessage,\n          abortSignal: signal,\n          onEvent: (embeddedEvent) => {\n            const mapped = mapEmbeddedEventToGatewaySse(embeddedEvent);\n            if (mapped) {\n              if (mapped.type === 'error' && typeof mapped.content === 'string') {\n                mapped.content = formatStreamError(mapped.content);\n              }\n              pushVisible(mapped);\n            }\n          },\n        },\n      );\n\n      if (result.lastAssistantText) {\n        deps.onTurnComplete?.(sessionKey, result.lastAssistantText);\n      }\n      if (!result.ok && result.errorMessage && !abortHandled) {\n        pushVisible({ type: 'error', content: formatStreamError(result.errorMessage) });\n      }\n    } catch (err) {\n      if (!abortHandled) {\n        const em = err instanceof Error ? err.message : String(err);\n        pushVisible({ type: 'error', content: formatStreamError(em) });\n      }\n    } finally {\n      queue.close();\n    }\n  })();\n\n  try {\n    for await (const event of queue) {\n      yield event;\n    }\n    await taskPromise; // surface unexpected throws\n\n    if (channel === 'webchat' && ranSlashCommand) {\n      try {\n        const userMsg = {\n          role: 'user' as const,\n          content: [{ type: 'text' as const, text: mergedUserText }],\n          timestamp: Date.now(),\n        } as AgentMessage;\n        await deps.sessionStore.appendTranscriptMessage(sessionKey, userMsg);\n        if (webchatSlashReceipt?.trim()) {\n          const assistantMsg = {\n            role: 'assistant' as const,\n            content: [{ type: 'text' as const, text: webchatSlashReceipt.trim() }],\n            timestamp: Date.now(),\n          } as AgentMessage;\n          await deps.sessionStore.appendTranscriptMessage(sessionKey, assistantMsg);\n        }\n        deps.reloadWebchatTranscript?.(sessionKey);\n      } catch (err) {\n        deps.log.warn({ err, sessionKey }, 'Failed to persist webchat slash command receipt');\n      }\n    }\n\n    if (!userAborted) {\n      const ttsAudioEvent = await deps.maybeEmitWebchatTts(sessionKey, inboundVoice);\n      if (ttsAudioEvent) {\n        yield ttsAudioEvent;\n      }\n    }\n\n    deps.recordPersistentGoalStreamOutcome?.(sessionKey, { skipPersistentGoalPostTurn: ranSlashCommand });\n  } finally {\n    if (channel === 'webchat') {\n      deps.unregisterWebchatSsePublisher(sessionKey);\n    }\n    deps.endDirectRequestContext();\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"process-direct-streaming.js","names":[],"sources":["../../../../src/agent/service/process-direct-streaming.ts"],"sourcesContent":["import type { AgentMessage } from '@earendil-works/pi-agent-core';\n\nimport type { Config } from '../../config/schema.js';\nimport type { InboundAttachmentInput, MediaRef } from '../../channels/attachments/inbound-persist.js';\nimport { readAgentMessageContent } from '../memory/agent-message-access.js';\nimport {\n  isVoiceLikeAttachment,\n  mergeVoiceTranscriptsIntoUserText,\n  mergeSttConfigFromAppConfig,\n} from '../../channels/attachments/voice-stt-webchat.js';\nimport {\n  resolveEffectiveReasoningLevel,\n  initSessionTurn,\n  type SessionConfigStore,\n  type SessionStore,\n} from '../../session/index.js';\nimport type { SessionContext } from '../session/index.js';\nimport { applyReasoningVisibilityToSseEvent } from '../streaming/reasoning-visibility-sse.js';\nimport type { ReasoningLevel } from '../transcript/thinking-types.js';\nimport { formatAgentRunErrorForClient } from '../client-error-format.js';\nimport { abortEmbeddedRun } from '../embedded/runs.js';\nimport { mapEmbeddedEventToGatewaySse } from '../embedded/map-stream-events.js';\nimport type { AgentInstanceGateway } from '../agent-instance-gateway.js';\nimport type { CommandHandler } from '../messaging/command-handler.js';\nimport type { ModelManager } from '../models/index.js';\n\nimport { AsyncQueue } from './async-queue.js';\nimport {\n  hydratePerTurnState,\n  runDirectAgentTurn,\n  tryRunSlashCommand,\n} from './direct-turn-helpers.js';\nimport {\n  clearPendingTranscriptUserMessage,\n  setPendingTranscriptUserMessage,\n  type TranscriptUserMessage,\n} from '../inbound/attachment-pipeline.js';\n\nexport type DirectStreamInboundAttachment = InboundAttachmentInput;\n\nexport type ProcessDirectStreamLog = {\n  info: (obj: Record<string, unknown>, msg: string) => void;\n  warn: (obj: Record<string, unknown>, msg: string) => void;\n  debug?: (obj: Record<string, unknown>, msg: string) => void;\n};\n\nexport interface ProcessDirectStreamingDeps {\n  log: ProcessDirectStreamLog;\n  parseSessionKey: (sessionKey: string) => { channel: string; chatId: string };\n  initDirectStreamingSession: (\n    sessionKey: string,\n    channel: string,\n    chatId: string,\n  ) => SessionContext;\n  registerWebchatSsePublisher: (\n    sessionKey: string,\n    publisher: (event: { type: string; [key: string]: unknown }) => void,\n  ) => void;\n  unregisterWebchatSsePublisher: (sessionKey: string) => void;\n  agentManager: AgentInstanceGateway;\n  hydrateSessionWorkspaceFromStore: (sessionKey: string) => Promise<void>;\n  hydrateSessionModelFromStore: (sessionKey: string) => Promise<void>;\n  sessionStore: SessionStore;\n  modelManager: ModelManager;\n  applyResolvedThinkingLevel: (sessionKey: string, thinking?: string | null) => Promise<void>;\n  getConfig: () => Config | undefined;\n  sessionConfigStore: SessionConfigStore;\n  commandHandler: Pick<CommandHandler, 'executeCommandAndAggregateReply'>;\n  prepareInboundAttachments: (\n    sessionKey: string,\n    attachments?: DirectStreamInboundAttachment[],\n  ) => Promise<MediaRef[] | undefined>;\n  buildTranscriptUserMessage: (\n    content: string,\n    prepared: MediaRef[] | undefined,\n    sessionKey: string,\n  ) => Promise<TranscriptUserMessage>;\n  recordPersistentGoalStreamOutcome?: (\n    sessionKey: string,\n    outcome: { skipPersistentGoalPostTurn: boolean },\n  ) => void;\n  onTurnComplete?: (sessionKey: string, lastAssistantText?: string) => void;\n  enqueueProvisionalSessionTitle?: (sessionKey: string, userText: string) => void;\n  /** Disk-only transcript sync (slash receipt already streamed as tokens). */\n  reloadWebchatTranscript?: (sessionKey: string) => void;\n  maybeEmitWebchatTts: (\n    sessionKey: string,\n    hadInboundVoice: boolean,\n  ) => Promise<{ type: 'tts_audio'; uri: string; mimeType: string; name: string } | null>;\n  endDirectRequestContext: () => void;\n  resetSession: (sessionKey: string) => Promise<{ sessionId: string; previousSessionId: string } | null>;\n}\n\nexport interface ProcessDirectStreamingInput {\n  content: string;\n  sessionKey?: string;\n  attachments?: DirectStreamInboundAttachment[];\n  thinking?: string;\n  signal?: AbortSignal;\n}\n\nexport type ProcessDirectStreamingSseEvent = { type: string; [key: string]: unknown };\n\nexport async function* runProcessDirectStreaming(\n  deps: ProcessDirectStreamingDeps,\n  input: ProcessDirectStreamingInput,\n): AsyncGenerator<ProcessDirectStreamingSseEvent, void, unknown> {\n  const sessionKey = input.sessionKey ?? 'agent:main:main';\n  const { channel, chatId } = deps.parseSessionKey(sessionKey);\n  const context = deps.initDirectStreamingSession(sessionKey, channel, chatId);\n\n  const queue = new AsyncQueue<ProcessDirectStreamingSseEvent>();\n  let reasoningLevel: ReasoningLevel = 'stream';\n\n  const pushVisible = (event: ProcessDirectStreamingSseEvent) => {\n    const visible = applyReasoningVisibilityToSseEvent(event, reasoningLevel);\n    if (visible !== null) {\n      queue.push(visible);\n    }\n  };\n\n  const formatStreamError = (raw: string): string => {\n    let provider: string | undefined;\n    let modelRef: string | undefined;\n    try {\n      const resolved = deps.modelManager.getResolvedModelForSession(sessionKey);\n      provider = resolved.provider;\n      modelRef = deps.modelManager.getModelForSession(sessionKey);\n    } catch {\n      /* ignore — format without provider context */\n    }\n    return formatAgentRunErrorForClient(raw, { provider, modelRef });\n  };\n\n  if (channel === 'webchat') {\n    deps.registerWebchatSsePublisher(sessionKey, pushVisible);\n  }\n\n  const signal = input.signal;\n  let userAborted = false;\n  let abortHandled = false;\n  let inboundVoice = false;\n  let ranSlashCommand = false;\n  let mergedUserText = input.content;\n  let webchatSlashReceipt: string | undefined;\n\n  const taskPromise = (async () => {\n    try {\n      const cfg = deps.getConfig();\n      let turnBody = input.content;\n      let resetTriggeredAtInit = false;\n      if (cfg) {\n        const turn = await initSessionTurn({\n          cfg,\n          sessionKey,\n          body: input.content,\n          resetSession: deps.resetSession,\n        });\n        resetTriggeredAtInit = turn.resetTriggered;\n        if (turn.bareReset && turn.ackMessage) {\n          ranSlashCommand = true;\n          webchatSlashReceipt = turn.ackMessage;\n          pushVisible({ type: 'token', content: turn.ackMessage });\n          return;\n        }\n        turnBody = turn.bodyStripped;\n        if (turn.isNewSession) {\n          deps.log.debug(\n            {\n              sessionKey,\n              sessionId: turn.sessionId,\n              previousSessionId: turn.previousSessionId,\n              resetTriggered: turn.resetTriggered,\n              staleRollover: turn.staleRollover,\n            },\n            'Session reset boundary at direct turn start',\n          );\n        }\n      }\n\n      await hydratePerTurnState(deps, sessionKey, input.thinking);\n      {\n        const defReason = (deps.getConfig()?.agents?.defaults?.reasoningDefault ?? 'stream') as ReasoningLevel;\n        reasoningLevel = await resolveEffectiveReasoningLevel(deps.sessionConfigStore, sessionKey, defReason);\n      }\n\n      const prepared = await deps.prepareInboundAttachments(sessionKey, input.attachments);\n\n      const sttCfg = mergeSttConfigFromAppConfig(deps.getConfig()?.tools?.media?.audio, deps.getConfig()?.tools?.media);\n      const voiceMerge = await mergeVoiceTranscriptsIntoUserText(prepared, turnBody, sttCfg);\n      mergedUserText = voiceMerge.text;\n      inboundVoice = voiceMerge.inboundVoice;\n\n      if (inboundVoice) {\n        const transcriptParts = [\n          voiceMerge.voiceTranscripts.filter(Boolean).join('\\n'),\n          turnBody.trim(),\n        ].filter(Boolean);\n        const voiceMedia = (prepared ?? []).filter(isVoiceLikeAttachment).map((att) => ({\n          uri: att.uri,\n          mimeType: att.mimeType,\n          name: att.name,\n        }));\n        pushVisible({\n          type: 'user_transcript',\n          text: transcriptParts.join('\\n\\n'),\n          media: voiceMedia,\n        });\n      }\n\n      const armAbort = () => {\n        if (abortHandled) {\n          return;\n        }\n        abortHandled = true;\n        userAborted = true;\n        void abortEmbeddedRun(sessionKey);\n        queue.close();\n      };\n      if (signal) {\n        if (signal.aborted) {\n          armAbort();\n          return;\n        }\n        signal.addEventListener('abort', armAbort, { once: true });\n      }\n\n      const slash = await tryRunSlashCommand(\n        deps,\n        {\n          sessionKey,\n          channel,\n          chatId,\n          senderId: context.senderId,\n          isGroup: context.isGroup,\n          inboundMetadata: context.metadata,\n        },\n        mergedUserText,\n        { skipResetCommands: resetTriggeredAtInit },\n      );\n      if (slash.matched) {\n        ranSlashCommand = true;\n        const text = slash.aggregatedText.trim();\n        if (text) {\n          webchatSlashReceipt = text;\n          pushVisible({ type: 'token', content: text });\n        } else if (channel === 'webchat') {\n          webchatSlashReceipt =\n            'Command finished with no assistant text. If you used `/goal`, a follow-up turn may still be scheduled automatically.';\n          pushVisible({ type: 'token', content: webchatSlashReceipt });\n        }\n        return;\n      }\n\n      const textForAgent = mergedUserText.trimStart().startsWith('/skill:')\n        ? deps.agentManager.expandSkillUserText(mergedUserText)\n        : mergedUserText;\n      const userMessage = await deps.buildTranscriptUserMessage(textForAgent, prepared, sessionKey);\n\n      if (channel === 'webchat') {\n        pushVisible({\n          type: 'user_message',\n          timestamp: userMessage.timestamp ?? Date.now(),\n          content: readAgentMessageContent(userMessage),\n          media: userMessage.media,\n        });\n        if (textForAgent.trim()) {\n          deps.enqueueProvisionalSessionTitle?.(sessionKey, textForAgent);\n        }\n      }\n\n      const pendingUserMessage = userMessage as TranscriptUserMessage;\n      setPendingTranscriptUserMessage(sessionKey, pendingUserMessage);\n\n      try {\n        const result = await runDirectAgentTurn(\n          {\n            sessionStore: deps.sessionStore,\n            agentManager: deps.agentManager,\n            modelManager: deps.modelManager,\n            config: deps.getConfig(),\n          },\n          {\n            sessionKey,\n            userMessage,\n            abortSignal: signal,\n            onEvent: (embeddedEvent) => {\n              const mapped = mapEmbeddedEventToGatewaySse(embeddedEvent);\n              if (mapped) {\n                if (mapped.type === 'error' && typeof mapped.content === 'string') {\n                  mapped.content = formatStreamError(mapped.content);\n                }\n                pushVisible(mapped);\n              }\n            },\n          },\n        );\n\n        if (result.lastAssistantText) {\n          deps.onTurnComplete?.(sessionKey, result.lastAssistantText);\n        }\n        if (!result.ok && result.errorMessage && !abortHandled) {\n          pushVisible({ type: 'error', content: formatStreamError(result.errorMessage) });\n        }\n      } finally {\n        clearPendingTranscriptUserMessage(sessionKey, pendingUserMessage);\n      }\n    } catch (err) {\n      if (!abortHandled) {\n        const em = err instanceof Error ? err.message : String(err);\n        pushVisible({ type: 'error', content: formatStreamError(em) });\n      }\n    } finally {\n      queue.close();\n    }\n  })();\n\n  try {\n    for await (const event of queue) {\n      yield event;\n    }\n    await taskPromise;\n\n    if (channel === 'webchat' && ranSlashCommand) {\n      try {\n        const userMsg = {\n          role: 'user' as const,\n          content: [{ type: 'text' as const, text: mergedUserText }],\n          timestamp: Date.now(),\n        } as AgentMessage;\n        await deps.sessionStore.appendTranscriptMessage(sessionKey, userMsg);\n        if (webchatSlashReceipt?.trim()) {\n          const assistantMsg = {\n            role: 'assistant' as const,\n            content: [{ type: 'text' as const, text: webchatSlashReceipt.trim() }],\n            timestamp: Date.now(),\n          } as AgentMessage;\n          await deps.sessionStore.appendTranscriptMessage(sessionKey, assistantMsg);\n        }\n        deps.reloadWebchatTranscript?.(sessionKey);\n      } catch (err) {\n        deps.log.warn({ err, sessionKey }, 'Failed to persist webchat slash command receipt');\n      }\n    }\n\n    if (!userAborted) {\n      const ttsAudioEvent = await deps.maybeEmitWebchatTts(sessionKey, inboundVoice);\n      if (ttsAudioEvent) {\n        yield ttsAudioEvent;\n      }\n    }\n\n    deps.recordPersistentGoalStreamOutcome?.(sessionKey, { skipPersistentGoalPostTurn: ranSlashCommand });\n  } finally {\n    if (channel === 'webchat') {\n      deps.unregisterWebchatSsePublisher(sessionKey);\n    }\n    deps.endDirectRequestContext();\n  }\n}\n"],"mappings":"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"}

package/dist/src/agent/service/webchat-tts.d.ts

@@ -1,8 +1,9 @@
 import type { Config } from '../../config/schema.js';
+import type { MediaRef } from '../../media/types.js';
 import type { SessionStore } from '../../session/index.js';
 export type WebchatTtsResult = {
     type: 'tts_audio';
-    workspaceRelativePath: string;
+    uri: string;
     mimeType: string;
     name: string;
 };
@@ -15,13 +16,7 @@ export type WebchatTtsDeps = {
     };
 };
 /**
- * Generate TTS for webchat when config allows; persist under agent home `tts/`.
+ * Generate TTS for webchat when config allows; persist under `{stateDir}/media/tts/`.
  */
 export declare function maybeEmitWebchatTts(deps: WebchatTtsDeps, sessionKey: string, hadInboundVoice: boolean): Promise<WebchatTtsResult | null>;
-export declare function appendAttachmentToLastAssistant(sessionStore: SessionStore, sessionKey: string, att: {
-    type: string;
-    mimeType: string;
-    name: string;
-    size: number;
-    workspaceRelativePath: string;
-}): Promise<void>;
+export declare function appendMediaToLastAssistant(sessionStore: SessionStore, sessionKey: string, ref: MediaRef): Promise<void>;

package/dist/src/agent/service/webchat-tts.js

@@ -1,5 +1,3 @@
-import { init_agent_scope, resolveAgentHomeDir } from "../agent-scope.js";
-import { extractProfileAgentId } from "../../config/agent-profile.js";
 import { isTTSAvailable } from "../../voice/tts/factory.js";
 import { speak } from "../../voice/tts/speak-core.js";
 import { mergeTtsConfigFromAppConfig } from "../../voice/tts/merge-config.js";
@@ -8,9 +6,8 @@ import { compressAudio } from "../../voice/tts/audio.js";
 import "../../voice/tts/index.js";
 import { persistOutboundTtsAudio } from "../../channels/attachments/outbound-tts-persist.js";
 //#region src/agent/service/webchat-tts.ts
-init_agent_scope();
 /**
-* Generate TTS for webchat when config allows; persist under agent home `tts/`.
+* Generate TTS for webchat when config allows; persist under `{stateDir}/media/tts/`.
 */
 async function maybeEmitWebchatTts(deps, sessionKey, hadInboundVoice) {
 	const ttsConfig = mergeTtsConfigFromAppConfig(deps.config?.messages?.tts);
@@ -27,18 +24,11 @@ async function maybeEmitWebchatTts(deps, sessionKey, hadInboundVoice) {
 		});
 		const { buffer, format } = await compressAudio(Buffer.from(ttsResult.audio), ttsResult.format, webOut.format === "mp3" ? "mp3" : "opus");
 		const normalizedMime = format === "opus" || format === "ogg" ? "audio/ogg" : format === "mp3" || format === "mpeg" ? "audio/mpeg" : format === "wav" ? "audio/wav" : `audio/${format}`;
-		const cfg = deps.config;
-		const persisted = await persistOutboundTtsAudio(resolveAgentHomeDir(cfg, extractProfileAgentId(sessionKey, cfg)), sessionKey, buffer, format);
-		await appendAttachmentToLastAssistant(deps.sessionStore, sessionKey, {
-			type: "audio",
-			mimeType: normalizedMime,
-			name: persisted.name,
-			size: persisted.size,
-			workspaceRelativePath: persisted.workspaceRelativePath
-		});
+		const persisted = await persistOutboundTtsAudio(buffer, format);
+		await appendMediaToLastAssistant(deps.sessionStore, sessionKey, persisted);
 		return {
 			type: "tts_audio",
-			workspaceRelativePath: persisted.workspaceRelativePath,
+			uri: persisted.uri,
 			mimeType: normalizedMime,
 			name: persisted.name
 		};
@@ -50,17 +40,16 @@ async function maybeEmitWebchatTts(deps, sessionKey, hadInboundVoice) {
 		return null;
 	}
 }
-async function appendAttachmentToLastAssistant(sessionStore, sessionKey, att) {
+async function appendMediaToLastAssistant(sessionStore, sessionKey, ref) {
 	const loaded = await sessionStore.load(sessionKey);
 	for (let i = loaded.length - 1; i >= 0; i--) {
 		const m = loaded[i];
 		if (m.role === "assistant") {
-			const prev = m.attachments ?? [];
-			if (prev.some((x) => x.workspaceRelativePath === att.workspaceRelativePath)) return;
-			const next = [...prev, att];
+			const prev = m.media ?? [];
+			if (prev.some((x) => x.uri === ref.uri)) return;
 			loaded[i] = {
 				...m,
-				attachments: next
+				media: [...prev, ref]
 			};
 			await sessionStore.saveMessages(sessionKey, loaded);
 			return;
@@ -68,6 +57,6 @@ async function appendAttachmentToLastAssistant(sessionStore, sessionKey, att) {
 	}
 }
 //#endregion
-export { appendAttachmentToLastAssistant, maybeEmitWebchatTts };
+export { appendMediaToLastAssistant, maybeEmitWebchatTts };
 
 //# sourceMappingURL=webchat-tts.js.map

package/dist/src/agent/service/webchat-tts.js.map

@@ -1 +1 @@
-{"version":3,"file":"webchat-tts.js","names":[],"sources":["../../../../src/agent/service/webchat-tts.ts"],"sourcesContent":["import type { Config } from '../../config/schema.js';\nimport { persistOutboundTtsAudio } from '../../channels/attachments/outbound-tts-persist.js';\nimport { compressAudio } from '../../voice/tts/audio.js';\nimport { speak } from '../../voice/tts/index.js';\nimport { mergeTtsConfigFromAppConfig } from '../../voice/tts/merge-config.js';\nimport { shouldUseTTS, getChannelOutputFormat } from '../../voice/tts/service.js';\nimport { isTTSAvailable } from '../../voice/tts/factory.js';\nimport { resolveAgentHomeDir } from '../agent-scope.js';\nimport { extractProfileAgentId } from '../../config/agent-profile.js';\nimport type { SessionStore } from '../../session/index.js';\nimport type { AgentMessage } from '@earendil-works/pi-agent-core';\n\nexport type WebchatTtsResult = {\n  type: 'tts_audio';\n  workspaceRelativePath: string;\n  mimeType: string;\n  name: string;\n};\n\nexport type WebchatTtsDeps = {\n  config: Config | undefined;\n  sessionStore: SessionStore;\n  getLastAssistantPlainText: (sessionKey: string) => string;\n  log: { warn: (obj: Record<string, unknown>, msg: string) => void };\n};\n\n/**\n * Generate TTS for webchat when config allows; persist under agent home `tts/`.\n */\nexport async function maybeEmitWebchatTts(\n  deps: WebchatTtsDeps,\n  sessionKey: string,\n  hadInboundVoice: boolean,\n): Promise<WebchatTtsResult | null> {\n  const ttsConfig = mergeTtsConfigFromAppConfig(deps.config?.messages?.tts);\n  if (!isTTSAvailable(ttsConfig)) {\n    return null;\n  }\n  const decision = shouldUseTTS(ttsConfig, hadInboundVoice);\n  if (!decision.useTTS) {\n    return null;\n  }\n  const text = deps.getLastAssistantPlainText(sessionKey).trim();\n  if (!text) {\n    return null;\n  }\n  try {\n    const webOut = getChannelOutputFormat('webchat');\n    const fmt = webOut.format as 'opus' | 'mp3' | 'wav';\n    const ttsResult = await speak(text, ttsConfig, {\n      appConfig: deps.config,\n      tts: { format: fmt },\n    });\n    const { buffer, format } = await compressAudio(\n      Buffer.from(ttsResult.audio),\n      ttsResult.format,\n      webOut.format === 'mp3' ? 'mp3' : 'opus',\n    );\n    const normalizedMime =\n      format === 'opus' || format === 'ogg'\n        ? 'audio/ogg'\n        : format === 'mp3' || format === 'mpeg'\n          ? 'audio/mpeg'\n          : format === 'wav'\n            ? 'audio/wav'\n            : `audio/${format}`;\n    const cfg = deps.config!;\n    const persisted = await persistOutboundTtsAudio(\n      resolveAgentHomeDir(cfg, extractProfileAgentId(sessionKey, cfg)),\n      sessionKey,\n      buffer,\n      format,\n    );\n    await appendAttachmentToLastAssistant(deps.sessionStore, sessionKey, {\n      type: 'audio',\n      mimeType: normalizedMime,\n      name: persisted.name,\n      size: persisted.size,\n      workspaceRelativePath: persisted.workspaceRelativePath,\n    });\n    return {\n      type: 'tts_audio',\n      workspaceRelativePath: persisted.workspaceRelativePath,\n      mimeType: normalizedMime,\n      name: persisted.name,\n    };\n  } catch (err) {\n    deps.log.warn({ err, sessionKey }, 'Webchat TTS failed');\n    return null;\n  }\n}\n\nexport async function appendAttachmentToLastAssistant(\n  sessionStore: SessionStore,\n  sessionKey: string,\n  att: {\n    type: string;\n    mimeType: string;\n    name: string;\n    size: number;\n    workspaceRelativePath: string;\n  },\n): Promise<void> {\n  const loaded = await sessionStore.load(sessionKey);\n  for (let i = loaded.length - 1; i >= 0; i--) {\n    const m = loaded[i] as { role?: string; attachments?: unknown[] };\n    if (m.role === 'assistant') {\n      const prev = (m.attachments ?? []) as Array<{ workspaceRelativePath?: string }>;\n      if (prev.some((x) => x.workspaceRelativePath === att.workspaceRelativePath)) {\n        return;\n      }\n      const next = [...prev, att];\n      loaded[i] = { ...m, attachments: next } as unknown as AgentMessage;\n      await sessionStore.saveMessages(sessionKey, loaded);\n      return;\n    }\n  }\n}\n"],"mappings":";;;;;;;;;;kBAOwD;;;;AAsBxD,eAAsB,oBACpB,MACA,YACA,iBACkC;CAClC,MAAM,YAAY,4BAA4B,KAAK,QAAQ,UAAU,IAAI;AACzE,KAAI,CAAC,eAAe,UAAU,CAC5B,QAAO;AAGT,KAAI,CADa,aAAa,WAAW,gBAC5B,CAAC,OACZ,QAAO;CAET,MAAM,OAAO,KAAK,0BAA0B,WAAW,CAAC,MAAM;AAC9D,KAAI,CAAC,KACH,QAAO;AAET,KAAI;EACF,MAAM,SAAS,uBAAuB,UAAU;EAChD,MAAM,MAAM,OAAO;EACnB,MAAM,YAAY,MAAM,MAAM,MAAM,WAAW;GAC7C,WAAW,KAAK;GAChB,KAAK,EAAE,QAAQ,KAAK;GACrB,CAAC;EACF,MAAM,EAAE,QAAQ,WAAW,MAAM,cAC/B,OAAO,KAAK,UAAU,MAAM,EAC5B,UAAU,QACV,OAAO,WAAW,QAAQ,QAAQ,OACnC;EACD,MAAM,iBACJ,WAAW,UAAU,WAAW,QAC5B,cACA,WAAW,SAAS,WAAW,SAC7B,eACA,WAAW,QACT,cACA,SAAS;EACnB,MAAM,MAAM,KAAK;EACjB,MAAM,YAAY,MAAM,wBACtB,oBAAoB,KAAK,sBAAsB,YAAY,IAAI,CAAC,EAChE,YACA,QACA,OACD;AACD,QAAM,gCAAgC,KAAK,cAAc,YAAY;GACnE,MAAM;GACN,UAAU;GACV,MAAM,UAAU;GAChB,MAAM,UAAU;GAChB,uBAAuB,UAAU;GAClC,CAAC;AACF,SAAO;GACL,MAAM;GACN,uBAAuB,UAAU;GACjC,UAAU;GACV,MAAM,UAAU;GACjB;UACM,KAAK;AACZ,OAAK,IAAI,KAAK;GAAE;GAAK;GAAY,EAAE,qBAAqB;AACxD,SAAO;;;AAIX,eAAsB,gCACpB,cACA,YACA,KAOe;CACf,MAAM,SAAS,MAAM,aAAa,KAAK,WAAW;AAClD,MAAK,IAAI,IAAI,OAAO,SAAS,GAAG,KAAK,GAAG,KAAK;EAC3C,MAAM,IAAI,OAAO;AACjB,MAAI,EAAE,SAAS,aAAa;GAC1B,MAAM,OAAQ,EAAE,eAAe,EAAE;AACjC,OAAI,KAAK,MAAM,MAAM,EAAE,0BAA0B,IAAI,sBAAsB,CACzE;GAEF,MAAM,OAAO,CAAC,GAAG,MAAM,IAAI;AAC3B,UAAO,KAAK;IAAE,GAAG;IAAG,aAAa;IAAM;AACvC,SAAM,aAAa,aAAa,YAAY,OAAO;AACnD"}
+{"version":3,"file":"webchat-tts.js","names":[],"sources":["../../../../src/agent/service/webchat-tts.ts"],"sourcesContent":["import type { Config } from '../../config/schema.js';\nimport { persistOutboundTtsAudio } from '../../channels/attachments/outbound-tts-persist.js';\nimport type { MediaRef } from '../../media/types.js';\nimport { compressAudio } from '../../voice/tts/audio.js';\nimport { speak } from '../../voice/tts/index.js';\nimport { mergeTtsConfigFromAppConfig } from '../../voice/tts/merge-config.js';\nimport { shouldUseTTS, getChannelOutputFormat } from '../../voice/tts/service.js';\nimport { isTTSAvailable } from '../../voice/tts/factory.js';\nimport type { SessionStore } from '../../session/index.js';\nimport type { AgentMessage } from '@earendil-works/pi-agent-core';\n\nexport type WebchatTtsResult = {\n  type: 'tts_audio';\n  uri: string;\n  mimeType: string;\n  name: string;\n};\n\nexport type WebchatTtsDeps = {\n  config: Config | undefined;\n  sessionStore: SessionStore;\n  getLastAssistantPlainText: (sessionKey: string) => string;\n  log: { warn: (obj: Record<string, unknown>, msg: string) => void };\n};\n\n/**\n * Generate TTS for webchat when config allows; persist under `{stateDir}/media/tts/`.\n */\nexport async function maybeEmitWebchatTts(\n  deps: WebchatTtsDeps,\n  sessionKey: string,\n  hadInboundVoice: boolean,\n): Promise<WebchatTtsResult | null> {\n  const ttsConfig = mergeTtsConfigFromAppConfig(deps.config?.messages?.tts);\n  if (!isTTSAvailable(ttsConfig)) {\n    return null;\n  }\n  const decision = shouldUseTTS(ttsConfig, hadInboundVoice);\n  if (!decision.useTTS) {\n    return null;\n  }\n  const text = deps.getLastAssistantPlainText(sessionKey).trim();\n  if (!text) {\n    return null;\n  }\n  try {\n    const webOut = getChannelOutputFormat('webchat');\n    const fmt = webOut.format as 'opus' | 'mp3' | 'wav';\n    const ttsResult = await speak(text, ttsConfig, {\n      appConfig: deps.config,\n      tts: { format: fmt },\n    });\n    const { buffer, format } = await compressAudio(\n      Buffer.from(ttsResult.audio),\n      ttsResult.format,\n      webOut.format === 'mp3' ? 'mp3' : 'opus',\n    );\n    const normalizedMime =\n      format === 'opus' || format === 'ogg'\n        ? 'audio/ogg'\n        : format === 'mp3' || format === 'mpeg'\n          ? 'audio/mpeg'\n          : format === 'wav'\n            ? 'audio/wav'\n            : `audio/${format}`;\n    const persisted = await persistOutboundTtsAudio(buffer, format);\n    await appendMediaToLastAssistant(deps.sessionStore, sessionKey, persisted);\n    return {\n      type: 'tts_audio',\n      uri: persisted.uri,\n      mimeType: normalizedMime,\n      name: persisted.name,\n    };\n  } catch (err) {\n    deps.log.warn({ err, sessionKey }, 'Webchat TTS failed');\n    return null;\n  }\n}\n\nexport async function appendMediaToLastAssistant(\n  sessionStore: SessionStore,\n  sessionKey: string,\n  ref: MediaRef,\n): Promise<void> {\n  const loaded = await sessionStore.load(sessionKey);\n  for (let i = loaded.length - 1; i >= 0; i--) {\n    const m = loaded[i] as { role?: string; media?: MediaRef[] };\n    if (m.role === 'assistant') {\n      const prev = m.media ?? [];\n      if (prev.some((x) => x.uri === ref.uri)) {\n        return;\n      }\n      loaded[i] = { ...m, media: [...prev, ref] } as unknown as AgentMessage;\n      await sessionStore.saveMessages(sessionKey, loaded);\n      return;\n    }\n  }\n}\n"],"mappings":";;;;;;;;;;;AA4BA,eAAsB,oBACpB,MACA,YACA,iBACkC;CAClC,MAAM,YAAY,4BAA4B,KAAK,QAAQ,UAAU,IAAI;AACzE,KAAI,CAAC,eAAe,UAAU,CAC5B,QAAO;AAGT,KAAI,CADa,aAAa,WAAW,gBAC5B,CAAC,OACZ,QAAO;CAET,MAAM,OAAO,KAAK,0BAA0B,WAAW,CAAC,MAAM;AAC9D,KAAI,CAAC,KACH,QAAO;AAET,KAAI;EACF,MAAM,SAAS,uBAAuB,UAAU;EAChD,MAAM,MAAM,OAAO;EACnB,MAAM,YAAY,MAAM,MAAM,MAAM,WAAW;GAC7C,WAAW,KAAK;GAChB,KAAK,EAAE,QAAQ,KAAK;GACrB,CAAC;EACF,MAAM,EAAE,QAAQ,WAAW,MAAM,cAC/B,OAAO,KAAK,UAAU,MAAM,EAC5B,UAAU,QACV,OAAO,WAAW,QAAQ,QAAQ,OACnC;EACD,MAAM,iBACJ,WAAW,UAAU,WAAW,QAC5B,cACA,WAAW,SAAS,WAAW,SAC7B,eACA,WAAW,QACT,cACA,SAAS;EACnB,MAAM,YAAY,MAAM,wBAAwB,QAAQ,OAAO;AAC/D,QAAM,2BAA2B,KAAK,cAAc,YAAY,UAAU;AAC1E,SAAO;GACL,MAAM;GACN,KAAK,UAAU;GACf,UAAU;GACV,MAAM,UAAU;GACjB;UACM,KAAK;AACZ,OAAK,IAAI,KAAK;GAAE;GAAK;GAAY,EAAE,qBAAqB;AACxD,SAAO;;;AAIX,eAAsB,2BACpB,cACA,YACA,KACe;CACf,MAAM,SAAS,MAAM,aAAa,KAAK,WAAW;AAClD,MAAK,IAAI,IAAI,OAAO,SAAS,GAAG,KAAK,GAAG,KAAK;EAC3C,MAAM,IAAI,OAAO;AACjB,MAAI,EAAE,SAAS,aAAa;GAC1B,MAAM,OAAO,EAAE,SAAS,EAAE;AAC1B,OAAI,KAAK,MAAM,MAAM,EAAE,QAAQ,IAAI,IAAI,CACrC;AAEF,UAAO,KAAK;IAAE,GAAG;IAAG,OAAO,CAAC,GAAG,MAAM,IAAI;IAAE;AAC3C,SAAM,aAAa,aAAa,YAAY,OAAO;AACnD"}