@xopcai/xopc 0.0.104 → 0.0.106

package/dist/src/agent/mcp/mcp-transport-config.js

@@ -71,12 +71,8 @@ function resolveMcpTransportConfig(serverName, rawServer) {
 		log.warn(`bundle-mcp: skipped server "${logServerName}" because transport "${sanitizeForLog(effectiveTransport)}" is not supported.`);
 		return null;
 	}
-	if (effectiveTransport === "streamable-http") {
-		const httpTransport = resolveHttpTransportConfig(serverName, rawServer, "streamable-http");
-		if (httpTransport) return httpTransport;
-	}
-	const sseTransport = resolveHttpTransportConfig(serverName, rawServer, "sse");
-	if (sseTransport) return sseTransport;
+	const httpTransport = resolveHttpTransportConfig(serverName, rawServer, effectiveTransport === "sse" ? "sse" : "streamable-http");
+	if (httpTransport) return httpTransport;
 	const stdioReason = stdioLaunch.ok === false ? stdioLaunch.reason : "not a stdio server";
 	const httpLaunch = resolveHttpMcpServerLaunchConfig(rawServer);
 	const httpReason = httpLaunch.ok === false ? httpLaunch.reason : "not an HTTP MCP server";

package/dist/src/agent/mcp/mcp-transport-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-transport-config.js","names":[],"sources":["../../../../src/agent/mcp/mcp-transport-config.ts"],"sourcesContent":["import { resolveXopcMcpTransportAlias } from \"../../config/mcp-config-normalize.js\";\nimport { createLogger } from \"../../utils/logger.js\";\nconst log = createLogger(\"Mcp:Bundle\");\nimport { normalizeLowercaseStringOrEmpty } from \"../../utils/string-coerce.js\";\nimport { sanitizeForLog } from \"../../utils/sanitize-log.js\";\nimport {\n  describeHttpMcpServerLaunchConfig,\n  resolveHttpMcpServerLaunchConfig,\n  type HttpMcpTransportType,\n} from \"./mcp-http.js\";\nimport {\n  describeStdioMcpServerLaunchConfig,\n  resolveStdioMcpServerLaunchConfig,\n} from \"./mcp-stdio.js\";\n\ntype ResolvedBaseMcpTransportConfig = {\n  description: string;\n  connectionTimeoutMs: number;\n};\n\nexport type ResolvedStdioMcpTransportConfig = ResolvedBaseMcpTransportConfig & {\n  kind: \"stdio\";\n  transportType: \"stdio\";\n  command: string;\n  args?: string[];\n  env?: Record<string, string>;\n  cwd?: string;\n};\n\nexport type ResolvedHttpMcpTransportConfig = ResolvedBaseMcpTransportConfig & {\n  kind: \"http\";\n  transportType: HttpMcpTransportType;\n  url: string;\n  headers?: Record<string, string>;\n};\n\nexport type ResolvedMcpTransportConfig =\n  | ResolvedStdioMcpTransportConfig\n  | ResolvedHttpMcpTransportConfig;\n\nconst DEFAULT_CONNECTION_TIMEOUT_MS = 30_000;\n\nfunction getConnectionTimeoutMs(rawServer: unknown): number {\n  if (\n    rawServer &&\n    typeof rawServer === \"object\" &&\n    typeof (rawServer as { connectionTimeoutMs?: unknown }).connectionTimeoutMs === \"number\" &&\n    (rawServer as { connectionTimeoutMs: number }).connectionTimeoutMs > 0\n  ) {\n    return (rawServer as { connectionTimeoutMs: number }).connectionTimeoutMs;\n  }\n  return DEFAULT_CONNECTION_TIMEOUT_MS;\n}\n\nfunction getRequestedTransport(rawServer: unknown): string {\n  if (\n    !rawServer ||\n    typeof rawServer !== \"object\" ||\n    typeof (rawServer as { transport?: unknown }).transport !== \"string\"\n  ) {\n    return \"\";\n  }\n  return normalizeLowercaseStringOrEmpty((rawServer as { transport?: string }).transport);\n}\n\nfunction getRequestedTransportAlias(rawServer: unknown): HttpMcpTransportType | \"\" {\n  if (\n    !rawServer ||\n    typeof rawServer !== \"object\" ||\n    typeof (rawServer as { type?: unknown }).type !== \"string\"\n  ) {\n    return \"\";\n  }\n  return resolveXopcMcpTransportAlias((rawServer as { type?: string }).type) ?? \"\";\n}\n\nfunction resolveHttpTransportConfig(\n  serverName: string,\n  rawServer: unknown,\n  transportType: HttpMcpTransportType,\n): ResolvedHttpMcpTransportConfig | null {\n  const launch = resolveHttpMcpServerLaunchConfig(rawServer, {\n    transportType,\n    onDroppedHeader: (key) => {\n      log.warn(\n        {\n          phase: 'agent.mcp_connect',\n          serverName,\n          header: key,\n        },\n        `bundle-mcp: server \"${serverName}\": header \"${key}\" has an unsupported value type and was ignored`,\n      );\n    },\n    onMalformedHeaders: () => {\n      log.warn(\n        { phase: 'agent.mcp_connect', serverName },\n        `bundle-mcp: server \"${serverName}\": \"headers\" must be a JSON object; the value was ignored`,\n      );\n    },\n  });\n  if (!launch.ok) {\n    return null;\n  }\n  return {\n    kind: \"http\",\n    transportType: launch.config.transportType,\n    url: launch.config.url,\n    headers: launch.config.headers,\n    description: describeHttpMcpServerLaunchConfig(launch.config),\n    connectionTimeoutMs: getConnectionTimeoutMs(rawServer),\n  };\n}\n\nexport function resolveMcpTransportConfig(\n  serverName: string,\n  rawServer: unknown,\n): ResolvedMcpTransportConfig | null {\n  const logServerName = sanitizeForLog(serverName);\n  const requestedTransport = getRequestedTransport(rawServer);\n  const requestedTransportAlias = requestedTransport ? \"\" : getRequestedTransportAlias(rawServer);\n  const effectiveTransport = requestedTransport || requestedTransportAlias;\n  const stdioLaunch = resolveStdioMcpServerLaunchConfig(rawServer, {\n    onDroppedEnv: (key) => {\n      log.warn(\n        `bundle-mcp: server \"${logServerName}\": env \"${sanitizeForLog(key)}\" is blocked for stdio startup safety and was ignored.`,\n      );\n    },\n  });\n  if (stdioLaunch.ok) {\n    return {\n      kind: \"stdio\",\n      transportType: \"stdio\",\n      command: stdioLaunch.config.command,\n      args: stdioLaunch.config.args,\n      env: stdioLaunch.config.env,\n      cwd: stdioLaunch.config.cwd,\n      description: describeStdioMcpServerLaunchConfig(stdioLaunch.config),\n      connectionTimeoutMs: getConnectionTimeoutMs(rawServer),\n    };\n  }\n\n  if (\n    effectiveTransport &&\n    effectiveTransport !== \"sse\" &&\n    effectiveTransport !== \"streamable-http\"\n  ) {\n    log.warn(\n      `bundle-mcp: skipped server \"${logServerName}\" because transport \"${sanitizeForLog(effectiveTransport)}\" is not supported.`,\n    );\n    return null;\n  }\n\n  if (effectiveTransport === \"streamable-http\") {\n    const httpTransport = resolveHttpTransportConfig(serverName, rawServer, \"streamable-http\");\n    if (httpTransport) {\n      return httpTransport;\n    }\n  }\n\n  const sseTransport = resolveHttpTransportConfig(serverName, rawServer, \"sse\");\n  if (sseTransport) {\n    return sseTransport;\n  }\n\n  const stdioReason =\n    stdioLaunch.ok === false ? stdioLaunch.reason : 'not a stdio server';\n  const httpLaunch = resolveHttpMcpServerLaunchConfig(rawServer);\n  const httpReason =\n    httpLaunch.ok === false ? httpLaunch.reason : 'not an HTTP MCP server';\n  log.warn(\n    `bundle-mcp: skipped server \"${logServerName}\" because ${stdioReason} and ${httpReason}.`,\n  );\n  return null;\n}\n"],"mappings":";;;;;;;;aACqD;oBAE0B;AAD/E,MAAM,MAAM,aAAa,aAAa;AAsCtC,MAAM,gCAAgC;AAEtC,SAAS,uBAAuB,WAA4B;AAC1D,KACE,aACA,OAAO,cAAc,YACrB,OAAQ,UAAgD,wBAAwB,YAC/E,UAA8C,sBAAsB,EAErE,QAAQ,UAA8C;AAExD,QAAO;;AAGT,SAAS,sBAAsB,WAA4B;AACzD,KACE,CAAC,aACD,OAAO,cAAc,YACrB,OAAQ,UAAsC,cAAc,SAE5D,QAAO;AAET,QAAO,gCAAiC,UAAqC,UAAU;;AAGzF,SAAS,2BAA2B,WAA+C;AACjF,KACE,CAAC,aACD,OAAO,cAAc,YACrB,OAAQ,UAAiC,SAAS,SAElD,QAAO;AAET,QAAO,6BAA8B,UAAgC,KAAK,IAAI;;AAGhF,SAAS,2BACP,YACA,WACA,eACuC;CACvC,MAAM,SAAS,iCAAiC,WAAW;EACzD;EACA,kBAAkB,QAAQ;AACxB,OAAI,KACF;IACE,OAAO;IACP;IACA,QAAQ;IACT,EACD,uBAAuB,WAAW,aAAa,IAAI,iDACpD;;EAEH,0BAA0B;AACxB,OAAI,KACF;IAAE,OAAO;IAAqB;IAAY,EAC1C,uBAAuB,WAAW,2DACnC;;EAEJ,CAAC;AACF,KAAI,CAAC,OAAO,GACV,QAAO;AAET,QAAO;EACL,MAAM;EACN,eAAe,OAAO,OAAO;EAC7B,KAAK,OAAO,OAAO;EACnB,SAAS,OAAO,OAAO;EACvB,aAAa,kCAAkC,OAAO,OAAO;EAC7D,qBAAqB,uBAAuB,UAAU;EACvD;;AAGH,SAAgB,0BACd,YACA,WACmC;CACnC,MAAM,gBAAgB,eAAe,WAAW;CAChD,MAAM,qBAAqB,sBAAsB,UAAU;CAC3D,MAAM,0BAA0B,qBAAqB,KAAK,2BAA2B,UAAU;CAC/F,MAAM,qBAAqB,sBAAsB;CACjD,MAAM,cAAc,kCAAkC,WAAW,EAC/D,eAAe,QAAQ;AACrB,MAAI,KACF,uBAAuB,cAAc,UAAU,eAAe,IAAI,CAAC,wDACpE;IAEJ,CAAC;AACF,KAAI,YAAY,GACd,QAAO;EACL,MAAM;EACN,eAAe;EACf,SAAS,YAAY,OAAO;EAC5B,MAAM,YAAY,OAAO;EACzB,KAAK,YAAY,OAAO;EACxB,KAAK,YAAY,OAAO;EACxB,aAAa,mCAAmC,YAAY,OAAO;EACnE,qBAAqB,uBAAuB,UAAU;EACvD;AAGH,KACE,sBACA,uBAAuB,SACvB,uBAAuB,mBACvB;AACA,MAAI,KACF,+BAA+B,cAAc,uBAAuB,eAAe,mBAAmB,CAAC,qBACxG;AACD,SAAO;;AAGT,KAAI,uBAAuB,mBAAmB;EAC5C,MAAM,gBAAgB,2BAA2B,YAAY,WAAW,kBAAkB;AAC1F,MAAI,cACF,QAAO;;CAIX,MAAM,eAAe,2BAA2B,YAAY,WAAW,MAAM;AAC7E,KAAI,aACF,QAAO;CAGT,MAAM,cACJ,YAAY,OAAO,QAAQ,YAAY,SAAS;CAClD,MAAM,aAAa,iCAAiC,UAAU;CAC9D,MAAM,aACJ,WAAW,OAAO,QAAQ,WAAW,SAAS;AAChD,KAAI,KACF,+BAA+B,cAAc,YAAY,YAAY,OAAO,WAAW,GACxF;AACD,QAAO"}
+{"version":3,"file":"mcp-transport-config.js","names":[],"sources":["../../../../src/agent/mcp/mcp-transport-config.ts"],"sourcesContent":["import { resolveXopcMcpTransportAlias } from \"../../config/mcp-config-normalize.js\";\nimport { createLogger } from \"../../utils/logger.js\";\nconst log = createLogger(\"Mcp:Bundle\");\nimport { normalizeLowercaseStringOrEmpty } from \"../../utils/string-coerce.js\";\nimport { sanitizeForLog } from \"../../utils/sanitize-log.js\";\nimport {\n  describeHttpMcpServerLaunchConfig,\n  resolveHttpMcpServerLaunchConfig,\n  type HttpMcpTransportType,\n} from \"./mcp-http.js\";\nimport {\n  describeStdioMcpServerLaunchConfig,\n  resolveStdioMcpServerLaunchConfig,\n} from \"./mcp-stdio.js\";\n\ntype ResolvedBaseMcpTransportConfig = {\n  description: string;\n  connectionTimeoutMs: number;\n};\n\nexport type ResolvedStdioMcpTransportConfig = ResolvedBaseMcpTransportConfig & {\n  kind: \"stdio\";\n  transportType: \"stdio\";\n  command: string;\n  args?: string[];\n  env?: Record<string, string>;\n  cwd?: string;\n};\n\nexport type ResolvedHttpMcpTransportConfig = ResolvedBaseMcpTransportConfig & {\n  kind: \"http\";\n  transportType: HttpMcpTransportType;\n  url: string;\n  headers?: Record<string, string>;\n};\n\nexport type ResolvedMcpTransportConfig =\n  | ResolvedStdioMcpTransportConfig\n  | ResolvedHttpMcpTransportConfig;\n\nconst DEFAULT_CONNECTION_TIMEOUT_MS = 30_000;\n\nfunction getConnectionTimeoutMs(rawServer: unknown): number {\n  if (\n    rawServer &&\n    typeof rawServer === \"object\" &&\n    typeof (rawServer as { connectionTimeoutMs?: unknown }).connectionTimeoutMs === \"number\" &&\n    (rawServer as { connectionTimeoutMs: number }).connectionTimeoutMs > 0\n  ) {\n    return (rawServer as { connectionTimeoutMs: number }).connectionTimeoutMs;\n  }\n  return DEFAULT_CONNECTION_TIMEOUT_MS;\n}\n\nfunction getRequestedTransport(rawServer: unknown): string {\n  if (\n    !rawServer ||\n    typeof rawServer !== \"object\" ||\n    typeof (rawServer as { transport?: unknown }).transport !== \"string\"\n  ) {\n    return \"\";\n  }\n  return normalizeLowercaseStringOrEmpty((rawServer as { transport?: string }).transport);\n}\n\nfunction getRequestedTransportAlias(rawServer: unknown): HttpMcpTransportType | \"\" {\n  if (\n    !rawServer ||\n    typeof rawServer !== \"object\" ||\n    typeof (rawServer as { type?: unknown }).type !== \"string\"\n  ) {\n    return \"\";\n  }\n  return resolveXopcMcpTransportAlias((rawServer as { type?: string }).type) ?? \"\";\n}\n\nfunction resolveHttpTransportConfig(\n  serverName: string,\n  rawServer: unknown,\n  transportType: HttpMcpTransportType,\n): ResolvedHttpMcpTransportConfig | null {\n  const launch = resolveHttpMcpServerLaunchConfig(rawServer, {\n    transportType,\n    onDroppedHeader: (key) => {\n      log.warn(\n        {\n          phase: 'agent.mcp_connect',\n          serverName,\n          header: key,\n        },\n        `bundle-mcp: server \"${serverName}\": header \"${key}\" has an unsupported value type and was ignored`,\n      );\n    },\n    onMalformedHeaders: () => {\n      log.warn(\n        { phase: 'agent.mcp_connect', serverName },\n        `bundle-mcp: server \"${serverName}\": \"headers\" must be a JSON object; the value was ignored`,\n      );\n    },\n  });\n  if (!launch.ok) {\n    return null;\n  }\n  return {\n    kind: \"http\",\n    transportType: launch.config.transportType,\n    url: launch.config.url,\n    headers: launch.config.headers,\n    description: describeHttpMcpServerLaunchConfig(launch.config),\n    connectionTimeoutMs: getConnectionTimeoutMs(rawServer),\n  };\n}\n\nexport function resolveMcpTransportConfig(\n  serverName: string,\n  rawServer: unknown,\n): ResolvedMcpTransportConfig | null {\n  const logServerName = sanitizeForLog(serverName);\n  const requestedTransport = getRequestedTransport(rawServer);\n  const requestedTransportAlias = requestedTransport ? \"\" : getRequestedTransportAlias(rawServer);\n  const effectiveTransport = requestedTransport || requestedTransportAlias;\n  const stdioLaunch = resolveStdioMcpServerLaunchConfig(rawServer, {\n    onDroppedEnv: (key) => {\n      log.warn(\n        `bundle-mcp: server \"${logServerName}\": env \"${sanitizeForLog(key)}\" is blocked for stdio startup safety and was ignored.`,\n      );\n    },\n  });\n  if (stdioLaunch.ok) {\n    return {\n      kind: \"stdio\",\n      transportType: \"stdio\",\n      command: stdioLaunch.config.command,\n      args: stdioLaunch.config.args,\n      env: stdioLaunch.config.env,\n      cwd: stdioLaunch.config.cwd,\n      description: describeStdioMcpServerLaunchConfig(stdioLaunch.config),\n      connectionTimeoutMs: getConnectionTimeoutMs(rawServer),\n    };\n  }\n\n  if (\n    effectiveTransport &&\n    effectiveTransport !== \"sse\" &&\n    effectiveTransport !== \"streamable-http\"\n  ) {\n    log.warn(\n      `bundle-mcp: skipped server \"${logServerName}\" because transport \"${sanitizeForLog(effectiveTransport)}\" is not supported.`,\n    );\n    return null;\n  }\n\n  const httpTransport = resolveHttpTransportConfig(\n    serverName,\n    rawServer,\n    effectiveTransport === \"sse\" ? \"sse\" : \"streamable-http\",\n  );\n  if (httpTransport) {\n    return httpTransport;\n  }\n\n  const stdioReason =\n    stdioLaunch.ok === false ? stdioLaunch.reason : 'not a stdio server';\n  const httpLaunch = resolveHttpMcpServerLaunchConfig(rawServer);\n  const httpReason =\n    httpLaunch.ok === false ? httpLaunch.reason : 'not an HTTP MCP server';\n  log.warn(\n    `bundle-mcp: skipped server \"${logServerName}\" because ${stdioReason} and ${httpReason}.`,\n  );\n  return null;\n}\n"],"mappings":";;;;;;;;aACqD;oBAE0B;AAD/E,MAAM,MAAM,aAAa,aAAa;AAsCtC,MAAM,gCAAgC;AAEtC,SAAS,uBAAuB,WAA4B;AAC1D,KACE,aACA,OAAO,cAAc,YACrB,OAAQ,UAAgD,wBAAwB,YAC/E,UAA8C,sBAAsB,EAErE,QAAQ,UAA8C;AAExD,QAAO;;AAGT,SAAS,sBAAsB,WAA4B;AACzD,KACE,CAAC,aACD,OAAO,cAAc,YACrB,OAAQ,UAAsC,cAAc,SAE5D,QAAO;AAET,QAAO,gCAAiC,UAAqC,UAAU;;AAGzF,SAAS,2BAA2B,WAA+C;AACjF,KACE,CAAC,aACD,OAAO,cAAc,YACrB,OAAQ,UAAiC,SAAS,SAElD,QAAO;AAET,QAAO,6BAA8B,UAAgC,KAAK,IAAI;;AAGhF,SAAS,2BACP,YACA,WACA,eACuC;CACvC,MAAM,SAAS,iCAAiC,WAAW;EACzD;EACA,kBAAkB,QAAQ;AACxB,OAAI,KACF;IACE,OAAO;IACP;IACA,QAAQ;IACT,EACD,uBAAuB,WAAW,aAAa,IAAI,iDACpD;;EAEH,0BAA0B;AACxB,OAAI,KACF;IAAE,OAAO;IAAqB;IAAY,EAC1C,uBAAuB,WAAW,2DACnC;;EAEJ,CAAC;AACF,KAAI,CAAC,OAAO,GACV,QAAO;AAET,QAAO;EACL,MAAM;EACN,eAAe,OAAO,OAAO;EAC7B,KAAK,OAAO,OAAO;EACnB,SAAS,OAAO,OAAO;EACvB,aAAa,kCAAkC,OAAO,OAAO;EAC7D,qBAAqB,uBAAuB,UAAU;EACvD;;AAGH,SAAgB,0BACd,YACA,WACmC;CACnC,MAAM,gBAAgB,eAAe,WAAW;CAChD,MAAM,qBAAqB,sBAAsB,UAAU;CAC3D,MAAM,0BAA0B,qBAAqB,KAAK,2BAA2B,UAAU;CAC/F,MAAM,qBAAqB,sBAAsB;CACjD,MAAM,cAAc,kCAAkC,WAAW,EAC/D,eAAe,QAAQ;AACrB,MAAI,KACF,uBAAuB,cAAc,UAAU,eAAe,IAAI,CAAC,wDACpE;IAEJ,CAAC;AACF,KAAI,YAAY,GACd,QAAO;EACL,MAAM;EACN,eAAe;EACf,SAAS,YAAY,OAAO;EAC5B,MAAM,YAAY,OAAO;EACzB,KAAK,YAAY,OAAO;EACxB,KAAK,YAAY,OAAO;EACxB,aAAa,mCAAmC,YAAY,OAAO;EACnE,qBAAqB,uBAAuB,UAAU;EACvD;AAGH,KACE,sBACA,uBAAuB,SACvB,uBAAuB,mBACvB;AACA,MAAI,KACF,+BAA+B,cAAc,uBAAuB,eAAe,mBAAmB,CAAC,qBACxG;AACD,SAAO;;CAGT,MAAM,gBAAgB,2BACpB,YACA,WACA,uBAAuB,QAAQ,QAAQ,kBACxC;AACD,KAAI,cACF,QAAO;CAGT,MAAM,cACJ,YAAY,OAAO,QAAQ,YAAY,SAAS;CAClD,MAAM,aAAa,iCAAiC,UAAU;CAC9D,MAAM,aACJ,WAAW,OAAO,QAAQ,WAAW,SAAS;AAChD,KAAI,KACF,+BAA+B,cAAc,YAAY,YAAY,OAAO,WAAW,GACxF;AACD,QAAO"}

