@xopcai/xopc 0.0.116 → 0.0.118

package/dist/src/agent/models/manager.d.ts

@@ -71,7 +71,7 @@ export declare class ModelManager {
      */
     applyModelForSession(agent: Agent, sessionKey: string): Promise<void>;
     /**
-     * Ordered model candidates for the session (primary + `agents.defaults.models.chat.fallbacks`).
+     * Ordered model candidates for the session.
      */
     getFallbackCandidatesForSession(sessionKey: string): ModelCandidate[];
     /**

package/dist/src/agent/models/manager.js

@@ -1,6 +1,6 @@
+import { getAgentDefaultModelRef, init_schema } from "../../config/schema.js";
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { getAgentDefaultModelRef, init_schema } from "../../config/schema.js";
 import { getAllModels, getDefaultModelSync, init_providers, resolveModel } from "../../providers/index.js";
 import { resolveAgentTurnTimeoutMs, runAgentTurnWithTimeout } from "../orchestration/run-agent-turn-with-timeout.js";
 import { isAssistantTurnAborted, isAssistantTurnFailed, maybeRetryTurnAfterTransientLlmFailure } from "../orchestration/llm-turn-retry.js";
@@ -148,7 +148,7 @@ var ModelManager = class {
 		}, "Applied model for session");
 	}
 	/**
-	* Ordered model candidates for the session (primary + `agents.defaults.models.chat.fallbacks`).
+	* Ordered model candidates for the session.
 	*/
 	getFallbackCandidatesForSession(sessionKey) {
 		const parsed = parseModelRef(this.getModelForSession(sessionKey));

package/dist/src/agent/models/manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"manager.js","names":["getAllModelsFromProviders"],"sources":["../../../../src/agent/models/manager.ts"],"sourcesContent":["/**\n * Model management module\n * \n * Handles model selection, switching, and automatic fallback\n * when a provider fails.\n */\n\nimport { Agent, type AgentMessage } from '@earendil-works/pi-agent-core';\nimport type { Model, Api } from '@earendil-works/pi-ai';\nimport { type Config, getAgentDefaultModelRef } from '../../config/schema.js';\nimport { createLogger } from '../../utils/logger.js';\nimport { resolveModel, getAllModels as getAllModelsFromProviders, getDefaultModelSync } from '../../providers/index.js';\nimport {\n  isFailoverError,\n  describeFailoverError,\n  resolveFallbackCandidates,\n  type ModelCandidate,\n} from '../fallback/index.js';\nimport { parseModelRef } from './selection.js';\nimport {\n  isAssistantTurnAborted,\n  isAssistantTurnFailed,\n  maybeRetryTurnAfterTransientLlmFailure,\n} from '../orchestration/llm-turn-retry.js';\nimport {\n  resolveAgentTurnTimeoutMs,\n  runAgentTurnWithTimeout,\n} from '../orchestration/run-agent-turn-with-timeout.js';\n\nconst log = createLogger('ModelManager');\n\nexport interface ModelManagerConfig {\n  defaultModel?: string;\n  config?: Config;\n}\n\nexport interface RunResult {\n  content: string | null;\n  usage?: {\n    prompt_tokens: number;\n    completion_tokens: number;\n    total_tokens: number;\n  };\n}\n\n/**\n * Get the last assistant content from agent messages\n */\nfunction getLastAssistantContent(agent: Agent): string | null {\n  const messages = agent.state.messages;\n  for (let i = messages.length - 1; i >= 0; i--) {\n    const msg = messages[i];\n    if (msg.role === 'assistant') {\n      return msg.content\n        .filter((c) => c.type === 'text')\n        .map((c) => c.text || '')\n        .join('');\n    }\n  }\n  return null;\n}\n\nexport class ModelManager {\n  private defaultModel: string;\n  private config?: Config;\n  private currentModelName: string;\n  private currentProvider: string;\n  private sessionModels: Map<string, string> = new Map();\n  /** Baseline model from `agents.list` / defaults merge when the session agent is created. */\n  private sessionProfileDefaults: Map<string, string> = new Map();\n  private channelManager?: any;\n\n  constructor(config: ModelManagerConfig = {}) {\n    this.config = config.config;\n    this.defaultModel = config.defaultModel || getDefaultModelSync(config.config);\n    this.currentModelName = this.defaultModel;\n    this.currentProvider = this.defaultModel.split('/')[0] || 'anthropic';\n  }\n\n  /**\n   * Set channel manager reference for accessing session-specific settings\n   */\n  setChannelManager(channelManager: any): void {\n    this.channelManager = channelManager;\n  }\n\n  /**\n   * Apply updated config so default model and failover metadata match disk/runtime config.\n   */\n  updateFromConfig(config: Config): void {\n    this.config = config;\n    const ref = getAgentDefaultModelRef(config);\n    this.defaultModel = ref ? ref : getDefaultModelSync(config);\n    this.sessionProfileDefaults.clear();\n  }\n\n  /**\n   * Set the config-derived default model for a session (from effective agent profile).\n   * Cleared by {@link updateFromConfig} or {@link clearSessionProfileDefault}.\n   */\n  setSessionProfileDefault(sessionKey: string, modelRef: string): void {\n    this.sessionProfileDefaults.set(sessionKey, modelRef);\n  }\n\n  clearSessionProfileDefault(sessionKey: string): void {\n    this.sessionProfileDefaults.delete(sessionKey);\n  }\n\n  /**\n   * Get current model name\n   */\n  getCurrentModel(): string {\n    return this.currentModelName;\n  }\n\n  /**\n   * Get current provider\n   */\n  getCurrentProvider(): string {\n    return this.currentProvider;\n  }\n\n  /**\n   * Switch model for a specific session\n   */\n  async switchModelForSession(sessionKey: string, modelId: string): Promise<boolean> {\n    try {\n      resolveModel(modelId);\n      this.sessionModels.set(sessionKey, modelId);\n      log.info({ sessionKey, modelId }, 'Model switched for session');\n      return true;\n    } catch (err) {\n      log.error({ err, sessionKey, modelId }, 'Failed to switch model');\n      return false;\n    }\n  }\n\n  /** Drop in-memory session override so the global default is used again. */\n  clearSessionModelOverride(sessionKey: string): void {\n    this.sessionModels.delete(sessionKey);\n  }\n\n  /**\n   * Resolved pi-ai model for session (for transcript policy, tools, etc.)\n   */\n  getResolvedModelForSession(sessionKey: string): Model<Api> {\n    return resolveModel(this.getModelForSession(sessionKey));\n  }\n\n  /**\n   * Get model for session, checking session override first\n   */\n  getModelForSession(sessionKey: string): string {\n    const sessionModel = this.sessionModels.get(sessionKey);\n    if (sessionModel) {\n      return sessionModel;\n    }\n\n    const profileDefault = this.sessionProfileDefaults.get(sessionKey);\n    if (profileDefault) {\n      return profileDefault;\n    }\n\n    return this.defaultModel;\n  }\n\n  /**\n   * Apply model to agent if different from current\n   */\n  async applyModelForSession(agent: Agent, sessionKey: string): Promise<void> {\n    const targetModelId = this.getModelForSession(sessionKey);\n\n    let found: Model<Api>;\n    try {\n      found = resolveModel(targetModelId);\n    } catch (err) {\n      log.error({ err, sessionKey, modelId: targetModelId }, 'Failed to apply model');\n      return;\n    }\n\n    const sm = agent.state.model as Model<Api> | undefined;\n    if (sm && sm.provider === found.provider && sm.id === found.id) {\n      this.currentModelName = targetModelId;\n      this.currentProvider = found.provider || 'unknown';\n      return;\n    }\n\n    agent.state.model = found;\n    this.currentModelName = targetModelId;\n    this.currentProvider = found.provider || 'unknown';\n\n    log.info({ sessionKey, modelId: targetModelId }, 'Applied model for session');\n  }\n\n  /**\n   * Ordered model candidates for the session (primary + `agents.defaults.models.chat.fallbacks`).\n   */\n  getFallbackCandidatesForSession(sessionKey: string): ModelCandidate[] {\n    const ref = this.getModelForSession(sessionKey);\n    const parsed = parseModelRef(ref);\n    if (!parsed) {\n      return [];\n    }\n    return resolveFallbackCandidates({\n      cfg: this.config,\n      provider: parsed.provider,\n      model: parsed.model,\n    });\n  }\n\n  /**\n   * Apply a resolved pi-ai model and sync {@link currentModelName} / {@link currentProvider}.\n   */\n  applyResolvedModel(agent: Agent, model: Model<Api>, modelRef: string): void {\n    agent.state.model = model;\n    this.currentModelName = modelRef;\n    this.currentProvider = model.provider || 'unknown';\n  }\n\n  /**\n   * Run the agent with automatic model fallback on failure.\n   */\n  async runWithFallback(\n    agent: Agent,\n    sessionKey: string,\n    userMessage: AgentMessage,\n    provider: string,\n    model: string\n  ): Promise<RunResult> {\n    const candidates = resolveFallbackCandidates({\n      cfg: this.config ?? undefined,\n      provider,\n      model,\n    });\n\n    let lastError: unknown;\n\n    for (let i = 0; i < candidates.length; i++) {\n      const candidate = candidates[i];\n      const modelRef = `${candidate.provider}/${candidate.model}`;\n\n      let candidateModel: Model<Api>;\n      try {\n        candidateModel = resolveModel(modelRef);\n      } catch {\n        log.warn({ provider: candidate.provider, model: candidate.model }, 'Fallback model not found');\n        continue;\n      }\n\n      log.info(\n        { attempt: i + 1, total: candidates.length, provider: candidate.provider, model: candidate.model },\n        'Attempting model',\n      );\n\n      const beforeLen = agent.state.messages.length;\n\n      try {\n        this.applyResolvedModel(agent, candidateModel, modelRef);\n\n        const runTurn = async () => {\n          await agent.prompt(userMessage);\n          await agent.waitForIdle();\n          await maybeRetryTurnAfterTransientLlmFailure(agent, { sessionKey, log });\n        };\n\n        await runAgentTurnWithTimeout(agent, runTurn, resolveAgentTurnTimeoutMs(this.config));\n\n        if (isAssistantTurnAborted(agent)) {\n          const usage = (agent.state as { lastUsage?: RunResult['usage'] }).lastUsage;\n          return { content: getLastAssistantContent(agent), usage };\n        }\n\n        if (!isAssistantTurnFailed(agent)) {\n          const usage = (agent.state as { lastUsage?: RunResult['usage'] }).lastUsage;\n          log.info(\n            { provider: candidate.provider, model: candidate.model, success: true },\n            'Model call completed',\n          );\n          return { content: getLastAssistantContent(agent), usage };\n        }\n\n        lastError = new Error(`Assistant turn failed: ${modelRef}`);\n        log.warn(\n          { attempt: i + 1, sessionKey, modelRef },\n          'Model turn failed after retries, trying fallback',\n        );\n      } catch (err) {\n        lastError = err;\n        if (err instanceof DOMException && err.name === 'AbortError') {\n          log.info({ sessionKey }, 'User aborted model call');\n          throw err;\n        }\n\n        const errorDetails = {\n          attempt: i + 1,\n          provider: candidate.provider,\n          model: candidate.model,\n          errorMessage: err instanceof Error ? err.message : String(err),\n        };\n\n        if (isFailoverError(err)) {\n          const described = describeFailoverError(err);\n          log.warn({ ...errorDetails, ...described }, 'Model call failed, trying fallback');\n        } else {\n          log.warn(errorDetails, 'Model call failed, trying fallback');\n        }\n      }\n\n      agent.state.messages = agent.state.messages.slice(0, beforeLen);\n    }\n\n    if (lastError) {\n      const em = lastError instanceof Error ? lastError.message : String(lastError);\n      const attemptedModelRefs = candidates.map((c) => `${c.provider}/${c.model}`);\n      log.error(\n        {\n          err: lastError instanceof Error ? lastError : undefined,\n          errorMessage: em,\n          attemptedCandidates: candidates.length,\n          attemptedModelRefs,\n          sessionKey,\n        },\n        `All model candidates failed (${candidates.length} refs): ${em}`,\n      );\n      throw lastError instanceof Error ? lastError : new Error(String(lastError));\n    }\n\n    return { content: null };\n  }\n\n  /**\n   * Find model by reference (provider/modelId)\n   */\n  findByRef(ref: string): Model<Api> | undefined {\n    try {\n      return resolveModel(ref);\n    } catch {\n      return undefined;\n    }\n  }\n\n  /**\n   * Find model by provider and ID\n   */\n  find(provider: string, modelId: string): Model<Api> | undefined {\n    try {\n      return resolveModel(`${provider}/${modelId}`);\n    } catch {\n      return undefined;\n    }\n  }\n\n  /**\n   * Get all available models\n   */\n  getAllModels(): readonly Model<Api>[] {\n    return getAllModelsFromProviders();\n  }\n\n  /**\n   * Get models grouped by provider\n   */\n  getModelsByProvider(): Map<string, Model<Api>[]> {\n    const all = this.getAllModels();\n    const grouped = new Map<string, Model<Api>[]>();\n    for (const model of all) {\n      const list = grouped.get(model.provider) ?? [];\n      list.push(model);\n      grouped.set(model.provider, list);\n    }\n    return grouped;\n  }\n}\n"],"mappings":";;;;;;;;;;;aAS8E;aACzB;gBACmE;AAkBxH,MAAM,MAAM,aAAa,eAAe;;;;AAmBxC,SAAS,wBAAwB,OAA6B;CAC5D,MAAM,WAAW,MAAM,MAAM;AAC7B,MAAK,IAAI,IAAI,SAAS,SAAS,GAAG,KAAK,GAAG,KAAK;EAC7C,MAAM,MAAM,SAAS;AACrB,MAAI,IAAI,SAAS,YACf,QAAO,IAAI,QACR,QAAQ,MAAM,EAAE,SAAS,OAAO,CAChC,KAAK,MAAM,EAAE,QAAQ,GAAG,CACxB,KAAK,GAAG;;AAGf,QAAO;;AAGT,IAAa,eAAb,MAA0B;CACxB;CACA;CACA;CACA;CACA,gCAA6C,IAAI,KAAK;;CAEtD,yCAAsD,IAAI,KAAK;CAC/D;CAEA,YAAY,SAA6B,EAAE,EAAE;AAC3C,OAAK,SAAS,OAAO;AACrB,OAAK,eAAe,OAAO,gBAAgB,oBAAoB,OAAO,OAAO;AAC7E,OAAK,mBAAmB,KAAK;AAC7B,OAAK,kBAAkB,KAAK,aAAa,MAAM,IAAI,CAAC,MAAM;;;;;CAM5D,kBAAkB,gBAA2B;AAC3C,OAAK,iBAAiB;;;;;CAMxB,iBAAiB,QAAsB;AACrC,OAAK,SAAS;EACd,MAAM,MAAM,wBAAwB,OAAO;AAC3C,OAAK,eAAe,MAAM,MAAM,oBAAoB,OAAO;AAC3D,OAAK,uBAAuB,OAAO;;;;;;CAOrC,yBAAyB,YAAoB,UAAwB;AACnE,OAAK,uBAAuB,IAAI,YAAY,SAAS;;CAGvD,2BAA2B,YAA0B;AACnD,OAAK,uBAAuB,OAAO,WAAW;;;;;CAMhD,kBAA0B;AACxB,SAAO,KAAK;;;;;CAMd,qBAA6B;AAC3B,SAAO,KAAK;;;;;CAMd,MAAM,sBAAsB,YAAoB,SAAmC;AACjF,MAAI;AACF,gBAAa,QAAQ;AACrB,QAAK,cAAc,IAAI,YAAY,QAAQ;AAC3C,OAAI,KAAK;IAAE;IAAY;IAAS,EAAE,6BAA6B;AAC/D,UAAO;WACA,KAAK;AACZ,OAAI,MAAM;IAAE;IAAK;IAAY;IAAS,EAAE,yBAAyB;AACjE,UAAO;;;;CAKX,0BAA0B,YAA0B;AAClD,OAAK,cAAc,OAAO,WAAW;;;;;CAMvC,2BAA2B,YAAgC;AACzD,SAAO,aAAa,KAAK,mBAAmB,WAAW,CAAC;;;;;CAM1D,mBAAmB,YAA4B;EAC7C,MAAM,eAAe,KAAK,cAAc,IAAI,WAAW;AACvD,MAAI,aACF,QAAO;EAGT,MAAM,iBAAiB,KAAK,uBAAuB,IAAI,WAAW;AAClE,MAAI,eACF,QAAO;AAGT,SAAO,KAAK;;;;;CAMd,MAAM,qBAAqB,OAAc,YAAmC;EAC1E,MAAM,gBAAgB,KAAK,mBAAmB,WAAW;EAEzD,IAAI;AACJ,MAAI;AACF,WAAQ,aAAa,cAAc;WAC5B,KAAK;AACZ,OAAI,MAAM;IAAE;IAAK;IAAY,SAAS;IAAe,EAAE,wBAAwB;AAC/E;;EAGF,MAAM,KAAK,MAAM,MAAM;AACvB,MAAI,MAAM,GAAG,aAAa,MAAM,YAAY,GAAG,OAAO,MAAM,IAAI;AAC9D,QAAK,mBAAmB;AACxB,QAAK,kBAAkB,MAAM,YAAY;AACzC;;AAGF,QAAM,MAAM,QAAQ;AACpB,OAAK,mBAAmB;AACxB,OAAK,kBAAkB,MAAM,YAAY;AAEzC,MAAI,KAAK;GAAE;GAAY,SAAS;GAAe,EAAE,4BAA4B;;;;;CAM/E,gCAAgC,YAAsC;EAEpE,MAAM,SAAS,cADH,KAAK,mBAAmB,WACJ,CAAC;AACjC,MAAI,CAAC,OACH,QAAO,EAAE;AAEX,SAAO,0BAA0B;GAC/B,KAAK,KAAK;GACV,UAAU,OAAO;GACjB,OAAO,OAAO;GACf,CAAC;;;;;CAMJ,mBAAmB,OAAc,OAAmB,UAAwB;AAC1E,QAAM,MAAM,QAAQ;AACpB,OAAK,mBAAmB;AACxB,OAAK,kBAAkB,MAAM,YAAY;;;;;CAM3C,MAAM,gBACJ,OACA,YACA,aACA,UACA,OACoB;EACpB,MAAM,aAAa,0BAA0B;GAC3C,KAAK,KAAK,UAAU,KAAA;GACpB;GACA;GACD,CAAC;EAEF,IAAI;AAEJ,OAAK,IAAI,IAAI,GAAG,IAAI,WAAW,QAAQ,KAAK;GAC1C,MAAM,YAAY,WAAW;GAC7B,MAAM,WAAW,GAAG,UAAU,SAAS,GAAG,UAAU;GAEpD,IAAI;AACJ,OAAI;AACF,qBAAiB,aAAa,SAAS;WACjC;AACN,QAAI,KAAK;KAAE,UAAU,UAAU;KAAU,OAAO,UAAU;KAAO,EAAE,2BAA2B;AAC9F;;AAGF,OAAI,KACF;IAAE,SAAS,IAAI;IAAG,OAAO,WAAW;IAAQ,UAAU,UAAU;IAAU,OAAO,UAAU;IAAO,EAClG,mBACD;GAED,MAAM,YAAY,MAAM,MAAM,SAAS;AAEvC,OAAI;AACF,SAAK,mBAAmB,OAAO,gBAAgB,SAAS;IAExD,MAAM,UAAU,YAAY;AAC1B,WAAM,MAAM,OAAO,YAAY;AAC/B,WAAM,MAAM,aAAa;AACzB,WAAM,uCAAuC,OAAO;MAAE;MAAY;MAAK,CAAC;;AAG1E,UAAM,wBAAwB,OAAO,SAAS,0BAA0B,KAAK,OAAO,CAAC;AAErF,QAAI,uBAAuB,MAAM,EAAE;KACjC,MAAM,QAAS,MAAM,MAA6C;AAClE,YAAO;MAAE,SAAS,wBAAwB,MAAM;MAAE;MAAO;;AAG3D,QAAI,CAAC,sBAAsB,MAAM,EAAE;KACjC,MAAM,QAAS,MAAM,MAA6C;AAClE,SAAI,KACF;MAAE,UAAU,UAAU;MAAU,OAAO,UAAU;MAAO,SAAS;MAAM,EACvE,uBACD;AACD,YAAO;MAAE,SAAS,wBAAwB,MAAM;MAAE;MAAO;;AAG3D,gCAAY,IAAI,MAAM,0BAA0B,WAAW;AAC3D,QAAI,KACF;KAAE,SAAS,IAAI;KAAG;KAAY;KAAU,EACxC,mDACD;YACM,KAAK;AACZ,gBAAY;AACZ,QAAI,eAAe,gBAAgB,IAAI,SAAS,cAAc;AAC5D,SAAI,KAAK,EAAE,YAAY,EAAE,0BAA0B;AACnD,WAAM;;IAGR,MAAM,eAAe;KACnB,SAAS,IAAI;KACb,UAAU,UAAU;KACpB,OAAO,UAAU;KACjB,cAAc,eAAe,QAAQ,IAAI,UAAU,OAAO,IAAI;KAC/D;AAED,QAAI,gBAAgB,IAAI,EAAE;KACxB,MAAM,YAAY,sBAAsB,IAAI;AAC5C,SAAI,KAAK;MAAE,GAAG;MAAc,GAAG;MAAW,EAAE,qCAAqC;UAEjF,KAAI,KAAK,cAAc,qCAAqC;;AAIhE,SAAM,MAAM,WAAW,MAAM,MAAM,SAAS,MAAM,GAAG,UAAU;;AAGjE,MAAI,WAAW;GACb,MAAM,KAAK,qBAAqB,QAAQ,UAAU,UAAU,OAAO,UAAU;GAC7E,MAAM,qBAAqB,WAAW,KAAK,MAAM,GAAG,EAAE,SAAS,GAAG,EAAE,QAAQ;AAC5E,OAAI,MACF;IACE,KAAK,qBAAqB,QAAQ,YAAY,KAAA;IAC9C,cAAc;IACd,qBAAqB,WAAW;IAChC;IACA;IACD,EACD,gCAAgC,WAAW,OAAO,UAAU,KAC7D;AACD,SAAM,qBAAqB,QAAQ,YAAY,IAAI,MAAM,OAAO,UAAU,CAAC;;AAG7E,SAAO,EAAE,SAAS,MAAM;;;;;CAM1B,UAAU,KAAqC;AAC7C,MAAI;AACF,UAAO,aAAa,IAAI;UAClB;AACN;;;;;;CAOJ,KAAK,UAAkB,SAAyC;AAC9D,MAAI;AACF,UAAO,aAAa,GAAG,SAAS,GAAG,UAAU;UACvC;AACN;;;;;;CAOJ,eAAsC;AACpC,SAAOA,cAA2B;;;;;CAMpC,sBAAiD;EAC/C,MAAM,MAAM,KAAK,cAAc;EAC/B,MAAM,0BAAU,IAAI,KAA2B;AAC/C,OAAK,MAAM,SAAS,KAAK;GACvB,MAAM,OAAO,QAAQ,IAAI,MAAM,SAAS,IAAI,EAAE;AAC9C,QAAK,KAAK,MAAM;AAChB,WAAQ,IAAI,MAAM,UAAU,KAAK;;AAEnC,SAAO"}
+{"version":3,"file":"manager.js","names":["getAllModelsFromProviders"],"sources":["../../../../src/agent/models/manager.ts"],"sourcesContent":["/**\n * Model management module\n * \n * Handles model selection, switching, and automatic fallback\n * when a provider fails.\n */\n\nimport { Agent, type AgentMessage } from '@earendil-works/pi-agent-core';\nimport type { Model, Api } from '@earendil-works/pi-ai';\nimport { type Config, getAgentDefaultModelRef } from '../../config/schema.js';\nimport { createLogger } from '../../utils/logger.js';\nimport { resolveModel, getAllModels as getAllModelsFromProviders, getDefaultModelSync } from '../../providers/index.js';\nimport {\n  isFailoverError,\n  describeFailoverError,\n  resolveFallbackCandidates,\n  type ModelCandidate,\n} from '../fallback/index.js';\nimport { parseModelRef } from './selection.js';\nimport {\n  isAssistantTurnAborted,\n  isAssistantTurnFailed,\n  maybeRetryTurnAfterTransientLlmFailure,\n} from '../orchestration/llm-turn-retry.js';\nimport {\n  resolveAgentTurnTimeoutMs,\n  runAgentTurnWithTimeout,\n} from '../orchestration/run-agent-turn-with-timeout.js';\n\nconst log = createLogger('ModelManager');\n\nexport interface ModelManagerConfig {\n  defaultModel?: string;\n  config?: Config;\n}\n\nexport interface RunResult {\n  content: string | null;\n  usage?: {\n    prompt_tokens: number;\n    completion_tokens: number;\n    total_tokens: number;\n  };\n}\n\n/**\n * Get the last assistant content from agent messages\n */\nfunction getLastAssistantContent(agent: Agent): string | null {\n  const messages = agent.state.messages;\n  for (let i = messages.length - 1; i >= 0; i--) {\n    const msg = messages[i];\n    if (msg.role === 'assistant') {\n      return msg.content\n        .filter((c) => c.type === 'text')\n        .map((c) => c.text || '')\n        .join('');\n    }\n  }\n  return null;\n}\n\nexport class ModelManager {\n  private defaultModel: string;\n  private config?: Config;\n  private currentModelName: string;\n  private currentProvider: string;\n  private sessionModels: Map<string, string> = new Map();\n  /** Baseline model from `agents.list` / defaults merge when the session agent is created. */\n  private sessionProfileDefaults: Map<string, string> = new Map();\n  private channelManager?: any;\n\n  constructor(config: ModelManagerConfig = {}) {\n    this.config = config.config;\n    this.defaultModel = config.defaultModel || getDefaultModelSync(config.config);\n    this.currentModelName = this.defaultModel;\n    this.currentProvider = this.defaultModel.split('/')[0] || 'anthropic';\n  }\n\n  /**\n   * Set channel manager reference for accessing session-specific settings\n   */\n  setChannelManager(channelManager: any): void {\n    this.channelManager = channelManager;\n  }\n\n  /**\n   * Apply updated config so default model and failover metadata match disk/runtime config.\n   */\n  updateFromConfig(config: Config): void {\n    this.config = config;\n    const ref = getAgentDefaultModelRef(config);\n    this.defaultModel = ref ? ref : getDefaultModelSync(config);\n    this.sessionProfileDefaults.clear();\n  }\n\n  /**\n   * Set the config-derived default model for a session (from effective agent profile).\n   * Cleared by {@link updateFromConfig} or {@link clearSessionProfileDefault}.\n   */\n  setSessionProfileDefault(sessionKey: string, modelRef: string): void {\n    this.sessionProfileDefaults.set(sessionKey, modelRef);\n  }\n\n  clearSessionProfileDefault(sessionKey: string): void {\n    this.sessionProfileDefaults.delete(sessionKey);\n  }\n\n  /**\n   * Get current model name\n   */\n  getCurrentModel(): string {\n    return this.currentModelName;\n  }\n\n  /**\n   * Get current provider\n   */\n  getCurrentProvider(): string {\n    return this.currentProvider;\n  }\n\n  /**\n   * Switch model for a specific session\n   */\n  async switchModelForSession(sessionKey: string, modelId: string): Promise<boolean> {\n    try {\n      resolveModel(modelId);\n      this.sessionModels.set(sessionKey, modelId);\n      log.info({ sessionKey, modelId }, 'Model switched for session');\n      return true;\n    } catch (err) {\n      log.error({ err, sessionKey, modelId }, 'Failed to switch model');\n      return false;\n    }\n  }\n\n  /** Drop in-memory session override so the global default is used again. */\n  clearSessionModelOverride(sessionKey: string): void {\n    this.sessionModels.delete(sessionKey);\n  }\n\n  /**\n   * Resolved pi-ai model for session (for transcript policy, tools, etc.)\n   */\n  getResolvedModelForSession(sessionKey: string): Model<Api> {\n    return resolveModel(this.getModelForSession(sessionKey));\n  }\n\n  /**\n   * Get model for session, checking session override first\n   */\n  getModelForSession(sessionKey: string): string {\n    const sessionModel = this.sessionModels.get(sessionKey);\n    if (sessionModel) {\n      return sessionModel;\n    }\n\n    const profileDefault = this.sessionProfileDefaults.get(sessionKey);\n    if (profileDefault) {\n      return profileDefault;\n    }\n\n    return this.defaultModel;\n  }\n\n  /**\n   * Apply model to agent if different from current\n   */\n  async applyModelForSession(agent: Agent, sessionKey: string): Promise<void> {\n    const targetModelId = this.getModelForSession(sessionKey);\n\n    let found: Model<Api>;\n    try {\n      found = resolveModel(targetModelId);\n    } catch (err) {\n      log.error({ err, sessionKey, modelId: targetModelId }, 'Failed to apply model');\n      return;\n    }\n\n    const sm = agent.state.model as Model<Api> | undefined;\n    if (sm && sm.provider === found.provider && sm.id === found.id) {\n      this.currentModelName = targetModelId;\n      this.currentProvider = found.provider || 'unknown';\n      return;\n    }\n\n    agent.state.model = found;\n    this.currentModelName = targetModelId;\n    this.currentProvider = found.provider || 'unknown';\n\n    log.info({ sessionKey, modelId: targetModelId }, 'Applied model for session');\n  }\n\n  /**\n   * Ordered model candidates for the session.\n   */\n  getFallbackCandidatesForSession(sessionKey: string): ModelCandidate[] {\n    const ref = this.getModelForSession(sessionKey);\n    const parsed = parseModelRef(ref);\n    if (!parsed) {\n      return [];\n    }\n    return resolveFallbackCandidates({\n      cfg: this.config,\n      provider: parsed.provider,\n      model: parsed.model,\n    });\n  }\n\n  /**\n   * Apply a resolved pi-ai model and sync {@link currentModelName} / {@link currentProvider}.\n   */\n  applyResolvedModel(agent: Agent, model: Model<Api>, modelRef: string): void {\n    agent.state.model = model;\n    this.currentModelName = modelRef;\n    this.currentProvider = model.provider || 'unknown';\n  }\n\n  /**\n   * Run the agent with automatic model fallback on failure.\n   */\n  async runWithFallback(\n    agent: Agent,\n    sessionKey: string,\n    userMessage: AgentMessage,\n    provider: string,\n    model: string\n  ): Promise<RunResult> {\n    const candidates = resolveFallbackCandidates({\n      cfg: this.config ?? undefined,\n      provider,\n      model,\n    });\n\n    let lastError: unknown;\n\n    for (let i = 0; i < candidates.length; i++) {\n      const candidate = candidates[i];\n      const modelRef = `${candidate.provider}/${candidate.model}`;\n\n      let candidateModel: Model<Api>;\n      try {\n        candidateModel = resolveModel(modelRef);\n      } catch {\n        log.warn({ provider: candidate.provider, model: candidate.model }, 'Fallback model not found');\n        continue;\n      }\n\n      log.info(\n        { attempt: i + 1, total: candidates.length, provider: candidate.provider, model: candidate.model },\n        'Attempting model',\n      );\n\n      const beforeLen = agent.state.messages.length;\n\n      try {\n        this.applyResolvedModel(agent, candidateModel, modelRef);\n\n        const runTurn = async () => {\n          await agent.prompt(userMessage);\n          await agent.waitForIdle();\n          await maybeRetryTurnAfterTransientLlmFailure(agent, { sessionKey, log });\n        };\n\n        await runAgentTurnWithTimeout(agent, runTurn, resolveAgentTurnTimeoutMs(this.config));\n\n        if (isAssistantTurnAborted(agent)) {\n          const usage = (agent.state as { lastUsage?: RunResult['usage'] }).lastUsage;\n          return { content: getLastAssistantContent(agent), usage };\n        }\n\n        if (!isAssistantTurnFailed(agent)) {\n          const usage = (agent.state as { lastUsage?: RunResult['usage'] }).lastUsage;\n          log.info(\n            { provider: candidate.provider, model: candidate.model, success: true },\n            'Model call completed',\n          );\n          return { content: getLastAssistantContent(agent), usage };\n        }\n\n        lastError = new Error(`Assistant turn failed: ${modelRef}`);\n        log.warn(\n          { attempt: i + 1, sessionKey, modelRef },\n          'Model turn failed after retries, trying fallback',\n        );\n      } catch (err) {\n        lastError = err;\n        if (err instanceof DOMException && err.name === 'AbortError') {\n          log.info({ sessionKey }, 'User aborted model call');\n          throw err;\n        }\n\n        const errorDetails = {\n          attempt: i + 1,\n          provider: candidate.provider,\n          model: candidate.model,\n          errorMessage: err instanceof Error ? err.message : String(err),\n        };\n\n        if (isFailoverError(err)) {\n          const described = describeFailoverError(err);\n          log.warn({ ...errorDetails, ...described }, 'Model call failed, trying fallback');\n        } else {\n          log.warn(errorDetails, 'Model call failed, trying fallback');\n        }\n      }\n\n      agent.state.messages = agent.state.messages.slice(0, beforeLen);\n    }\n\n    if (lastError) {\n      const em = lastError instanceof Error ? lastError.message : String(lastError);\n      const attemptedModelRefs = candidates.map((c) => `${c.provider}/${c.model}`);\n      log.error(\n        {\n          err: lastError instanceof Error ? lastError : undefined,\n          errorMessage: em,\n          attemptedCandidates: candidates.length,\n          attemptedModelRefs,\n          sessionKey,\n        },\n        `All model candidates failed (${candidates.length} refs): ${em}`,\n      );\n      throw lastError instanceof Error ? lastError : new Error(String(lastError));\n    }\n\n    return { content: null };\n  }\n\n  /**\n   * Find model by reference (provider/modelId)\n   */\n  findByRef(ref: string): Model<Api> | undefined {\n    try {\n      return resolveModel(ref);\n    } catch {\n      return undefined;\n    }\n  }\n\n  /**\n   * Find model by provider and ID\n   */\n  find(provider: string, modelId: string): Model<Api> | undefined {\n    try {\n      return resolveModel(`${provider}/${modelId}`);\n    } catch {\n      return undefined;\n    }\n  }\n\n  /**\n   * Get all available models\n   */\n  getAllModels(): readonly Model<Api>[] {\n    return getAllModelsFromProviders();\n  }\n\n  /**\n   * Get models grouped by provider\n   */\n  getModelsByProvider(): Map<string, Model<Api>[]> {\n    const all = this.getAllModels();\n    const grouped = new Map<string, Model<Api>[]>();\n    for (const model of all) {\n      const list = grouped.get(model.provider) ?? [];\n      list.push(model);\n      grouped.set(model.provider, list);\n    }\n    return grouped;\n  }\n}\n"],"mappings":"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"}

package/dist/src/agent/orchestration/agent-orchestrator.d.ts

@@ -35,7 +35,7 @@ export interface AgentOrchestratorConfig {
     getAgentInternalStorageRootForSession?: (sessionKey: string) => string;
     /** Fire-and-forget after full session persist (e.g. LLM session title); not called from mid-turn snapshots. */
     enqueueAutoTitle?: (sessionKey: string) => void;
-    /** For per-turn timeout via `agents.defaults.maxTaskDurationMs`. */
+    /** For per-turn timeout. */
     getConfig?: () => Config | undefined;
     /** Channel streaming: token/tool events from pi embedded session. */
     onEmbeddedStreamEvent?: (sessionKey: string, event: EmbeddedStreamEvent) => void;

package/dist/src/agent/orchestration/agent-orchestrator.js

@@ -95,7 +95,8 @@ var AgentOrchestrator = class {
 				} else {
 					const result = await runDreamingDeepPromotion({
 						workspaceDir,
-						config: resolved.phases.deep
+						config: resolved.phases.deep,
+						memoryManager: this.agentManager.getMemoryManagerForSession(sessionKey)
 					});
 					await appendDreamingEvent(workspaceDir, {
 						timestamp: (/* @__PURE__ */ new Date()).toISOString(),

package/dist/src/agent/orchestration/agent-orchestrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-orchestrator.js","names":[],"sources":["../../../../src/agent/orchestration/agent-orchestrator.ts"],"sourcesContent":["/**\n * Agent Orchestrator - Coordinates Agent execution flow\n *\n * Manages the complete agent execution pipeline from message processing\n * to response generation.\n */\n\nimport type { Config } from '../../config/schema.js';\nimport type { InboundMessage } from '../../infra/bus/index.js';\nimport type { SessionConfigStore, SessionStore } from '../../session/index.js';\nimport type { SessionHydrator } from '../session/index.js';\nimport { resolveEffectiveThinkingLevel } from '../../session/thinking-resolve.js';\nimport type { ThinkLevel } from '../transcript/thinking-types.js';\nimport type { ModelManager } from '../models/index.js';\nimport type { SessionContext } from '../session/session-context.js';\nimport type { AgentEventHandler } from './agent-event-handler.js';\nimport type { FeedbackCoordinator } from '../feedback/feedback-coordinator.js';\nimport type { AgentManager } from '../agent-manager.js';\nimport { createLogger } from '../../utils/logger.js';\nimport { extractAgentUserPlainText } from '../memory/user-message-text.js';\nimport { abortEmbeddedRun } from '../embedded/runs.js';\nimport { runEmbeddedTurnForSession } from '../embedded/run-for-session.js';\nimport type { EmbeddedStreamEvent } from '../embedded/types.js';\nimport { persistInboundAttachments } from '../../channels/attachments/inbound-persist.js';\nimport {\n  buildTranscriptUserMessage,\n  clearPendingTranscriptUserMessage,\n  hydrateUserTurnForLlm,\n  setPendingTranscriptUserMessage,\n} from '../inbound/attachment-pipeline.js';\nimport {\n  DREAMING_SWEEP_TOKEN,\n  DREAMING_LIGHT_SWEEP_TOKEN,\n  DREAMING_REM_SWEEP_TOKEN,\n} from '../memory/dreaming/constants.js';\nimport { resolveDreamingConfig } from '../memory/dreaming/config.js';\nimport { runDreamingDeepPromotion } from '../memory/dreaming/deep-promotion.js';\nimport { appendDreamingEvent, type DreamingEvent } from '../memory/dreaming/events.js';\nimport { runLightSweep } from '../memory/dreaming/light-sweep.js';\nimport { runRemPatterns } from '../memory/dreaming/rem-patterns.js';\n\nconst log = createLogger('AgentOrchestrator');\n\nexport interface AgentOrchestratorConfig {\n  agentManager: AgentManager;\n  sessionStore: SessionStore;\n  modelManager: ModelManager;\n  eventHandler: AgentEventHandler;\n  feedbackCoordinator: FeedbackCoordinator;\n  sessionConfigStore: SessionConfigStore;\n  /** Per-session hydration (workspace override + model override) before the agent runs. */\n  sessionHydrator: SessionHydrator;\n  getThinkingDefault: () => ThinkLevel | undefined;\n  /** Per-session default from merged `agents.list` / defaults (optional). */\n  getThinkingDefaultForSession?: (sessionKey: string) => ThinkLevel | undefined;\n  /** Default workspace root when no per-session resolver is set. */\n  workspaceRoot: string;\n  /** Per-agent workspace root for attachments (optional; defaults to `workspaceRoot`). */\n  getWorkspaceRootForSession?: (sessionKey: string) => string;\n  /** Agent home (`…/agents/<id>/`) for inbound/TTS files — keeps internal state out of the markdown workspace. */\n  getAgentInternalStorageRootForSession?: (sessionKey: string) => string;\n  /** Fire-and-forget after full session persist (e.g. LLM session title); not called from mid-turn snapshots. */\n  enqueueAutoTitle?: (sessionKey: string) => void;\n  /** For per-turn timeout via `agents.defaults.maxTaskDurationMs`. */\n  getConfig?: () => Config | undefined;\n  /** Channel streaming: token/tool events from pi embedded session. */\n  onEmbeddedStreamEvent?: (sessionKey: string, event: EmbeddedStreamEvent) => void;\n  /** Called after a successful embedded turn with assistant plain text. */\n  onEmbeddedTurnComplete?: (sessionKey: string, lastAssistantText?: string) => void;\n}\n\nexport class AgentOrchestrator {\n  private agentManager: AgentManager;\n  private sessionStore: SessionStore;\n  private modelManager: ModelManager;\n  private eventHandler: AgentEventHandler;\n  private feedbackCoordinator: FeedbackCoordinator;\n  private sessionConfigStore: SessionConfigStore;\n  private sessionHydrator: SessionHydrator;\n  private getThinkingDefault: () => ThinkLevel | undefined;\n  private getThinkingDefaultForSession?: (sessionKey: string) => ThinkLevel | undefined;\n  private workspaceRoot: string;\n  private getWorkspaceRootForSession?: (sessionKey: string) => string;\n  private getAgentInternalStorageRootForSession: (sessionKey: string) => string;\n  private enqueueAutoTitle?: (sessionKey: string) => void;\n  private getConfig?: () => Config | undefined;\n  private onEmbeddedStreamEvent?: (sessionKey: string, event: EmbeddedStreamEvent) => void;\n  private onEmbeddedTurnComplete?: (sessionKey: string, lastAssistantText?: string) => void;\n\n  constructor(config: AgentOrchestratorConfig) {\n    this.agentManager = config.agentManager;\n    this.sessionStore = config.sessionStore;\n    this.modelManager = config.modelManager;\n    this.eventHandler = config.eventHandler;\n    this.feedbackCoordinator = config.feedbackCoordinator;\n    this.sessionConfigStore = config.sessionConfigStore;\n    this.sessionHydrator = config.sessionHydrator;\n    this.getThinkingDefault = config.getThinkingDefault;\n    this.getThinkingDefaultForSession = config.getThinkingDefaultForSession;\n    this.workspaceRoot = config.workspaceRoot;\n    this.getWorkspaceRootForSession = config.getWorkspaceRootForSession;\n    this.getAgentInternalStorageRootForSession =\n      config.getAgentInternalStorageRootForSession ??\n      ((sk) => this.getWorkspaceRootForSession?.(sk) ?? this.workspaceRoot);\n    this.enqueueAutoTitle = config.enqueueAutoTitle;\n    this.getConfig = config.getConfig;\n    this.onEmbeddedStreamEvent = config.onEmbeddedStreamEvent;\n    this.onEmbeddedTurnComplete = config.onEmbeddedTurnComplete;\n  }\n\n  /**\n   * Process a message through the agent orchestration pipeline\n   */\n  async process(msg: InboundMessage, context: SessionContext): Promise<void> {\n    const { sessionKey } = context;\n\n    log.debug({ sessionKey }, 'Processing message through agent orchestrator');\n\n    await this.sessionHydrator.workspace(sessionKey);\n\n    // Dreaming: short-circuit cron-triggered sweep tokens into maintenance runs.\n    // This avoids spending LLM tokens for scheduled memory consolidation.\n    if (\n      typeof msg.content === 'string' &&\n      (sessionKey.startsWith('cron:') || context.channel === 'cron')\n    ) {\n      const content = msg.content;\n      const isDreamingSweep =\n        content.includes(DREAMING_SWEEP_TOKEN) ||\n        content.includes(DREAMING_LIGHT_SWEEP_TOKEN) ||\n        content.includes(DREAMING_REM_SWEEP_TOKEN);\n\n      if (isDreamingSweep) {\n        const workspaceDir = this.agentManager.getResolvedWorkspaceForSession(sessionKey);\n        const resolved = resolveDreamingConfig(this.getConfig?.());\n        const t0 = Date.now();\n\n        if (content.includes(DREAMING_LIGHT_SWEEP_TOKEN)) {\n          const result = await runLightSweep({ workspaceDir, config: resolved.phases.light });\n          const event: DreamingEvent = {\n            timestamp: new Date().toISOString(), phase: 'light',\n            ok: result.ok, reason: result.reason, durationMs: Date.now() - t0,\n            scannedEntries: result.scannedEntries, newSignals: result.newSignals, deduped: result.deduped,\n          };\n          await appendDreamingEvent(workspaceDir, event);\n        } else if (content.includes(DREAMING_REM_SWEEP_TOKEN)) {\n          const result = await runRemPatterns({ workspaceDir, config: resolved.phases.rem });\n          const event: DreamingEvent = {\n            timestamp: new Date().toISOString(), phase: 'rem',\n            ok: result.ok, reason: result.reason, durationMs: Date.now() - t0,\n            patternsDiscovered: result.patternsDiscovered, entriesAnalyzed: result.entriesAnalyzed,\n          };\n          await appendDreamingEvent(workspaceDir, event);\n        } else {\n          const result = await runDreamingDeepPromotion({ workspaceDir, config: resolved.phases.deep });\n          const event: DreamingEvent = {\n            timestamp: new Date().toISOString(), phase: 'deep',\n            ok: result.ok, reason: result.reason, durationMs: Date.now() - t0,\n            candidates: result.candidates, applied: result.applied,\n          };\n          await appendDreamingEvent(workspaceDir, event);\n        }\n        return;\n      }\n    }\n\n    try {\n      await this.sessionHydrator.model(sessionKey);\n\n      const channelSystemPrompt =\n        typeof context.metadata?.channelSystemPrompt === 'string'\n          ? context.metadata.channelSystemPrompt.trim()\n          : '';\n      if (channelSystemPrompt) {\n        this.agentManager.getOrCreateAgent(sessionKey);\n        this.agentManager.applyTurnChannelSystemPrompt(sessionKey, channelSystemPrompt);\n      }\n\n      const thinkingDefault =\n        this.getThinkingDefaultForSession?.(sessionKey) ?? this.getThinkingDefault();\n      const thinkingLevel = await resolveEffectiveThinkingLevel(\n        this.sessionConfigStore,\n        sessionKey,\n        null,\n        thinkingDefault,\n      );\n      this.agentManager.setThinkingLevel(sessionKey, thinkingLevel);\n\n      const persistedAttachments = await persistInboundAttachments(msg.attachments);\n      const modelRef = this.modelManager.getModelForSession(sessionKey);\n      const userMessage = await buildTranscriptUserMessage({\n        text: msg.content,\n        prepared: persistedAttachments,\n        sessionKey,\n        modelRef,\n        config: this.getConfig?.(),\n        agentManager: this.agentManager,\n      });\n      setPendingTranscriptUserMessage(sessionKey, userMessage);\n\n      const userPlainForMemory = extractAgentUserPlainText(userMessage);\n      const userMessageForModel = await this.agentManager.applyMemoryPrefetchToUserMessage(\n        userMessage,\n        sessionKey,\n      );\n\n      const llmTurn = await hydrateUserTurnForLlm({\n        message: userMessage,\n        modelRef,\n      });\n\n      this.feedbackCoordinator.startTask();\n\n      const turnResult = await (async () => {\n        try {\n          return await runEmbeddedTurnForSession({\n            sessionKey,\n            userMessage: userMessageForModel,\n            llmImages: llmTurn.images,\n            sessionStore: this.sessionStore,\n            agentManager: this.agentManager,\n            modelManager: this.modelManager,\n            thinkingOverride: thinkingLevel,\n            getConfig: this.getConfig,\n            beforeTurn: () => this.agentManager.beginBackgroundReviewUserTurn(sessionKey),\n            onEvent: (event) => this.onEmbeddedStreamEvent?.(sessionKey, event),\n          });\n        } finally {\n          clearPendingTranscriptUserMessage(sessionKey, userMessage);\n        }\n      })();\n\n      this.agentManager.afterAgentTurn(sessionKey, userPlainForMemory);\n      this.agentManager.scheduleBackgroundReviewAfterUserTurn(sessionKey);\n\n      if (turnResult.ok) {\n        this.onEmbeddedTurnComplete?.(sessionKey, turnResult.lastAssistantText);\n        this.enqueueAutoTitle?.(sessionKey);\n      } else if (turnResult.errorMessage) {\n        log.warn({ sessionKey, errorMessage: turnResult.errorMessage }, 'Embedded inbound turn failed');\n      }\n\n      this.feedbackCoordinator.endTask();\n\n    } catch (error) {\n      log.error({ err: error, sessionKey }, 'Error in agent orchestration');\n      this.feedbackCoordinator.endTask();\n      throw error;\n    }\n  }\n\n  /**\n   * Get the current agent model ID\n   */\n  getCurrentModel(): string {\n    return this.modelManager.getCurrentModel();\n  }\n\n  /**\n   * Check if agent is currently processing for a session\n   */\n  isProcessing(sessionKey: string): boolean {\n    const agent = this.agentManager.getAgent(sessionKey);\n    if (!agent) {\n      return false;\n    }\n    return agent.state.messages.length > 0;\n  }\n\n  /**\n   * Abort current agent execution for a session\n   */\n  abort(sessionKey: string): void {\n    void abortEmbeddedRun(sessionKey);\n    const agent = this.agentManager.getAgent(sessionKey);\n    agent?.abort();\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"agent-orchestrator.js","names":[],"sources":["../../../../src/agent/orchestration/agent-orchestrator.ts"],"sourcesContent":["/**\n * Agent Orchestrator - Coordinates Agent execution flow\n *\n * Manages the complete agent execution pipeline from message processing\n * to response generation.\n */\n\nimport type { Config } from '../../config/schema.js';\nimport type { InboundMessage } from '../../infra/bus/index.js';\nimport type { SessionConfigStore, SessionStore } from '../../session/index.js';\nimport type { SessionHydrator } from '../session/index.js';\nimport { resolveEffectiveThinkingLevel } from '../../session/thinking-resolve.js';\nimport type { ThinkLevel } from '../transcript/thinking-types.js';\nimport type { ModelManager } from '../models/index.js';\nimport type { SessionContext } from '../session/session-context.js';\nimport type { AgentEventHandler } from './agent-event-handler.js';\nimport type { FeedbackCoordinator } from '../feedback/feedback-coordinator.js';\nimport type { AgentManager } from '../agent-manager.js';\nimport { createLogger } from '../../utils/logger.js';\nimport { extractAgentUserPlainText } from '../memory/user-message-text.js';\nimport { abortEmbeddedRun } from '../embedded/runs.js';\nimport { runEmbeddedTurnForSession } from '../embedded/run-for-session.js';\nimport type { EmbeddedStreamEvent } from '../embedded/types.js';\nimport { persistInboundAttachments } from '../../channels/attachments/inbound-persist.js';\nimport {\n  buildTranscriptUserMessage,\n  clearPendingTranscriptUserMessage,\n  hydrateUserTurnForLlm,\n  setPendingTranscriptUserMessage,\n} from '../inbound/attachment-pipeline.js';\nimport {\n  DREAMING_SWEEP_TOKEN,\n  DREAMING_LIGHT_SWEEP_TOKEN,\n  DREAMING_REM_SWEEP_TOKEN,\n} from '../memory/dreaming/constants.js';\nimport { resolveDreamingConfig } from '../memory/dreaming/config.js';\nimport { runDreamingDeepPromotion } from '../memory/dreaming/deep-promotion.js';\nimport { appendDreamingEvent, type DreamingEvent } from '../memory/dreaming/events.js';\nimport { runLightSweep } from '../memory/dreaming/light-sweep.js';\nimport { runRemPatterns } from '../memory/dreaming/rem-patterns.js';\n\nconst log = createLogger('AgentOrchestrator');\n\nexport interface AgentOrchestratorConfig {\n  agentManager: AgentManager;\n  sessionStore: SessionStore;\n  modelManager: ModelManager;\n  eventHandler: AgentEventHandler;\n  feedbackCoordinator: FeedbackCoordinator;\n  sessionConfigStore: SessionConfigStore;\n  /** Per-session hydration (workspace override + model override) before the agent runs. */\n  sessionHydrator: SessionHydrator;\n  getThinkingDefault: () => ThinkLevel | undefined;\n  /** Per-session default from merged `agents.list` / defaults (optional). */\n  getThinkingDefaultForSession?: (sessionKey: string) => ThinkLevel | undefined;\n  /** Default workspace root when no per-session resolver is set. */\n  workspaceRoot: string;\n  /** Per-agent workspace root for attachments (optional; defaults to `workspaceRoot`). */\n  getWorkspaceRootForSession?: (sessionKey: string) => string;\n  /** Agent home (`…/agents/<id>/`) for inbound/TTS files — keeps internal state out of the markdown workspace. */\n  getAgentInternalStorageRootForSession?: (sessionKey: string) => string;\n  /** Fire-and-forget after full session persist (e.g. LLM session title); not called from mid-turn snapshots. */\n  enqueueAutoTitle?: (sessionKey: string) => void;\n  /** For per-turn timeout. */\n  getConfig?: () => Config | undefined;\n  /** Channel streaming: token/tool events from pi embedded session. */\n  onEmbeddedStreamEvent?: (sessionKey: string, event: EmbeddedStreamEvent) => void;\n  /** Called after a successful embedded turn with assistant plain text. */\n  onEmbeddedTurnComplete?: (sessionKey: string, lastAssistantText?: string) => void;\n}\n\nexport class AgentOrchestrator {\n  private agentManager: AgentManager;\n  private sessionStore: SessionStore;\n  private modelManager: ModelManager;\n  private eventHandler: AgentEventHandler;\n  private feedbackCoordinator: FeedbackCoordinator;\n  private sessionConfigStore: SessionConfigStore;\n  private sessionHydrator: SessionHydrator;\n  private getThinkingDefault: () => ThinkLevel | undefined;\n  private getThinkingDefaultForSession?: (sessionKey: string) => ThinkLevel | undefined;\n  private workspaceRoot: string;\n  private getWorkspaceRootForSession?: (sessionKey: string) => string;\n  private getAgentInternalStorageRootForSession: (sessionKey: string) => string;\n  private enqueueAutoTitle?: (sessionKey: string) => void;\n  private getConfig?: () => Config | undefined;\n  private onEmbeddedStreamEvent?: (sessionKey: string, event: EmbeddedStreamEvent) => void;\n  private onEmbeddedTurnComplete?: (sessionKey: string, lastAssistantText?: string) => void;\n\n  constructor(config: AgentOrchestratorConfig) {\n    this.agentManager = config.agentManager;\n    this.sessionStore = config.sessionStore;\n    this.modelManager = config.modelManager;\n    this.eventHandler = config.eventHandler;\n    this.feedbackCoordinator = config.feedbackCoordinator;\n    this.sessionConfigStore = config.sessionConfigStore;\n    this.sessionHydrator = config.sessionHydrator;\n    this.getThinkingDefault = config.getThinkingDefault;\n    this.getThinkingDefaultForSession = config.getThinkingDefaultForSession;\n    this.workspaceRoot = config.workspaceRoot;\n    this.getWorkspaceRootForSession = config.getWorkspaceRootForSession;\n    this.getAgentInternalStorageRootForSession =\n      config.getAgentInternalStorageRootForSession ??\n      ((sk) => this.getWorkspaceRootForSession?.(sk) ?? this.workspaceRoot);\n    this.enqueueAutoTitle = config.enqueueAutoTitle;\n    this.getConfig = config.getConfig;\n    this.onEmbeddedStreamEvent = config.onEmbeddedStreamEvent;\n    this.onEmbeddedTurnComplete = config.onEmbeddedTurnComplete;\n  }\n\n  /**\n   * Process a message through the agent orchestration pipeline\n   */\n  async process(msg: InboundMessage, context: SessionContext): Promise<void> {\n    const { sessionKey } = context;\n\n    log.debug({ sessionKey }, 'Processing message through agent orchestrator');\n\n    await this.sessionHydrator.workspace(sessionKey);\n\n    // Dreaming: short-circuit cron-triggered sweep tokens into maintenance runs.\n    // This avoids spending LLM tokens for scheduled memory consolidation.\n    if (\n      typeof msg.content === 'string' &&\n      (sessionKey.startsWith('cron:') || context.channel === 'cron')\n    ) {\n      const content = msg.content;\n      const isDreamingSweep =\n        content.includes(DREAMING_SWEEP_TOKEN) ||\n        content.includes(DREAMING_LIGHT_SWEEP_TOKEN) ||\n        content.includes(DREAMING_REM_SWEEP_TOKEN);\n\n      if (isDreamingSweep) {\n        const workspaceDir = this.agentManager.getResolvedWorkspaceForSession(sessionKey);\n        const resolved = resolveDreamingConfig(this.getConfig?.());\n        const t0 = Date.now();\n\n        if (content.includes(DREAMING_LIGHT_SWEEP_TOKEN)) {\n          const result = await runLightSweep({ workspaceDir, config: resolved.phases.light });\n          const event: DreamingEvent = {\n            timestamp: new Date().toISOString(), phase: 'light',\n            ok: result.ok, reason: result.reason, durationMs: Date.now() - t0,\n            scannedEntries: result.scannedEntries, newSignals: result.newSignals, deduped: result.deduped,\n          };\n          await appendDreamingEvent(workspaceDir, event);\n        } else if (content.includes(DREAMING_REM_SWEEP_TOKEN)) {\n          const result = await runRemPatterns({ workspaceDir, config: resolved.phases.rem });\n          const event: DreamingEvent = {\n            timestamp: new Date().toISOString(), phase: 'rem',\n            ok: result.ok, reason: result.reason, durationMs: Date.now() - t0,\n            patternsDiscovered: result.patternsDiscovered, entriesAnalyzed: result.entriesAnalyzed,\n          };\n          await appendDreamingEvent(workspaceDir, event);\n        } else {\n          const result = await runDreamingDeepPromotion({\n            workspaceDir,\n            config: resolved.phases.deep,\n            memoryManager: this.agentManager.getMemoryManagerForSession(sessionKey),\n          });\n          const event: DreamingEvent = {\n            timestamp: new Date().toISOString(), phase: 'deep',\n            ok: result.ok, reason: result.reason, durationMs: Date.now() - t0,\n            candidates: result.candidates, applied: result.applied,\n          };\n          await appendDreamingEvent(workspaceDir, event);\n        }\n        return;\n      }\n    }\n\n    try {\n      await this.sessionHydrator.model(sessionKey);\n\n      const channelSystemPrompt =\n        typeof context.metadata?.channelSystemPrompt === 'string'\n          ? context.metadata.channelSystemPrompt.trim()\n          : '';\n      if (channelSystemPrompt) {\n        this.agentManager.getOrCreateAgent(sessionKey);\n        this.agentManager.applyTurnChannelSystemPrompt(sessionKey, channelSystemPrompt);\n      }\n\n      const thinkingDefault =\n        this.getThinkingDefaultForSession?.(sessionKey) ?? this.getThinkingDefault();\n      const thinkingLevel = await resolveEffectiveThinkingLevel(\n        this.sessionConfigStore,\n        sessionKey,\n        null,\n        thinkingDefault,\n      );\n      this.agentManager.setThinkingLevel(sessionKey, thinkingLevel);\n\n      const persistedAttachments = await persistInboundAttachments(msg.attachments);\n      const modelRef = this.modelManager.getModelForSession(sessionKey);\n      const userMessage = await buildTranscriptUserMessage({\n        text: msg.content,\n        prepared: persistedAttachments,\n        sessionKey,\n        modelRef,\n        config: this.getConfig?.(),\n        agentManager: this.agentManager,\n      });\n      setPendingTranscriptUserMessage(sessionKey, userMessage);\n\n      const userPlainForMemory = extractAgentUserPlainText(userMessage);\n      const userMessageForModel = await this.agentManager.applyMemoryPrefetchToUserMessage(\n        userMessage,\n        sessionKey,\n      );\n\n      const llmTurn = await hydrateUserTurnForLlm({\n        message: userMessage,\n        modelRef,\n      });\n\n      this.feedbackCoordinator.startTask();\n\n      const turnResult = await (async () => {\n        try {\n          return await runEmbeddedTurnForSession({\n            sessionKey,\n            userMessage: userMessageForModel,\n            llmImages: llmTurn.images,\n            sessionStore: this.sessionStore,\n            agentManager: this.agentManager,\n            modelManager: this.modelManager,\n            thinkingOverride: thinkingLevel,\n            getConfig: this.getConfig,\n            beforeTurn: () => this.agentManager.beginBackgroundReviewUserTurn(sessionKey),\n            onEvent: (event) => this.onEmbeddedStreamEvent?.(sessionKey, event),\n          });\n        } finally {\n          clearPendingTranscriptUserMessage(sessionKey, userMessage);\n        }\n      })();\n\n      this.agentManager.afterAgentTurn(sessionKey, userPlainForMemory);\n      this.agentManager.scheduleBackgroundReviewAfterUserTurn(sessionKey);\n\n      if (turnResult.ok) {\n        this.onEmbeddedTurnComplete?.(sessionKey, turnResult.lastAssistantText);\n        this.enqueueAutoTitle?.(sessionKey);\n      } else if (turnResult.errorMessage) {\n        log.warn({ sessionKey, errorMessage: turnResult.errorMessage }, 'Embedded inbound turn failed');\n      }\n\n      this.feedbackCoordinator.endTask();\n\n    } catch (error) {\n      log.error({ err: error, sessionKey }, 'Error in agent orchestration');\n      this.feedbackCoordinator.endTask();\n      throw error;\n    }\n  }\n\n  /**\n   * Get the current agent model ID\n   */\n  getCurrentModel(): string {\n    return this.modelManager.getCurrentModel();\n  }\n\n  /**\n   * Check if agent is currently processing for a session\n   */\n  isProcessing(sessionKey: string): boolean {\n    const agent = this.agentManager.getAgent(sessionKey);\n    if (!agent) {\n      return false;\n    }\n    return agent.state.messages.length > 0;\n  }\n\n  /**\n   * Abort current agent execution for a session\n   */\n  abort(sessionKey: string): void {\n    void abortEmbeddedRun(sessionKey);\n    const agent = this.agentManager.getAgent(sessionKey);\n    agent?.abort();\n  }\n}\n"],"mappings":"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"}

package/dist/src/agent/orchestration/run-agent-turn-with-fallbacks.d.ts

@@ -1,5 +1,5 @@
 /**
- * Primary chat model + `agents.defaults.models.chat.fallbacks`: one user turn with rollback on failure.
+ * Ordered model candidates: one user turn with rollback on failure.
  * Used by channel orchestrator, gateway webchat stream, and direct CLI-style turns.
  */
 import type { Agent, AgentMessage } from '@earendil-works/pi-agent-core';
@@ -24,6 +24,6 @@ export declare function runAgentTurnWithModelFallbacks(params: {
     afterUserPrompt?: () => Promise<void>;
     /** Overrides {@link resolveAgentTurnTimeoutMs} when set. */
     timeoutMs?: number;
-    /** Supplies `agents.defaults.maxTaskDurationMs` for the default turn limit. */
+    /** Supplies the default turn limit. */
     getConfig?: () => Config | undefined;
 }): Promise<void>;

package/dist/src/agent/orchestration/run-agent-turn-with-fallbacks.js

@@ -9,7 +9,7 @@ async function runAgentTurnWithModelFallbacks(params) {
 	const beforeUserPrompt = params.beforeUserPrompt ?? (async () => {});
 	const afterUserPrompt = params.afterUserPrompt ?? (async () => {});
 	const candidates = modelManager.getFallbackCandidatesForSession(sessionKey);
-	if (candidates.length === 0) throw new Error("No model candidates available. Configure agents.defaults.models.chat and provider API keys.");
+	if (candidates.length === 0) throw new Error("No model candidates available. Configure agent manifest models and provider API keys.");
 	let lastError;
 	for (let i = 0; i < candidates.length; i++) {
 		const candidate = candidates[i];

package/dist/src/agent/orchestration/run-agent-turn-with-fallbacks.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-agent-turn-with-fallbacks.js","names":[],"sources":["../../../../src/agent/orchestration/run-agent-turn-with-fallbacks.ts"],"sourcesContent":["/**\n * Primary chat model + `agents.defaults.models.chat.fallbacks`: one user turn with rollback on failure.\n * Used by channel orchestrator, gateway webchat stream, and direct CLI-style turns.\n */\n\nimport type { Agent, AgentMessage } from '@earendil-works/pi-agent-core';\nimport type { Model, Api } from '@earendil-works/pi-ai';\n\nimport type { Config } from '../../config/schema.js';\nimport { resolveModel } from '../../providers/index.js';\nimport type { ModelManager } from '../models/index.js';\nimport {\n  isAssistantTurnAborted,\n  isAssistantTurnFailed,\n  maybeRetryTurnAfterTransientLlmFailure,\n} from './llm-turn-retry.js';\nimport { resolveAgentTurnTimeoutMs, runAgentTurnWithTimeout } from './run-agent-turn-with-timeout.js';\n\nexport { resolveAgentTurnTimeoutMs };\n\ntype FallbackLog = {\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 async function runAgentTurnWithModelFallbacks(params: {\n  agent: Agent;\n  sessionKey: string;\n  modelManager: ModelManager;\n  userMessage: AgentMessage;\n  log: FallbackLog;\n  /** Before `prompt` adds the user message (e.g. background-review nudge counters). */\n  beforeUserPrompt?: () => void | Promise<void>;\n  /** After `prompt` adds the user message; before `waitForIdle`. */\n  afterUserPrompt?: () => Promise<void>;\n  /** Overrides {@link resolveAgentTurnTimeoutMs} when set. */\n  timeoutMs?: number;\n  /** Supplies `agents.defaults.maxTaskDurationMs` for the default turn limit. */\n  getConfig?: () => Config | undefined;\n}): Promise<void> {\n  const { agent, sessionKey, modelManager, userMessage, log } = params;\n  const timeoutMs = params.timeoutMs ?? resolveAgentTurnTimeoutMs(params.getConfig?.());\n  const beforeUserPrompt = params.beforeUserPrompt ?? (async () => {});\n  const afterUserPrompt = params.afterUserPrompt ?? (async () => {});\n\n  const candidates = modelManager.getFallbackCandidatesForSession(sessionKey);\n  if (candidates.length === 0) {\n    throw new Error(\n      'No model candidates available. Configure agents.defaults.models.chat and provider API keys.',\n    );\n  }\n\n  let lastError: unknown;\n\n  for (let i = 0; i < candidates.length; i++) {\n    const candidate = candidates[i];\n    const modelRef = `${candidate.provider}/${candidate.model}`;\n\n    let resolved: Model<Api>;\n    try {\n      resolved = resolveModel(modelRef);\n    } catch (err) {\n      lastError = err;\n      log.warn({ err, modelRef, attempt: i + 1 }, 'Skipping model candidate (resolve failed)');\n      continue;\n    }\n\n    const beforeLen = agent.state.messages.length;\n\n    try {\n      modelManager.applyResolvedModel(agent, resolved, modelRef);\n\n      log.info(\n        { attempt: i + 1, total: candidates.length, provider: candidate.provider, model: candidate.model },\n        'Running agent turn',\n      );\n\n      const runTurn = async () => {\n        await beforeUserPrompt();\n        await agent.prompt(userMessage);\n        await afterUserPrompt();\n        await agent.waitForIdle();\n        await maybeRetryTurnAfterTransientLlmFailure(agent, { sessionKey, log });\n      };\n\n      await runAgentTurnWithTimeout(agent, runTurn, timeoutMs);\n\n      if (isAssistantTurnAborted(agent)) {\n        return;\n      }\n\n      if (!isAssistantTurnFailed(agent)) {\n        return;\n      }\n\n      lastError = new Error(`Assistant turn failed: ${modelRef}`);\n      log.warn(\n        { sessionKey, attempt: i + 1, total: candidates.length, modelRef },\n        'Model turn failed after retries, trying fallback',\n      );\n    } catch (err) {\n      lastError = err;\n      if (err instanceof DOMException && err.name === 'AbortError') {\n        throw err;\n      }\n      log.warn({ err, sessionKey, attempt: i + 1, modelRef }, 'Model call threw, trying fallback');\n    }\n\n    agent.state.messages = agent.state.messages.slice(0, beforeLen);\n  }\n\n  if (lastError instanceof Error) {\n    throw lastError;\n  }\n  throw new Error(lastError != null ? String(lastError) : 'All model candidates failed');\n}\n"],"mappings":";;;;gBASwD;AAiBxD,eAAsB,+BAA+B,QAcnC;CAChB,MAAM,EAAE,OAAO,YAAY,cAAc,aAAa,QAAQ;CAC9D,MAAM,YAAY,OAAO,aAAa,0BAA0B,OAAO,aAAa,CAAC;CACrF,MAAM,mBAAmB,OAAO,qBAAqB,YAAY;CACjE,MAAM,kBAAkB,OAAO,oBAAoB,YAAY;CAE/D,MAAM,aAAa,aAAa,gCAAgC,WAAW;AAC3E,KAAI,WAAW,WAAW,EACxB,OAAM,IAAI,MACR,8FACD;CAGH,IAAI;AAEJ,MAAK,IAAI,IAAI,GAAG,IAAI,WAAW,QAAQ,KAAK;EAC1C,MAAM,YAAY,WAAW;EAC7B,MAAM,WAAW,GAAG,UAAU,SAAS,GAAG,UAAU;EAEpD,IAAI;AACJ,MAAI;AACF,cAAW,aAAa,SAAS;WAC1B,KAAK;AACZ,eAAY;AACZ,OAAI,KAAK;IAAE;IAAK;IAAU,SAAS,IAAI;IAAG,EAAE,4CAA4C;AACxF;;EAGF,MAAM,YAAY,MAAM,MAAM,SAAS;AAEvC,MAAI;AACF,gBAAa,mBAAmB,OAAO,UAAU,SAAS;AAE1D,OAAI,KACF;IAAE,SAAS,IAAI;IAAG,OAAO,WAAW;IAAQ,UAAU,UAAU;IAAU,OAAO,UAAU;IAAO,EAClG,qBACD;GAED,MAAM,UAAU,YAAY;AAC1B,UAAM,kBAAkB;AACxB,UAAM,MAAM,OAAO,YAAY;AAC/B,UAAM,iBAAiB;AACvB,UAAM,MAAM,aAAa;AACzB,UAAM,uCAAuC,OAAO;KAAE;KAAY;KAAK,CAAC;;AAG1E,SAAM,wBAAwB,OAAO,SAAS,UAAU;AAExD,OAAI,uBAAuB,MAAM,CAC/B;AAGF,OAAI,CAAC,sBAAsB,MAAM,CAC/B;AAGF,+BAAY,IAAI,MAAM,0BAA0B,WAAW;AAC3D,OAAI,KACF;IAAE;IAAY,SAAS,IAAI;IAAG,OAAO,WAAW;IAAQ;IAAU,EAClE,mDACD;WACM,KAAK;AACZ,eAAY;AACZ,OAAI,eAAe,gBAAgB,IAAI,SAAS,aAC9C,OAAM;AAER,OAAI,KAAK;IAAE;IAAK;IAAY,SAAS,IAAI;IAAG;IAAU,EAAE,oCAAoC;;AAG9F,QAAM,MAAM,WAAW,MAAM,MAAM,SAAS,MAAM,GAAG,UAAU;;AAGjE,KAAI,qBAAqB,MACvB,OAAM;AAER,OAAM,IAAI,MAAM,aAAa,OAAO,OAAO,UAAU,GAAG,8BAA8B"}
+{"version":3,"file":"run-agent-turn-with-fallbacks.js","names":[],"sources":["../../../../src/agent/orchestration/run-agent-turn-with-fallbacks.ts"],"sourcesContent":["/**\n * Ordered model candidates: one user turn with rollback on failure.\n * Used by channel orchestrator, gateway webchat stream, and direct CLI-style turns.\n */\n\nimport type { Agent, AgentMessage } from '@earendil-works/pi-agent-core';\nimport type { Model, Api } from '@earendil-works/pi-ai';\n\nimport type { Config } from '../../config/schema.js';\nimport { resolveModel } from '../../providers/index.js';\nimport type { ModelManager } from '../models/index.js';\nimport {\n  isAssistantTurnAborted,\n  isAssistantTurnFailed,\n  maybeRetryTurnAfterTransientLlmFailure,\n} from './llm-turn-retry.js';\nimport { resolveAgentTurnTimeoutMs, runAgentTurnWithTimeout } from './run-agent-turn-with-timeout.js';\n\nexport { resolveAgentTurnTimeoutMs };\n\ntype FallbackLog = {\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 async function runAgentTurnWithModelFallbacks(params: {\n  agent: Agent;\n  sessionKey: string;\n  modelManager: ModelManager;\n  userMessage: AgentMessage;\n  log: FallbackLog;\n  /** Before `prompt` adds the user message (e.g. background-review nudge counters). */\n  beforeUserPrompt?: () => void | Promise<void>;\n  /** After `prompt` adds the user message; before `waitForIdle`. */\n  afterUserPrompt?: () => Promise<void>;\n  /** Overrides {@link resolveAgentTurnTimeoutMs} when set. */\n  timeoutMs?: number;\n  /** Supplies the default turn limit. */\n  getConfig?: () => Config | undefined;\n}): Promise<void> {\n  const { agent, sessionKey, modelManager, userMessage, log } = params;\n  const timeoutMs = params.timeoutMs ?? resolveAgentTurnTimeoutMs(params.getConfig?.());\n  const beforeUserPrompt = params.beforeUserPrompt ?? (async () => {});\n  const afterUserPrompt = params.afterUserPrompt ?? (async () => {});\n\n  const candidates = modelManager.getFallbackCandidatesForSession(sessionKey);\n  if (candidates.length === 0) {\n    throw new Error(\n      'No model candidates available. Configure agent manifest models and provider API keys.',\n    );\n  }\n\n  let lastError: unknown;\n\n  for (let i = 0; i < candidates.length; i++) {\n    const candidate = candidates[i];\n    const modelRef = `${candidate.provider}/${candidate.model}`;\n\n    let resolved: Model<Api>;\n    try {\n      resolved = resolveModel(modelRef);\n    } catch (err) {\n      lastError = err;\n      log.warn({ err, modelRef, attempt: i + 1 }, 'Skipping model candidate (resolve failed)');\n      continue;\n    }\n\n    const beforeLen = agent.state.messages.length;\n\n    try {\n      modelManager.applyResolvedModel(agent, resolved, modelRef);\n\n      log.info(\n        { attempt: i + 1, total: candidates.length, provider: candidate.provider, model: candidate.model },\n        'Running agent turn',\n      );\n\n      const runTurn = async () => {\n        await beforeUserPrompt();\n        await agent.prompt(userMessage);\n        await afterUserPrompt();\n        await agent.waitForIdle();\n        await maybeRetryTurnAfterTransientLlmFailure(agent, { sessionKey, log });\n      };\n\n      await runAgentTurnWithTimeout(agent, runTurn, timeoutMs);\n\n      if (isAssistantTurnAborted(agent)) {\n        return;\n      }\n\n      if (!isAssistantTurnFailed(agent)) {\n        return;\n      }\n\n      lastError = new Error(`Assistant turn failed: ${modelRef}`);\n      log.warn(\n        { sessionKey, attempt: i + 1, total: candidates.length, modelRef },\n        'Model turn failed after retries, trying fallback',\n      );\n    } catch (err) {\n      lastError = err;\n      if (err instanceof DOMException && err.name === 'AbortError') {\n        throw err;\n      }\n      log.warn({ err, sessionKey, attempt: i + 1, modelRef }, 'Model call threw, trying fallback');\n    }\n\n    agent.state.messages = agent.state.messages.slice(0, beforeLen);\n  }\n\n  if (lastError instanceof Error) {\n    throw lastError;\n  }\n  throw new Error(lastError != null ? String(lastError) : 'All model candidates failed');\n}\n"],"mappings":";;;;gBASwD;AAiBxD,eAAsB,+BAA+B,QAcnC;CAChB,MAAM,EAAE,OAAO,YAAY,cAAc,aAAa,QAAQ;CAC9D,MAAM,YAAY,OAAO,aAAa,0BAA0B,OAAO,aAAa,CAAC;CACrF,MAAM,mBAAmB,OAAO,qBAAqB,YAAY;CACjE,MAAM,kBAAkB,OAAO,oBAAoB,YAAY;CAE/D,MAAM,aAAa,aAAa,gCAAgC,WAAW;AAC3E,KAAI,WAAW,WAAW,EACxB,OAAM,IAAI,MACR,wFACD;CAGH,IAAI;AAEJ,MAAK,IAAI,IAAI,GAAG,IAAI,WAAW,QAAQ,KAAK;EAC1C,MAAM,YAAY,WAAW;EAC7B,MAAM,WAAW,GAAG,UAAU,SAAS,GAAG,UAAU;EAEpD,IAAI;AACJ,MAAI;AACF,cAAW,aAAa,SAAS;WAC1B,KAAK;AACZ,eAAY;AACZ,OAAI,KAAK;IAAE;IAAK;IAAU,SAAS,IAAI;IAAG,EAAE,4CAA4C;AACxF;;EAGF,MAAM,YAAY,MAAM,MAAM,SAAS;AAEvC,MAAI;AACF,gBAAa,mBAAmB,OAAO,UAAU,SAAS;AAE1D,OAAI,KACF;IAAE,SAAS,IAAI;IAAG,OAAO,WAAW;IAAQ,UAAU,UAAU;IAAU,OAAO,UAAU;IAAO,EAClG,qBACD;GAED,MAAM,UAAU,YAAY;AAC1B,UAAM,kBAAkB;AACxB,UAAM,MAAM,OAAO,YAAY;AAC/B,UAAM,iBAAiB;AACvB,UAAM,MAAM,aAAa;AACzB,UAAM,uCAAuC,OAAO;KAAE;KAAY;KAAK,CAAC;;AAG1E,SAAM,wBAAwB,OAAO,SAAS,UAAU;AAExD,OAAI,uBAAuB,MAAM,CAC/B;AAGF,OAAI,CAAC,sBAAsB,MAAM,CAC/B;AAGF,+BAAY,IAAI,MAAM,0BAA0B,WAAW;AAC3D,OAAI,KACF;IAAE;IAAY,SAAS,IAAI;IAAG,OAAO,WAAW;IAAQ;IAAU,EAClE,mDACD;WACM,KAAK;AACZ,eAAY;AACZ,OAAI,eAAe,gBAAgB,IAAI,SAAS,aAC9C,OAAM;AAER,OAAI,KAAK;IAAE;IAAK;IAAY,SAAS,IAAI;IAAG;IAAU,EAAE,oCAAoC;;AAG9F,QAAM,MAAM,WAAW,MAAM,MAAM,SAAS,MAAM,GAAG,UAAU;;AAGjE,KAAI,qBAAqB,MACvB,OAAM;AAER,OAAM,IAAI,MAAM,aAAa,OAAO,OAAO,UAAU,GAAG,8BAA8B"}

package/dist/src/agent/orchestration/run-agent-turn-with-timeout.d.ts

@@ -8,12 +8,8 @@ import type { Config } from '../../config/schema.js';
 export declare const MIN_AGENT_TURN_TIMEOUT_MS = 60000;
 /** Maximum per-turn timeout (4 hours), aligned with `maxTaskDurationMs` schema cap. */
 export declare const MAX_AGENT_TURN_TIMEOUT_MS: number;
-/** Default when `agents.defaults.maxTaskDurationMs` is unset (30 minutes). */
+/** Default per-turn timeout (30 minutes). */
 export declare const DEFAULT_AGENT_TURN_TIMEOUT_MS: number;
-/**
- * Effective turn timeout from config or default.
- * Uses `agents.defaults.maxTaskDurationMs` when set (clamped to schema bounds).
- */
-export declare function resolveAgentTurnTimeoutMs(config?: Config): number;
+export declare function resolveAgentTurnTimeoutMs(_config?: Config): number;
 export declare function isAgentTurnTimeoutError(err: unknown): boolean;
 export declare function runAgentTurnWithTimeout(agent: Agent, runTurn: () => Promise<void>, timeoutMs: number): Promise<void>;

package/dist/src/agent/orchestration/run-agent-turn-with-timeout.js

@@ -3,15 +3,9 @@
 const MIN_AGENT_TURN_TIMEOUT_MS = 6e4;
 /** Maximum per-turn timeout (4 hours), aligned with `maxTaskDurationMs` schema cap. */
 const MAX_AGENT_TURN_TIMEOUT_MS = 14400 * 1e3;
-/** Default when `agents.defaults.maxTaskDurationMs` is unset (30 minutes). */
+/** Default per-turn timeout (30 minutes). */
 const DEFAULT_AGENT_TURN_TIMEOUT_MS = 1800 * 1e3;
-/**
-* Effective turn timeout from config or default.
-* Uses `agents.defaults.maxTaskDurationMs` when set (clamped to schema bounds).
-*/
-function resolveAgentTurnTimeoutMs(config) {
-	const raw = config?.agents?.defaults?.maxTaskDurationMs;
-	if (typeof raw === "number" && Number.isFinite(raw)) return Math.min(MAX_AGENT_TURN_TIMEOUT_MS, Math.max(MIN_AGENT_TURN_TIMEOUT_MS, Math.floor(raw)));
+function resolveAgentTurnTimeoutMs(_config) {
 	return DEFAULT_AGENT_TURN_TIMEOUT_MS;
 }
 function isAgentTurnTimeoutError(err) {

package/dist/src/agent/orchestration/run-agent-turn-with-timeout.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-agent-turn-with-timeout.js","names":[],"sources":["../../../../src/agent/orchestration/run-agent-turn-with-timeout.ts"],"sourcesContent":["/**\n * Race an agent turn against a wall clock; on timeout, abort the in-flight turn\n * and await {@link Agent.waitForIdle} so a subsequent {@link Agent.prompt} is allowed.\n */\n\nimport type { Agent } from '@earendil-works/pi-agent-core';\n\nimport type { Config } from '../../config/schema.js';\n\n/** Minimum per-turn timeout (1 minute). */\nexport const MIN_AGENT_TURN_TIMEOUT_MS = 60_000;\n\n/** Maximum per-turn timeout (4 hours), aligned with `maxTaskDurationMs` schema cap. */\nexport const MAX_AGENT_TURN_TIMEOUT_MS = 4 * 60 * 60 * 1000;\n\n/** Default when `agents.defaults.maxTaskDurationMs` is unset (30 minutes). */\nexport const DEFAULT_AGENT_TURN_TIMEOUT_MS = 30 * 60 * 1000;\n\n/**\n * Effective turn timeout from config or default.\n * Uses `agents.defaults.maxTaskDurationMs` when set (clamped to schema bounds).\n */\nexport function resolveAgentTurnTimeoutMs(config?: Config): number {\n  const raw = config?.agents?.defaults?.maxTaskDurationMs;\n  if (typeof raw === 'number' && Number.isFinite(raw)) {\n    const n = Math.floor(raw);\n    return Math.min(MAX_AGENT_TURN_TIMEOUT_MS, Math.max(MIN_AGENT_TURN_TIMEOUT_MS, n));\n  }\n  return DEFAULT_AGENT_TURN_TIMEOUT_MS;\n}\n\nexport function isAgentTurnTimeoutError(err: unknown): boolean {\n  return err instanceof Error && err.message.startsWith('Agent turn timed out after');\n}\n\nexport async function runAgentTurnWithTimeout(\n  agent: Agent,\n  runTurn: () => Promise<void>,\n  timeoutMs: number,\n): Promise<void> {\n  let timeoutId: ReturnType<typeof setTimeout> | undefined;\n  const timeoutPromise = new Promise<never>((_, reject) => {\n    timeoutId = setTimeout(\n      () => reject(new Error(`Agent turn timed out after ${timeoutMs / 1000}s`)),\n      timeoutMs,\n    );\n  });\n\n  try {\n    await Promise.race([\n      runTurn().finally(() => {\n        if (timeoutId !== undefined) {\n          clearTimeout(timeoutId);\n        }\n      }),\n      timeoutPromise,\n    ]);\n  } catch (err) {\n    if (isAgentTurnTimeoutError(err)) {\n      agent.abort();\n      await agent.waitForIdle();\n    }\n    throw err;\n  }\n}\n"],"mappings":";;AAUA,MAAa,4BAA4B;;AAGzC,MAAa,4BAA4B,QAAc;;AAGvD,MAAa,gCAAgC,OAAU;;;;;AAMvD,SAAgB,0BAA0B,QAAyB;CACjE,MAAM,MAAM,QAAQ,QAAQ,UAAU;AACtC,KAAI,OAAO,QAAQ,YAAY,OAAO,SAAS,IAAI,CAEjD,QAAO,KAAK,IAAI,2BAA2B,KAAK,IAAI,2BAD1C,KAAK,MAAM,IAC2D,CAAC,CAAC;AAEpF,QAAO;;AAGT,SAAgB,wBAAwB,KAAuB;AAC7D,QAAO,eAAe,SAAS,IAAI,QAAQ,WAAW,6BAA6B;;AAGrF,eAAsB,wBACpB,OACA,SACA,WACe;CACf,IAAI;CACJ,MAAM,iBAAiB,IAAI,SAAgB,GAAG,WAAW;AACvD,cAAY,iBACJ,uBAAO,IAAI,MAAM,8BAA8B,YAAY,IAAK,GAAG,CAAC,EAC1E,UACD;GACD;AAEF,KAAI;AACF,QAAM,QAAQ,KAAK,CACjB,SAAS,CAAC,cAAc;AACtB,OAAI,cAAc,KAAA,EAChB,cAAa,UAAU;IAEzB,EACF,eACD,CAAC;UACK,KAAK;AACZ,MAAI,wBAAwB,IAAI,EAAE;AAChC,SAAM,OAAO;AACb,SAAM,MAAM,aAAa;;AAE3B,QAAM"}
+{"version":3,"file":"run-agent-turn-with-timeout.js","names":[],"sources":["../../../../src/agent/orchestration/run-agent-turn-with-timeout.ts"],"sourcesContent":["/**\n * Race an agent turn against a wall clock; on timeout, abort the in-flight turn\n * and await {@link Agent.waitForIdle} so a subsequent {@link Agent.prompt} is allowed.\n */\n\nimport type { Agent } from '@earendil-works/pi-agent-core';\n\nimport type { Config } from '../../config/schema.js';\n\n/** Minimum per-turn timeout (1 minute). */\nexport const MIN_AGENT_TURN_TIMEOUT_MS = 60_000;\n\n/** Maximum per-turn timeout (4 hours), aligned with `maxTaskDurationMs` schema cap. */\nexport const MAX_AGENT_TURN_TIMEOUT_MS = 4 * 60 * 60 * 1000;\n\n/** Default per-turn timeout (30 minutes). */\nexport const DEFAULT_AGENT_TURN_TIMEOUT_MS = 30 * 60 * 1000;\n\nexport function resolveAgentTurnTimeoutMs(_config?: Config): number {\n  return DEFAULT_AGENT_TURN_TIMEOUT_MS;\n}\n\nexport function isAgentTurnTimeoutError(err: unknown): boolean {\n  return err instanceof Error && err.message.startsWith('Agent turn timed out after');\n}\n\nexport async function runAgentTurnWithTimeout(\n  agent: Agent,\n  runTurn: () => Promise<void>,\n  timeoutMs: number,\n): Promise<void> {\n  let timeoutId: ReturnType<typeof setTimeout> | undefined;\n  const timeoutPromise = new Promise<never>((_, reject) => {\n    timeoutId = setTimeout(\n      () => reject(new Error(`Agent turn timed out after ${timeoutMs / 1000}s`)),\n      timeoutMs,\n    );\n  });\n\n  try {\n    await Promise.race([\n      runTurn().finally(() => {\n        if (timeoutId !== undefined) {\n          clearTimeout(timeoutId);\n        }\n      }),\n      timeoutPromise,\n    ]);\n  } catch (err) {\n    if (isAgentTurnTimeoutError(err)) {\n      agent.abort();\n      await agent.waitForIdle();\n    }\n    throw err;\n  }\n}\n"],"mappings":";;AAUA,MAAa,4BAA4B;;AAGzC,MAAa,4BAA4B,QAAc;;AAGvD,MAAa,gCAAgC,OAAU;AAEvD,SAAgB,0BAA0B,SAA0B;AAClE,QAAO;;AAGT,SAAgB,wBAAwB,KAAuB;AAC7D,QAAO,eAAe,SAAS,IAAI,QAAQ,WAAW,6BAA6B;;AAGrF,eAAsB,wBACpB,OACA,SACA,WACe;CACf,IAAI;CACJ,MAAM,iBAAiB,IAAI,SAAgB,GAAG,WAAW;AACvD,cAAY,iBACJ,uBAAO,IAAI,MAAM,8BAA8B,YAAY,IAAK,GAAG,CAAC,EAC1E,UACD;GACD;AAEF,KAAI;AACF,QAAM,QAAQ,KAAK,CACjB,SAAS,CAAC,cAAc;AACtB,OAAI,cAAc,KAAA,EAChB,cAAa,UAAU;IAEzB,EACF,eACD,CAAC;UACK,KAAK;AACZ,MAAI,wBAAwB,IAAI,EAAE;AAChC,SAAM,OAAO;AACb,SAAM,MAAM,aAAa;;AAE3B,QAAM"}

package/dist/src/agent/prompt/memory/index.d.ts

@@ -7,12 +7,14 @@ interface MemoryMatch {
 export interface MemorySearchOptions {
     maxResults?: number;
     minScore?: number;
-    /** Absolute path to agent-scoped curated memories dir (MEMORY.md + USER.md). */
+    /** Absolute path to agent-scoped curated memories dir (MEMORY.md). */
     memoriesDir?: string;
+    /** Absolute path to global user memory (`~/.xopc/user/MEMORY.md`). */
+    userMemoryPath?: string;
     agentId?: string;
 }
 export declare function memorySearch(baseDir: string, query: string, options?: MemorySearchOptions): Promise<MemoryMatch[]>;
-export declare function memoryGet(baseDir: string, path: string, from?: number, lines?: number, memoriesDir?: string): {
+export declare function memoryGet(baseDir: string, path: string, from?: number, lines?: number, memoriesDir?: string, userMemoryPath?: string): {
     content: string;
     lineNumbers: {
         start: number;

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

@@ -3,12 +3,13 @@ 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 { existsSync, readFileSync } from "fs";
 import { join, relative } from "path";
+import { existsSync, readFileSync } from "fs";
 //#region src/agent/prompt/memory/index.ts
 init_logger();
 const log = createLogger("MemorySearch");
-const CURATED_MEMORY_FILENAMES = new Set(["MEMORY.md", "USER.md"]);
+const AGENT_MEMORY_FILENAME = "MEMORY.md";
+const USER_MEMORY_DISPLAY_PATH = "user/MEMORY.md";
 function ensureMemoryDatabase() {
 	requireXopcDatabase();
 }
@@ -16,7 +17,7 @@ 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 candidatePaths = [...[...memoriesDir ? [join(memoriesDir, AGENT_MEMORY_FILENAME)].filter((path) => existsSync(path)) : [], ...options.userMemoryPath && existsSync(options.userMemoryPath) ? [options.userMemoryPath] : []], join(baseDir, "MEMORY.md")].filter((path) => existsSync(path));
 	const matches = [];
 	for (const path of candidatePaths) {
 		const lines = readFileSync(path, "utf-8").split("\n");
@@ -25,7 +26,7 @@ function fallbackMemorySearch(baseDir, query, options) {
 			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, "/");
+			const file = options.userMemoryPath && path === options.userMemoryPath ? USER_MEMORY_DISPLAY_PATH : memoriesDir && path.startsWith(memoriesDir) ? path.slice(memoriesDir.length).replace(/^[/\\]/, "") : relative(baseDir, path).replace(/\\/g, "/");
 			matches.push({
 				file,
 				lines: line,
@@ -37,14 +38,15 @@ function fallbackMemorySearch(baseDir, query, options) {
 	return matches.slice(0, options.maxResults);
 }
 async function memorySearch(baseDir, query, options = {}) {
-	const { maxResults = 5, minScore = .3, memoriesDir, agentId } = options;
+	const { maxResults = 5, minScore = .3, memoriesDir, userMemoryPath, agentId } = options;
 	const resolvedAgentId = agentId ?? resolveAgentIdFromMemoriesDir(memoriesDir);
 	try {
 		ensureMemoryDatabase();
 		syncMemoryIndex({
 			agentId: resolvedAgentId,
 			workspaceDir: baseDir,
-			memoriesDir
+			memoriesDir,
+			userMemoryPath
 		});
 		return searchMemoryIndex({
 			agentId: resolvedAgentId,
@@ -67,17 +69,21 @@ async function memorySearch(baseDir, query, options = {}) {
 		return fallbackMemorySearch(baseDir, query, {
 			maxResults,
 			minScore,
-			memoriesDir
+			memoriesDir,
+			userMemoryPath
 		});
 	}
 }
-function memoryGet(baseDir, path, from, lines, memoriesDir) {
+function memoryGet(baseDir, path, from, lines, memoriesDir, userMemoryPath) {
 	let fullPath = path.startsWith("/") ? path : join(baseDir, path);
-	if (!existsSync(fullPath) && memoriesDir) {
-		const filename = path.split(/[/\\]/).pop() ?? path;
-		if (CURATED_MEMORY_FILENAMES.has(filename)) {
-			const candidatePath = join(memoriesDir, filename);
-			if (existsSync(candidatePath)) fullPath = candidatePath;
+	if (!existsSync(fullPath)) {
+		const normalized = path.replace(/\\/g, "/");
+		if (normalized === USER_MEMORY_DISPLAY_PATH && userMemoryPath && existsSync(userMemoryPath)) fullPath = userMemoryPath;
+		else if (memoriesDir) {
+			if ((normalized.split("/").pop() ?? normalized) === AGENT_MEMORY_FILENAME) {
+				const candidatePath = join(memoriesDir, AGENT_MEMORY_FILENAME);
+				if (existsSync(candidatePath)) fullPath = candidatePath;
+			}
 		}
 	}
 	if (!existsSync(fullPath)) return null;

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, 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"}
+{"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). */\n  memoriesDir?: string;\n  /** Absolute path to global user memory (`~/.xopc/user/MEMORY.md`). */\n  userMemoryPath?: string;\n  agentId?: string;\n}\n\nconst AGENT_MEMORY_FILENAME = 'MEMORY.md';\nconst USER_MEMORY_DISPLAY_PATH = 'user/MEMORY.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' | 'userMemoryPath'>,\n): MemoryMatch[] {\n  const normalizedQuery = query.trim().toLowerCase();\n  if (!normalizedQuery) return [];\n\n  const memoriesDir = options.memoriesDir;\n  const curatedPaths = [\n    ...(memoriesDir ? [join(memoriesDir, AGENT_MEMORY_FILENAME)].filter((path) => existsSync(path)) : []),\n    ...(options.userMemoryPath && existsSync(options.userMemoryPath) ? [options.userMemoryPath] : []),\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 =\n        options.userMemoryPath && path === options.userMemoryPath\n          ? USER_MEMORY_DISPLAY_PATH\n          : 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, userMemoryPath, agentId } = options;\n  const resolvedAgentId = agentId ?? resolveAgentIdFromMemoriesDir(memoriesDir);\n\n  try {\n    ensureMemoryDatabase();\n    syncMemoryIndex({ agentId: resolvedAgentId, workspaceDir: baseDir, memoriesDir, userMemoryPath });\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, userMemoryPath });\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  userMemoryPath?: string,\n): { content: string; lineNumbers: { start: number; end: number } } | null {\n  let fullPath = path.startsWith('/') ? path : join(baseDir, path);\n\n  if (!existsSync(fullPath)) {\n    const normalized = path.replace(/\\\\/g, '/');\n    if (normalized === USER_MEMORY_DISPLAY_PATH && userMemoryPath && existsSync(userMemoryPath)) {\n      fullPath = userMemoryPath;\n    } else if (memoriesDir) {\n      const segments = normalized.split('/');\n      const filename = segments.pop() ?? normalized;\n      if (filename === AGENT_MEMORY_FILENAME) {\n        const candidatePath = join(memoriesDir, AGENT_MEMORY_FILENAME);\n        if (existsSync(candidatePath)) {\n          fullPath = candidatePath;\n        }\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":"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"}

package/dist/src/agent/prompt/sections/memory-skills.js

@@ -24,7 +24,7 @@ function buildMemorySection(params) {
 		"",
 		"- **Daily notes:** `memory/YYYY-MM-DD.md` — raw logs (runtime may preload recent days on /new or reset)",
 		"- **Long-term:** profile `MEMORY.md` — curated memories in Project Context when present",
-		"- **Curated store:** agent home `memories/MEMORY.md` and `memories/USER.md` — use `curated_memory` for live read/write",
+		"- **Curated store:** agent home `memories/MEMORY.md` and global `user/MEMORY.md` — use `curated_memory` for live read/write",
 		"",
 		"### Writing to Memory",
 		"",

package/dist/src/agent/prompt/sections/memory-skills.js.map

@@ -1 +1 @@
-{"version":3,"file":"memory-skills.js","names":[],"sources":["../../../../../src/agent/prompt/sections/memory-skills.ts"],"sourcesContent":["import type { MemoryCitationsMode } from '../types.js';\n\nexport function buildMemorySection(params: {\n  availableTools: Set<string>;\n  citationsMode?: MemoryCitationsMode;\n  hasProfileMemory?: boolean;\n  includeMemorySection?: boolean;\n}): string {\n  if (params.includeMemorySection === false) {\n    return '';\n  }\n  const hasMemoryTools =\n    params.availableTools.has('memory_search') ||\n    params.availableTools.has('memory_get') ||\n    params.availableTools.has('curated_memory');\n  if (!hasMemoryTools && !params.hasProfileMemory) {\n    return '';\n  }\n\n  const citationsMode = params.citationsMode ?? 'on';\n  const citationInstruction =\n    citationsMode === 'off'\n      ? 'Citations are disabled: do not mention file paths or line numbers in replies.'\n      : citationsMode === 'source-only'\n        ? 'Citations: mention file path when it helps (e.g., Source: MEMORY.md).'\n        : 'Citations: include Source: <path#line> when it helps the user verify memory snippets.';\n\n  const toolLines: string[] = [];\n  if (params.availableTools.has('memory_search')) {\n    toolLines.push('1. Run `memory_search` on profile MEMORY.md and workspace `memory/*.md`');\n  }\n  if (params.availableTools.has('session_search')) {\n    toolLines.push(\n      `${toolLines.length + 1}. For **other chat sessions** / cross-session history, use \\`session_search\\` with keywords (or omit \\`query\\` to list recent sessions)`,\n    );\n  }\n  if (params.availableTools.has('memory_get')) {\n    toolLines.push(`${toolLines.length + 1}. Use \\`memory_get\\` to pull only the needed lines from files`);\n  }\n  if (params.availableTools.has('curated_memory')) {\n    toolLines.push(\n      `${toolLines.length + 1}. For structured curated notes under agent home \\`memories/\\`, use \\`curated_memory\\``,\n    );\n  }\n  toolLines.push(`${toolLines.length + 1}. If low confidence after search, say you checked`);\n\n  return [\n    '## Memory Recall',\n    '',\n    citationInstruction,\n    '',\n    'Startup profile files (SOUL, USER, MEMORY, etc.) are already in Project Context above when injected. Do not re-read them unless the user asks or you need lines beyond what was injected.',\n    '',\n    'Before answering anything about prior work, decisions, dates, people, preferences, or todos:',\n    ...toolLines,\n    '',\n    '### Memory Files',\n    '',\n    '- **Daily notes:** `memory/YYYY-MM-DD.md` — raw logs (runtime may preload recent days on /new or reset)',\n    '- **Long-term:** profile `MEMORY.md` — curated memories in Project Context when present',\n    '- **Curated store:** agent home `memories/MEMORY.md` and `memories/USER.md` — use `curated_memory` for live read/write',\n    '',\n    '### Writing to Memory',\n    '',\n    '- **Declarative vs procedural:** Save facts and preferences via workspace memory files and/or `curated_memory`. Save reusable task playbooks with `skill_manage` as skills.',\n    '- **Memory is limited** — if you want to remember something, WRITE IT TO A FILE',\n    '- When someone says \"remember this\" → update `memory/YYYY-MM-DD.md` or relevant file',\n    '- **Text > Brain**',\n  ].join('\\n');\n}\n\nexport function buildExternalMemorySection(text: string | undefined): string {\n  const t = text?.trim();\n  if (!t) {\n    return '';\n  }\n  return `## External memory provider\\n\\n${t}`;\n}\n\nexport function buildSkillsSection(hasSkillTools: boolean): string {\n  if (!hasSkillTools) {\n    return '';\n  }\n\n  return [\n    '## Skills (mandatory)',\n    'Before replying: scan <available_skills> <description> entries.',\n    '- If exactly one skill clearly applies: use `skill_view(name)` to load its SKILL.md, then follow it.',\n    '- If multiple could apply: choose the most specific one, then load/follow it.',\n    '- If none clearly apply: do not load any SKILL.md.',\n    'Constraints: never load more than one skill up front; only load after selecting.',\n    '- When a skill drives external API writes, assume rate limits: prefer fewer larger writes, avoid tight one-item loops, serialize bursts when possible, and respect 429/Retry-After.',\n    '',\n    '**Division of labor with memory:** Skills = **procedural** workflows; memory / `curated_memory` = **declarative** facts and preferences.',\n  ].join('\\n');\n}\n"],"mappings":";AAEA,SAAgB,mBAAmB,QAKxB;AACT,KAAI,OAAO,yBAAyB,MAClC,QAAO;AAMT,KAAI,EAHF,OAAO,eAAe,IAAI,gBAAgB,IAC1C,OAAO,eAAe,IAAI,aAAa,IACvC,OAAO,eAAe,IAAI,iBAAiB,KACtB,CAAC,OAAO,iBAC7B,QAAO;CAGT,MAAM,gBAAgB,OAAO,iBAAiB;CAC9C,MAAM,sBACJ,kBAAkB,QACd,kFACA,kBAAkB,gBAChB,0EACA;CAER,MAAM,YAAsB,EAAE;AAC9B,KAAI,OAAO,eAAe,IAAI,gBAAgB,CAC5C,WAAU,KAAK,0EAA0E;AAE3F,KAAI,OAAO,eAAe,IAAI,iBAAiB,CAC7C,WAAU,KACR,GAAG,UAAU,SAAS,EAAE,yIACzB;AAEH,KAAI,OAAO,eAAe,IAAI,aAAa,CACzC,WAAU,KAAK,GAAG,UAAU,SAAS,EAAE,+DAA+D;AAExG,KAAI,OAAO,eAAe,IAAI,iBAAiB,CAC7C,WAAU,KACR,GAAG,UAAU,SAAS,EAAE,uFACzB;AAEH,WAAU,KAAK,GAAG,UAAU,SAAS,EAAE,mDAAmD;AAE1F,QAAO;EACL;EACA;EACA;EACA;EACA;EACA;EACA;EACA,GAAG;EACH;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACD,CAAC,KAAK,KAAK;;AAGd,SAAgB,2BAA2B,MAAkC;CAC3E,MAAM,IAAI,MAAM,MAAM;AACtB,KAAI,CAAC,EACH,QAAO;AAET,QAAO,kCAAkC;;AAG3C,SAAgB,mBAAmB,eAAgC;AACjE,KAAI,CAAC,cACH,QAAO;AAGT,QAAO;EACL;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACD,CAAC,KAAK,KAAK"}
+{"version":3,"file":"memory-skills.js","names":[],"sources":["../../../../../src/agent/prompt/sections/memory-skills.ts"],"sourcesContent":["import type { MemoryCitationsMode } from '../types.js';\n\nexport function buildMemorySection(params: {\n  availableTools: Set<string>;\n  citationsMode?: MemoryCitationsMode;\n  hasProfileMemory?: boolean;\n  includeMemorySection?: boolean;\n}): string {\n  if (params.includeMemorySection === false) {\n    return '';\n  }\n  const hasMemoryTools =\n    params.availableTools.has('memory_search') ||\n    params.availableTools.has('memory_get') ||\n    params.availableTools.has('curated_memory');\n  if (!hasMemoryTools && !params.hasProfileMemory) {\n    return '';\n  }\n\n  const citationsMode = params.citationsMode ?? 'on';\n  const citationInstruction =\n    citationsMode === 'off'\n      ? 'Citations are disabled: do not mention file paths or line numbers in replies.'\n      : citationsMode === 'source-only'\n        ? 'Citations: mention file path when it helps (e.g., Source: MEMORY.md).'\n        : 'Citations: include Source: <path#line> when it helps the user verify memory snippets.';\n\n  const toolLines: string[] = [];\n  if (params.availableTools.has('memory_search')) {\n    toolLines.push('1. Run `memory_search` on profile MEMORY.md and workspace `memory/*.md`');\n  }\n  if (params.availableTools.has('session_search')) {\n    toolLines.push(\n      `${toolLines.length + 1}. For **other chat sessions** / cross-session history, use \\`session_search\\` with keywords (or omit \\`query\\` to list recent sessions)`,\n    );\n  }\n  if (params.availableTools.has('memory_get')) {\n    toolLines.push(`${toolLines.length + 1}. Use \\`memory_get\\` to pull only the needed lines from files`);\n  }\n  if (params.availableTools.has('curated_memory')) {\n    toolLines.push(\n      `${toolLines.length + 1}. For structured curated notes under agent home \\`memories/\\`, use \\`curated_memory\\``,\n    );\n  }\n  toolLines.push(`${toolLines.length + 1}. If low confidence after search, say you checked`);\n\n  return [\n    '## Memory Recall',\n    '',\n    citationInstruction,\n    '',\n    'Startup profile files (SOUL, USER, MEMORY, etc.) are already in Project Context above when injected. Do not re-read them unless the user asks or you need lines beyond what was injected.',\n    '',\n    'Before answering anything about prior work, decisions, dates, people, preferences, or todos:',\n    ...toolLines,\n    '',\n    '### Memory Files',\n    '',\n    '- **Daily notes:** `memory/YYYY-MM-DD.md` — raw logs (runtime may preload recent days on /new or reset)',\n    '- **Long-term:** profile `MEMORY.md` — curated memories in Project Context when present',\n    '- **Curated store:** agent home `memories/MEMORY.md` and global `user/MEMORY.md` — use `curated_memory` for live read/write',\n    '',\n    '### Writing to Memory',\n    '',\n    '- **Declarative vs procedural:** Save facts and preferences via workspace memory files and/or `curated_memory`. Save reusable task playbooks with `skill_manage` as skills.',\n    '- **Memory is limited** — if you want to remember something, WRITE IT TO A FILE',\n    '- When someone says \"remember this\" → update `memory/YYYY-MM-DD.md` or relevant file',\n    '- **Text > Brain**',\n  ].join('\\n');\n}\n\nexport function buildExternalMemorySection(text: string | undefined): string {\n  const t = text?.trim();\n  if (!t) {\n    return '';\n  }\n  return `## External memory provider\\n\\n${t}`;\n}\n\nexport function buildSkillsSection(hasSkillTools: boolean): string {\n  if (!hasSkillTools) {\n    return '';\n  }\n\n  return [\n    '## Skills (mandatory)',\n    'Before replying: scan <available_skills> <description> entries.',\n    '- If exactly one skill clearly applies: use `skill_view(name)` to load its SKILL.md, then follow it.',\n    '- If multiple could apply: choose the most specific one, then load/follow it.',\n    '- If none clearly apply: do not load any SKILL.md.',\n    'Constraints: never load more than one skill up front; only load after selecting.',\n    '- When a skill drives external API writes, assume rate limits: prefer fewer larger writes, avoid tight one-item loops, serialize bursts when possible, and respect 429/Retry-After.',\n    '',\n    '**Division of labor with memory:** Skills = **procedural** workflows; memory / `curated_memory` = **declarative** facts and preferences.',\n  ].join('\\n');\n}\n"],"mappings":";AAEA,SAAgB,mBAAmB,QAKxB;AACT,KAAI,OAAO,yBAAyB,MAClC,QAAO;AAMT,KAAI,EAHF,OAAO,eAAe,IAAI,gBAAgB,IAC1C,OAAO,eAAe,IAAI,aAAa,IACvC,OAAO,eAAe,IAAI,iBAAiB,KACtB,CAAC,OAAO,iBAC7B,QAAO;CAGT,MAAM,gBAAgB,OAAO,iBAAiB;CAC9C,MAAM,sBACJ,kBAAkB,QACd,kFACA,kBAAkB,gBAChB,0EACA;CAER,MAAM,YAAsB,EAAE;AAC9B,KAAI,OAAO,eAAe,IAAI,gBAAgB,CAC5C,WAAU,KAAK,0EAA0E;AAE3F,KAAI,OAAO,eAAe,IAAI,iBAAiB,CAC7C,WAAU,KACR,GAAG,UAAU,SAAS,EAAE,yIACzB;AAEH,KAAI,OAAO,eAAe,IAAI,aAAa,CACzC,WAAU,KAAK,GAAG,UAAU,SAAS,EAAE,+DAA+D;AAExG,KAAI,OAAO,eAAe,IAAI,iBAAiB,CAC7C,WAAU,KACR,GAAG,UAAU,SAAS,EAAE,uFACzB;AAEH,WAAU,KAAK,GAAG,UAAU,SAAS,EAAE,mDAAmD;AAE1F,QAAO;EACL;EACA;EACA;EACA;EACA;EACA;EACA;EACA,GAAG;EACH;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACD,CAAC,KAAK,KAAK;;AAGd,SAAgB,2BAA2B,MAAkC;CAC3E,MAAM,IAAI,MAAM,MAAM;AACtB,KAAI,CAAC,EACH,QAAO;AAET,QAAO,kCAAkC;;AAG3C,SAAgB,mBAAmB,eAAgC;AACjE,KAAI,CAAC,cACH,QAAO;AAGT,QAAO;EACL;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACD,CAAC,KAAK,KAAK"}

package/dist/src/agent/prompt/service-prompt-builder.js

@@ -1,22 +1,14 @@
 import { resolveStateDir } from "../../config/paths-state.js";
-import { init_paths } from "../../config/paths.js";
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { DEFAULT_USER_FILENAME } from "../context/workspace.js";
+import { init_paths } from "../../config/paths.js";
 import { resolveSystemPromptBuildParams } from "./system-prompt-params.js";
 import { buildSystemPrompt } from "./system-prompt.js";
 import { createSkillConfigManager } from "../skills/config.js";
 import { buildTtsSystemPromptHint } from "../../voice/tts/directives.js";
 import { mergeTtsConfigFromAppConfig } from "../../voice/tts/merge-config.js";
 import { selectSkillsVisibleInPrompt } from "../skills/format-skills-prompt.js";
-import { existsSync, readFileSync } from "node:fs";
-import { join } from "node:path";
 //#region src/agent/prompt/service-prompt-builder.ts
-/**
-* System Prompt Builder - Builds the complete system prompt
-*
-* Combines base system prompt with skill prompts and bootstrap Project Context.
-*/
 init_paths();
 init_logger();
 const log = createLogger("SystemPromptBuilder");
@@ -31,7 +23,6 @@ var SystemPromptBuilder = class {
 	}
 	build(contextFiles, options) {
 		const ws = options.workspaceOverride ?? this.workspace;
-		const profilePathRoot = options.profileMarkdownPathRoot ?? ws;
 		if (options.systemPromptOverride?.trim()) {
 			const skillPrompt = options.skillPromptText !== void 0 ? options.skillPromptText : this.skillManager.getPromptForSkillAllowlist(options.skillAllowlist, options.registeredToolNames);
 			const trimmed = options.systemPromptOverride.trim();
@@ -54,7 +45,7 @@ var SystemPromptBuilder = class {
 			return fullPrompt;
 		}
 		const heartbeatEnabled = this.config.gateway?.heartbeat?.includeSystemPromptSection ?? false;
-		const userTimezone = this.extractTimezone(contextFiles, profilePathRoot);
+		const userTimezone = this.extractTimezone(contextFiles);
 		const ttsMerged = mergeTtsConfigFromAppConfig(this.config.messages?.tts);
 		const reg = options.registeredToolNames ?? [];
 		const ttsSystemHint = buildTtsSystemPromptHint({
@@ -117,17 +108,12 @@ var SystemPromptBuilder = class {
 		this.skillManager.reload();
 		return this.build(contextFiles, options);
 	}
-	extractTimezone(contextFiles, profilePathRoot) {
-		const userContext = contextFiles.find((file) => file.path.replace(/\\/g, "/").toLowerCase().endsWith("/user.md"));
+	extractTimezone(contextFiles) {
+		const userContext = contextFiles.find((file) => file.path.replace(/\\/g, "/").toLowerCase().endsWith("/user/profile.md"));
 		if (userContext?.content) {
 			const match = userContext.content.match(/Timezone:\s*(.+)/i);
 			if (match) return match[1].trim();
 		}
-		const primaryPath = join(profilePathRoot, DEFAULT_USER_FILENAME);
-		if (existsSync(primaryPath)) try {
-			const match = readFileSync(primaryPath, "utf-8").match(/Timezone:\s*(.+)/i);
-			if (match) return match[1].trim();
-		} catch {}
 	}
 	getSkillNamesForSkillsSection(options) {
 		const skillsConfig = createSkillConfigManager(resolveStateDir()).load();
@@ -141,12 +127,11 @@ var SystemPromptBuilder = class {
 	}
 	getBasePrompt(contextFiles, options) {
 		const ws = options?.workspaceOverride ?? this.workspace;
-		const profilePathRoot = options?.profileMarkdownPathRoot ?? ws;
 		const resolved = resolveSystemPromptBuildParams(this.config, {
 			workspaceDir: ws,
 			sessionKey: options?.sessionKey,
 			toolNames: options?.registeredToolNames,
-			userTimezone: this.extractTimezone(contextFiles, profilePathRoot),
+			userTimezone: this.extractTimezone(contextFiles),
 			externalMemoryInstructions: options?.externalMemoryInstructions,
 			heartbeatEnabled: this.config.gateway?.heartbeat?.includeSystemPromptSection ?? false
 		});