package/dist/src/agent/prompt/memory/index.js

@@ -3,7 +3,7 @@ import { init_logger } from "../../../utils/logger.js";
 import { requireXopcDatabase } from "../../../storage/sqlite/connection.js";
 import { resolveAgentIdFromMemoriesDir, searchMemoryIndex, syncMemoryIndex } from "../../../storage/sqlite/memory-index-repository.js";
 import "../../../storage/sqlite/index.js";
-import { join } from "path";
+import { join, relative } from "path";
 import { existsSync, readFileSync } from "fs";
 //#region src/agent/prompt/memory/index.ts
 init_logger();
@@ -12,6 +12,30 @@ const CURATED_MEMORY_FILENAMES = new Set(["MEMORY.md", "USER.md"]);
 function ensureMemoryDatabase() {
 	requireXopcDatabase();
 }
+function fallbackMemorySearch(baseDir, query, options) {
+	const normalizedQuery = query.trim().toLowerCase();
+	if (!normalizedQuery) return [];
+	const memoriesDir = options.memoriesDir;
+	const candidatePaths = [...memoriesDir ? [...CURATED_MEMORY_FILENAMES].map((filename) => join(memoriesDir, filename)).filter((path) => existsSync(path)) : [], join(baseDir, "MEMORY.md")].filter((path) => existsSync(path));
+	const matches = [];
+	for (const path of candidatePaths) {
+		const lines = readFileSync(path, "utf-8").split("\n");
+		for (let i = 0; i < lines.length; i++) {
+			const line = lines[i];
+			if (!line.toLowerCase().includes(normalizedQuery)) continue;
+			const score = 1;
+			if (score < options.minScore) continue;
+			const file = memoriesDir && path.startsWith(memoriesDir) ? path.slice(memoriesDir.length).replace(/^[/\\]/, "") : relative(baseDir, path).replace(/\\/g, "/");
+			matches.push({
+				file,
+				lines: line,
+				score,
+				lineNumbers: [i + 1]
+			});
+		}
+	}
+	return matches.slice(0, options.maxResults);
+}
 async function memorySearch(baseDir, query, options = {}) {
 	const { maxResults = 5, minScore = .3, memoriesDir, agentId } = options;
 	const resolvedAgentId = agentId ?? resolveAgentIdFromMemoriesDir(memoriesDir);
@@ -40,7 +64,11 @@ async function memorySearch(baseDir, query, options = {}) {
 			errorMessage: em,
 			agentId: resolvedAgentId
 		}, `Memory FTS search failed: ${em}`);
-		return [];
+		return fallbackMemorySearch(baseDir, query, {
+			maxResults,
+			minScore,
+			memoriesDir
+		});
 	}
 }
 function memoryGet(baseDir, path, from, lines, memoriesDir) {

package/dist/src/agent/prompt/memory/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../../../../../src/agent/prompt/memory/index.ts"],"sourcesContent":["// Memory Search - FTS-backed recall with markdown file reads for snippets\nimport { readFileSync, existsSync } from 'fs';\nimport { join } from 'path';\n\nimport { createLogger } from '../../../utils/logger.js';\nimport {\n  requireXopcDatabase,\n  resolveAgentIdFromMemoriesDir,\n  searchMemoryIndex,\n  syncMemoryIndex,\n} from '../../../storage/sqlite/index.js';\n\nconst log = createLogger('MemorySearch');\n\n// =============================================================================\n// Types (Internal)\n// =============================================================================\n\ninterface MemoryMatch {\n  file: string;\n  lines: string;\n  score: number;\n  lineNumbers: number[];\n}\n\nexport interface MemorySearchOptions {\n  maxResults?: number;\n  minScore?: number;\n  /** Absolute path to agent-scoped curated memories dir (MEMORY.md + USER.md). */\n  memoriesDir?: string;\n  agentId?: string;\n}\n\nconst CURATED_MEMORY_FILENAMES = new Set(['MEMORY.md', 'USER.md']);\n\nfunction ensureMemoryDatabase(): void {\n  requireXopcDatabase();\n}\n\n// =============================================================================\n// Main Search Function (Exported)\n// =============================================================================\n\nexport async function memorySearch(\n  baseDir: string,\n  query: string,\n  options: MemorySearchOptions = {},\n): Promise<MemoryMatch[]> {\n  const { maxResults = 5, minScore = 0.3, memoriesDir, agentId } = options;\n  const resolvedAgentId = agentId ?? resolveAgentIdFromMemoriesDir(memoriesDir);\n\n  try {\n    ensureMemoryDatabase();\n    syncMemoryIndex({ agentId: resolvedAgentId, workspaceDir: baseDir, memoriesDir });\n    const hits = searchMemoryIndex({\n      agentId: resolvedAgentId,\n      query,\n      maxResults,\n      minScore,\n    });\n    return hits.map((hit) => ({\n      file: hit.path,\n      lines: hit.lines,\n      score: hit.score,\n      lineNumbers: hit.lineNumbers,\n    }));\n  } catch (err) {\n    const em = err instanceof Error ? err.message : String(err);\n    log.warn({ err, errorMessage: em, agentId: resolvedAgentId }, `Memory FTS search failed: ${em}`);\n    return [];\n  }\n}\n\n// =============================================================================\n// Memory Get (Read Snippet) (Exported)\n// =============================================================================\n\nexport function memoryGet(\n  baseDir: string,\n  path: string,\n  from?: number,\n  lines?: number,\n  memoriesDir?: string,\n): { content: string; lineNumbers: { start: number; end: number } } | null {\n  let fullPath = path.startsWith('/') ? path : join(baseDir, path);\n\n  if (!existsSync(fullPath) && memoriesDir) {\n    const segments = path.split(/[/\\\\]/);\n    const filename = segments.pop() ?? path;\n    if (CURATED_MEMORY_FILENAMES.has(filename)) {\n      const candidatePath = join(memoriesDir, filename);\n      if (existsSync(candidatePath)) {\n        fullPath = candidatePath;\n      }\n    }\n  }\n\n  if (!existsSync(fullPath)) {\n    return null;\n  }\n\n  const content = readFileSync(fullPath, 'utf-8');\n  const allLines = content.split('\\n');\n\n  const start = from || 1;\n  const count = lines || 10;\n  const end = Math.min(start + count - 1, allLines.length);\n\n  const snippet = allLines.slice(start - 1, end).join('\\n');\n\n  return {\n    content: snippet,\n    lineNumbers: { start, end },\n  };\n}\n"],"mappings":";;;;;;;;aAIwD;AAQxD,MAAM,MAAM,aAAa,eAAe;AAqBxC,MAAM,2BAA2B,IAAI,IAAI,CAAC,aAAa,UAAU,CAAC;AAElE,SAAS,uBAA6B;AACpC,sBAAqB;;AAOvB,eAAsB,aACpB,SACA,OACA,UAA+B,EAAE,EACT;CACxB,MAAM,EAAE,aAAa,GAAG,WAAW,IAAK,aAAa,YAAY;CACjE,MAAM,kBAAkB,WAAW,8BAA8B,YAAY;AAE7E,KAAI;AACF,wBAAsB;AACtB,kBAAgB;GAAE,SAAS;GAAiB,cAAc;GAAS;GAAa,CAAC;AAOjF,SANa,kBAAkB;GAC7B,SAAS;GACT;GACA;GACA;GACD,CACU,CAAC,KAAK,SAAS;GACxB,MAAM,IAAI;GACV,OAAO,IAAI;GACX,OAAO,IAAI;GACX,aAAa,IAAI;GAClB,EAAE;UACI,KAAK;EACZ,MAAM,KAAK,eAAe,QAAQ,IAAI,UAAU,OAAO,IAAI;AAC3D,MAAI,KAAK;GAAE;GAAK,cAAc;GAAI,SAAS;GAAiB,EAAE,6BAA6B,KAAK;AAChG,SAAO,EAAE;;;AAQb,SAAgB,UACd,SACA,MACA,MACA,OACA,aACyE;CACzE,IAAI,WAAW,KAAK,WAAW,IAAI,GAAG,OAAO,KAAK,SAAS,KAAK;AAEhE,KAAI,CAAC,WAAW,SAAS,IAAI,aAAa;EAExC,MAAM,WADW,KAAK,MAAM,QACH,CAAC,KAAK,IAAI;AACnC,MAAI,yBAAyB,IAAI,SAAS,EAAE;GAC1C,MAAM,gBAAgB,KAAK,aAAa,SAAS;AACjD,OAAI,WAAW,cAAc,CAC3B,YAAW;;;AAKjB,KAAI,CAAC,WAAW,SAAS,CACvB,QAAO;CAIT,MAAM,WADU,aAAa,UAAU,QACf,CAAC,MAAM,KAAK;CAEpC,MAAM,QAAQ,QAAQ;CAEtB,MAAM,MAAM,KAAK,IAAI,SADP,SAAS,MACc,GAAG,SAAS,OAAO;AAIxD,QAAO;EACL,SAHc,SAAS,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,KAGlC;EAChB,aAAa;GAAE;GAAO;GAAK;EAC5B"}
+{"version":3,"file":"index.js","names":[],"sources":["../../../../../src/agent/prompt/memory/index.ts"],"sourcesContent":["// Memory Search - FTS-backed recall with markdown file reads for snippets\nimport { readFileSync, existsSync } from 'fs';\nimport { join, relative } from 'path';\n\nimport { createLogger } from '../../../utils/logger.js';\nimport {\n  requireXopcDatabase,\n  resolveAgentIdFromMemoriesDir,\n  searchMemoryIndex,\n  syncMemoryIndex,\n} from '../../../storage/sqlite/index.js';\n\nconst log = createLogger('MemorySearch');\n\n// =============================================================================\n// Types (Internal)\n// =============================================================================\n\ninterface MemoryMatch {\n  file: string;\n  lines: string;\n  score: number;\n  lineNumbers: number[];\n}\n\nexport interface MemorySearchOptions {\n  maxResults?: number;\n  minScore?: number;\n  /** Absolute path to agent-scoped curated memories dir (MEMORY.md + USER.md). */\n  memoriesDir?: string;\n  agentId?: string;\n}\n\nconst CURATED_MEMORY_FILENAMES = new Set(['MEMORY.md', 'USER.md']);\n\nfunction ensureMemoryDatabase(): void {\n  requireXopcDatabase();\n}\n\nfunction fallbackMemorySearch(\n  baseDir: string,\n  query: string,\n  options: Required<Pick<MemorySearchOptions, 'maxResults' | 'minScore'>> &\n    Pick<MemorySearchOptions, 'memoriesDir'>,\n): MemoryMatch[] {\n  const normalizedQuery = query.trim().toLowerCase();\n  if (!normalizedQuery) return [];\n\n  const memoriesDir = options.memoriesDir;\n  const curatedPaths = memoriesDir\n    ? [...CURATED_MEMORY_FILENAMES]\n        .map((filename) => join(memoriesDir, filename))\n        .filter((path) => existsSync(path))\n    : [];\n  const candidatePaths = [...curatedPaths, join(baseDir, 'MEMORY.md')].filter((path) => existsSync(path));\n\n  const matches: MemoryMatch[] = [];\n  for (const path of candidatePaths) {\n    const content = readFileSync(path, 'utf-8');\n    const lines = content.split('\\n');\n    for (let i = 0; i < lines.length; i++) {\n      const line = lines[i];\n      if (!line.toLowerCase().includes(normalizedQuery)) continue;\n      const score = 1;\n      if (score < options.minScore) continue;\n      const file = memoriesDir && path.startsWith(memoriesDir)\n        ? path.slice(memoriesDir.length).replace(/^[/\\\\]/, '')\n        : relative(baseDir, path).replace(/\\\\/g, '/');\n      matches.push({ file, lines: line, score, lineNumbers: [i + 1] });\n    }\n  }\n\n  return matches.slice(0, options.maxResults);\n}\n\n// =============================================================================\n// Main Search Function (Exported)\n// =============================================================================\n\nexport async function memorySearch(\n  baseDir: string,\n  query: string,\n  options: MemorySearchOptions = {},\n): Promise<MemoryMatch[]> {\n  const { maxResults = 5, minScore = 0.3, memoriesDir, agentId } = options;\n  const resolvedAgentId = agentId ?? resolveAgentIdFromMemoriesDir(memoriesDir);\n\n  try {\n    ensureMemoryDatabase();\n    syncMemoryIndex({ agentId: resolvedAgentId, workspaceDir: baseDir, memoriesDir });\n    const hits = searchMemoryIndex({\n      agentId: resolvedAgentId,\n      query,\n      maxResults,\n      minScore,\n    });\n    return hits.map((hit) => ({\n      file: hit.path,\n      lines: hit.lines,\n      score: hit.score,\n      lineNumbers: hit.lineNumbers,\n    }));\n  } catch (err) {\n    const em = err instanceof Error ? err.message : String(err);\n    log.warn({ err, errorMessage: em, agentId: resolvedAgentId }, `Memory FTS search failed: ${em}`);\n    return fallbackMemorySearch(baseDir, query, { maxResults, minScore, memoriesDir });\n  }\n}\n\n// =============================================================================\n// Memory Get (Read Snippet) (Exported)\n// =============================================================================\n\nexport function memoryGet(\n  baseDir: string,\n  path: string,\n  from?: number,\n  lines?: number,\n  memoriesDir?: string,\n): { content: string; lineNumbers: { start: number; end: number } } | null {\n  let fullPath = path.startsWith('/') ? path : join(baseDir, path);\n\n  if (!existsSync(fullPath) && memoriesDir) {\n    const segments = path.split(/[/\\\\]/);\n    const filename = segments.pop() ?? path;\n    if (CURATED_MEMORY_FILENAMES.has(filename)) {\n      const candidatePath = join(memoriesDir, filename);\n      if (existsSync(candidatePath)) {\n        fullPath = candidatePath;\n      }\n    }\n  }\n\n  if (!existsSync(fullPath)) {\n    return null;\n  }\n\n  const content = readFileSync(fullPath, 'utf-8');\n  const allLines = content.split('\\n');\n\n  const start = from || 1;\n  const count = lines || 10;\n  const end = Math.min(start + count - 1, allLines.length);\n\n  const snippet = allLines.slice(start - 1, end).join('\\n');\n\n  return {\n    content: snippet,\n    lineNumbers: { start, end },\n  };\n}\n"],"mappings":";;;;;;;;aAIwD;AAQxD,MAAM,MAAM,aAAa,eAAe;AAqBxC,MAAM,2BAA2B,IAAI,IAAI,CAAC,aAAa,UAAU,CAAC;AAElE,SAAS,uBAA6B;AACpC,sBAAqB;;AAGvB,SAAS,qBACP,SACA,OACA,SAEe;CACf,MAAM,kBAAkB,MAAM,MAAM,CAAC,aAAa;AAClD,KAAI,CAAC,gBAAiB,QAAO,EAAE;CAE/B,MAAM,cAAc,QAAQ;CAM5B,MAAM,iBAAiB,CAAC,GALH,cACjB,CAAC,GAAG,yBAAyB,CAC1B,KAAK,aAAa,KAAK,aAAa,SAAS,CAAC,CAC9C,QAAQ,SAAS,WAAW,KAAK,CAAC,GACrC,EAAE,EACmC,KAAK,SAAS,YAAY,CAAC,CAAC,QAAQ,SAAS,WAAW,KAAK,CAAC;CAEvG,MAAM,UAAyB,EAAE;AACjC,MAAK,MAAM,QAAQ,gBAAgB;EAEjC,MAAM,QADU,aAAa,MAAM,QACd,CAAC,MAAM,KAAK;AACjC,OAAK,IAAI,IAAI,GAAG,IAAI,MAAM,QAAQ,KAAK;GACrC,MAAM,OAAO,MAAM;AACnB,OAAI,CAAC,KAAK,aAAa,CAAC,SAAS,gBAAgB,CAAE;GACnD,MAAM,QAAQ;AACd,OAAI,QAAQ,QAAQ,SAAU;GAC9B,MAAM,OAAO,eAAe,KAAK,WAAW,YAAY,GACpD,KAAK,MAAM,YAAY,OAAO,CAAC,QAAQ,UAAU,GAAG,GACpD,SAAS,SAAS,KAAK,CAAC,QAAQ,OAAO,IAAI;AAC/C,WAAQ,KAAK;IAAE;IAAM,OAAO;IAAM;IAAO,aAAa,CAAC,IAAI,EAAE;IAAE,CAAC;;;AAIpE,QAAO,QAAQ,MAAM,GAAG,QAAQ,WAAW;;AAO7C,eAAsB,aACpB,SACA,OACA,UAA+B,EAAE,EACT;CACxB,MAAM,EAAE,aAAa,GAAG,WAAW,IAAK,aAAa,YAAY;CACjE,MAAM,kBAAkB,WAAW,8BAA8B,YAAY;AAE7E,KAAI;AACF,wBAAsB;AACtB,kBAAgB;GAAE,SAAS;GAAiB,cAAc;GAAS;GAAa,CAAC;AAOjF,SANa,kBAAkB;GAC7B,SAAS;GACT;GACA;GACA;GACD,CACU,CAAC,KAAK,SAAS;GACxB,MAAM,IAAI;GACV,OAAO,IAAI;GACX,OAAO,IAAI;GACX,aAAa,IAAI;GAClB,EAAE;UACI,KAAK;EACZ,MAAM,KAAK,eAAe,QAAQ,IAAI,UAAU,OAAO,IAAI;AAC3D,MAAI,KAAK;GAAE;GAAK,cAAc;GAAI,SAAS;GAAiB,EAAE,6BAA6B,KAAK;AAChG,SAAO,qBAAqB,SAAS,OAAO;GAAE;GAAY;GAAU;GAAa,CAAC;;;AAQtF,SAAgB,UACd,SACA,MACA,MACA,OACA,aACyE;CACzE,IAAI,WAAW,KAAK,WAAW,IAAI,GAAG,OAAO,KAAK,SAAS,KAAK;AAEhE,KAAI,CAAC,WAAW,SAAS,IAAI,aAAa;EAExC,MAAM,WADW,KAAK,MAAM,QACH,CAAC,KAAK,IAAI;AACnC,MAAI,yBAAyB,IAAI,SAAS,EAAE;GAC1C,MAAM,gBAAgB,KAAK,aAAa,SAAS;AACjD,OAAI,WAAW,cAAc,CAC3B,YAAW;;;AAKjB,KAAI,CAAC,WAAW,SAAS,CACvB,QAAO;CAIT,MAAM,WADU,aAAa,UAAU,QACf,CAAC,MAAM,KAAK;CAEpC,MAAM,QAAQ,QAAQ;CAEtB,MAAM,MAAM,KAAK,IAAI,SADP,SAAS,MACc,GAAG,SAAS,OAAO;AAIxD,QAAO;EACL,SAHc,SAAS,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,KAGlC;EAChB,aAAa;GAAE;GAAO;GAAK;EAC5B"}

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

@@ -6,6 +6,7 @@
  * TTS, transcript persistence).
  */
 import type { AgentMessage } from '@earendil-works/pi-agent-core';
+import type { ImageContent } from '@earendil-works/pi-ai';
 import type { CommandHandler } from '../messaging/command-handler.js';
 import type { SessionStore } from '../../session/index.js';
 import type { Config } from '../../config/schema.js';
@@ -59,6 +60,7 @@ export interface RunDirectAgentTurnInput {
     runId?: string;
     userMessage: AgentMessage;
     abortSignal?: AbortSignal;
+    sourceImages?: ImageContent[];
     onEvent?: (event: EmbeddedStreamEvent) => void;
 }
 export interface RunDirectAgentTurnResult {

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

@@ -1,3 +1,4 @@
+import { resolveImageHandlingStrategy } from "../image/vision-detection.js";
 import { hydrateUserTurnForLlm } from "../inbound/attachment-pipeline.js";
 import { extractAgentUserPlainText } from "../memory/user-message-text.js";
 import { shouldSkipResetOverlapCommand } from "../../session/reset-triggers.js";
@@ -75,10 +76,12 @@ 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({
+	const llmTurn = await hydrateUserTurnForLlm({
 		message: input.userMessage,
 		modelRef
-	})).images;
+	});
+	const sourceImages = resolveImageHandlingStrategy(modelRef) === "native" ? input.sourceImages ?? [] : [];
+	const llmImages = [...llmTurn.images, ...sourceImages];
 	const result = await runEmbeddedTurnForSession({
 		sessionKey: input.sessionKey,
 		runId: input.runId ?? crypto.randomUUID(),

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 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  runId?: 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: input.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;;;;;;;AA6B7F,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,MAAM,SAAS,OAAO,YAAY;EACzC,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"}
+{"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';\nimport type { ImageContent } from '@earendil-works/pi-ai';\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';\nimport { resolveImageHandlingStrategy } from '../image/vision-detection.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  runId?: string;\n  userMessage: AgentMessage;\n  abortSignal?: AbortSignal;\n  sourceImages?: ImageContent[];\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 sourceImages = resolveImageHandlingStrategy(modelRef) === 'native' ? (input.sourceImages ?? []) : [];\n  const llmImages = [...llmTurn.images, ...sourceImages];\n\n  const result = await runEmbeddedTurnForSession({\n    sessionKey: input.sessionKey,\n    runId: input.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":";;;;;;;;;;;;;;;;;;AAkCA,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;;;;;;;AA8B7F,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;CACvE,MAAM,UAAU,MAAM,sBAAsB;EAC1C,SAAS,MAAM;EACf;EACD,CAAC;CACF,MAAM,eAAe,6BAA6B,SAAS,KAAK,WAAY,MAAM,gBAAgB,EAAE,GAAI,EAAE;CAC1G,MAAM,YAAY,CAAC,GAAG,QAAQ,QAAQ,GAAG,aAAa;CAEtD,MAAM,SAAS,MAAM,0BAA0B;EAC7C,YAAY,MAAM;EAClB,OAAO,MAAM,SAAS,OAAO,YAAY;EACzC,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-streaming.d.ts

@@ -5,6 +5,7 @@ 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';
+import { type AgentSourceContextResolver } from '../source-context/types.js';
 import { type TranscriptUserMessage } from '../inbound/attachment-pipeline.js';
 export type DirectStreamInboundAttachment = InboundAttachmentInput;
 export type ProcessDirectStreamLog = {
@@ -53,6 +54,7 @@ export interface ProcessDirectStreamingDeps {
         sessionId: string;
         previousSessionId: string;
     } | null>;
+    sourceContextResolver?: AgentSourceContextResolver;
 }
 export interface ProcessDirectStreamingInput {
     content: string;

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

@@ -7,6 +7,8 @@ import "../../session/index.js";
 import { isVoiceLikeAttachment, mergeSttConfigFromAppConfig, mergeVoiceTranscriptsIntoUserText } from "../../channels/attachments/voice-stt-webchat.js";
 import { abortEmbeddedRun } from "../embedded/runs.js";
 import { applyReasoningVisibilityToSseEvent } from "../streaming/reasoning-visibility-sse.js";
+import { injectSourceContextIntoUserMessage } from "../source-context/injector.js";
+import { isSessionSourceBinding } from "../source-context/types.js";
 import { AsyncQueue } from "./async-queue.js";
 import { hydratePerTurnState, runDirectAgentTurn, tryRunSlashCommand } from "./direct-turn-helpers.js";
 //#region src/agent/service/process-direct-streaming.ts
@@ -155,6 +157,17 @@ async function* runProcessDirectStreaming(deps, input) {
 			}
 			const textForAgent = mergedUserText.trimStart().startsWith("/skill:") ? deps.agentManager.expandSkillUserText(mergedUserText) : mergedUserText;
 			const userMessage = await deps.buildTranscriptUserMessage(textForAgent, prepared, sessionKey);
+			let sourceEnrichedUserMessage = userMessage;
+			let sourceImages;
+			if (deps.sourceContextResolver) {
+				const metadata = await deps.sessionStore.getMetadata(sessionKey).catch(() => null);
+				const sourceBinding = metadata?.customData && typeof metadata.customData === "object" ? metadata.customData.sourceBinding : void 0;
+				if (isSessionSourceBinding(sourceBinding)) {
+					const sourceContext = await deps.sourceContextResolver(sourceBinding, sessionKey);
+					sourceEnrichedUserMessage = injectSourceContextIntoUserMessage(userMessage, sourceContext);
+					sourceImages = sourceContext?.images;
+				}
+			}
 			if (channel === "webchat") {
 				pushVisible({
 					type: "user_message",
@@ -174,8 +187,9 @@ async function* runProcessDirectStreaming(deps, input) {
 					config: deps.getConfig()
 				}, {
 					sessionKey,
-					userMessage,
+					userMessage: sourceEnrichedUserMessage,
 					abortSignal: signal,
+					sourceImages,
 					runId: input.runId,
 					onEvent: (embeddedEvent) => {
 						const event = { ...embeddedEvent };

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 { 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 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  runId?: string;\n}\n\nexport type ProcessDirectStreamingSseEvent = { type: string; [key: string]: unknown };\n\nfunction makeAssistantReceiptMessage(text: string): AgentMessage {\n  return {\n    role: 'assistant',\n    content: [{ type: 'text', text }],\n    timestamp: Date.now(),\n  } as AgentMessage;\n}\n\nfunction pushAssistantReceipt(\n  queue: AsyncQueue<ProcessDirectStreamingSseEvent>,\n  text: string,\n  runId?: string,\n): void {\n  const message = makeAssistantReceiptMessage(text);\n  queue.push({ type: 'message_start', runId, message });\n  queue.push({ type: 'message_update', runId, message });\n  queue.push({ type: 'message_end', runId, message });\n}\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          pushAssistantReceipt(queue, turn.ackMessage, input.runId);\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          pushAssistantReceipt(queue, text, input.runId);\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          pushAssistantReceipt(queue, webchatSlashReceipt, input.runId);\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            runId: input.runId,\n            onEvent: (embeddedEvent) => {\n              const event = { ...embeddedEvent };\n              if (event.type === 'error' && typeof event.content === 'string') {\n                event.content = formatStreamError(event.content);\n              }\n              pushVisible(event);\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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"}
+{"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';\nimport type { ImageContent } from '@earendil-works/pi-ai';\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 type { AgentInstanceGateway } from '../agent-instance-gateway.js';\nimport type { CommandHandler } from '../messaging/command-handler.js';\nimport type { ModelManager } from '../models/index.js';\nimport { injectSourceContextIntoUserMessage } from '../source-context/injector.js';\nimport { isSessionSourceBinding, type AgentSourceContextResolver } from '../source-context/types.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  sourceContextResolver?: AgentSourceContextResolver;\n}\n\nexport interface ProcessDirectStreamingInput {\n  content: string;\n  sessionKey?: string;\n  attachments?: DirectStreamInboundAttachment[];\n  thinking?: string;\n  signal?: AbortSignal;\n  runId?: string;\n}\n\nexport type ProcessDirectStreamingSseEvent = { type: string; [key: string]: unknown };\n\nfunction makeAssistantReceiptMessage(text: string): AgentMessage {\n  return {\n    role: 'assistant',\n    content: [{ type: 'text', text }],\n    timestamp: Date.now(),\n  } as AgentMessage;\n}\n\nfunction pushAssistantReceipt(\n  queue: AsyncQueue<ProcessDirectStreamingSseEvent>,\n  text: string,\n  runId?: string,\n): void {\n  const message = makeAssistantReceiptMessage(text);\n  queue.push({ type: 'message_start', runId, message });\n  queue.push({ type: 'message_update', runId, message });\n  queue.push({ type: 'message_end', runId, message });\n}\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          pushAssistantReceipt(queue, turn.ackMessage, input.runId);\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          pushAssistantReceipt(queue, text, input.runId);\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          pushAssistantReceipt(queue, webchatSlashReceipt, input.runId);\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      let sourceEnrichedUserMessage: AgentMessage = userMessage;\n      let sourceImages: ImageContent[] | undefined;\n      if (deps.sourceContextResolver) {\n        const metadata = await deps.sessionStore.getMetadata(sessionKey).catch(() => null);\n        const sourceBinding = metadata?.customData && typeof metadata.customData === 'object'\n          ? (metadata.customData as Record<string, unknown>).sourceBinding\n          : undefined;\n        if (isSessionSourceBinding(sourceBinding)) {\n          const sourceContext = await deps.sourceContextResolver(sourceBinding, sessionKey);\n          sourceEnrichedUserMessage = injectSourceContextIntoUserMessage(userMessage, sourceContext);\n          sourceImages = sourceContext?.images;\n        }\n      }\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: sourceEnrichedUserMessage,\n            abortSignal: signal,\n            sourceImages,\n            runId: input.runId,\n            onEvent: (embeddedEvent) => {\n              const event = { ...embeddedEvent };\n              if (event.type === 'error' && typeof event.content === 'string') {\n                event.content = formatStreamError(event.content);\n              }\n              pushVisible(event);\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.js

@@ -358,7 +358,8 @@ var AgentService = class {
 			enqueueProvisionalSessionTitle: (sk, text) => this.enqueueProvisionalSessionTitle(sk, text),
 			endDirectRequestContext: () => this.endDirectRequestContext(),
 			onSessionTranscriptUpdated: this.onSessionTranscriptUpdated,
-			resetSession: (sk) => this.resetSession(sk)
+			resetSession: (sk) => this.resetSession(sk),
+			sourceContextResolver: config.sourceContextResolver
 		});
 		this.inboundLoop = new InboundLoop({
 			log,