@xopcai/xopc 0.0.180 → 0.0.187

package/dist/src/agent/messaging/command-handler.js

@@ -27,7 +27,6 @@ var CommandHandler = class {
 	compactSession;
 	btwQuery;
 	getSessionContextReport;
-	getPersistentGoalApisForCommand;
 	resetSession;
 	getWorkflowRunService;
 	constructor(handlerConfig) {
@@ -45,7 +44,6 @@ var CommandHandler = class {
 		this.compactSession = handlerConfig.compactSession;
 		this.btwQuery = handlerConfig.btwQuery;
 		this.getSessionContextReport = handlerConfig.getSessionContextReport;
-		this.getPersistentGoalApisForCommand = handlerConfig.getPersistentGoalApisForCommand;
 		this.resetSession = handlerConfig.resetSession;
 		this.getWorkflowRunService = handlerConfig.getWorkflowRunService;
 	}
@@ -141,12 +139,6 @@ var CommandHandler = class {
 			btwQuery: this.btwQuery,
 			emitEvent,
 			getSessionContextReport: this.getSessionContextReport,
-			persistentGoalApis: this.getPersistentGoalApisForCommand({
-				sessionKey: context.sessionKey,
-				channel: context.channel,
-				chatId: context.chatId,
-				inboundMetadata: context.inboundMetadata
-			}),
 			workflowRunService: this.getWorkflowRunService?.()
 		});
 	}

package/dist/src/agent/messaging/outbound-coordinator.d.ts

@@ -5,7 +5,7 @@
  * `AgentService`:
  *  - typing-on / typing-off lifecycle for channels that surface "is typing…"
  *  - final assistant response delivery (silence guard + hook + bus publish)
- *  - cross-cutting `webchat_turn_complete` hook + `/goal` post-turn
+ *  - cross-cutting `webchat_turn_complete` hook + task review
  *  - thin pass-through for extension `message_sending` / `message_sent` hooks
  *
  * The class is intentionally framework-agnostic: it pulls everything it needs
@@ -26,11 +26,7 @@ export interface OutboundCoordinatorConfig {
     getConfig: () => Config | undefined;
     /** Resolves the last visible assistant text for a session (in-memory + agent fallback). */
     getLastAssistantPlainText: (sessionKey: string) => string;
-    /**
-     * Run the `/goal` post-turn verdict for a completed user turn. Owned by
-     * `PersistentGoalService`; OutboundCoordinator only forwards.
-     */
-    runPersistentGoalPostTurn: (payload: SessionTurnCompletePayload) => Promise<void>;
+    reviewTaskTurn: (payload: SessionTurnCompletePayload) => Promise<void>;
 }
 export interface SessionTurnCompletePayload {
     sessionKey: string;
@@ -40,7 +36,7 @@ export interface SessionTurnCompletePayload {
     assistantPlainText: string;
     aborted: boolean;
     streamError?: string;
-    skipPersistentGoalPostTurn?: boolean;
+    skipTaskReview?: boolean;
     outboundMetadata?: Record<string, unknown>;
 }
 export declare class OutboundCoordinator {
@@ -49,7 +45,7 @@ export declare class OutboundCoordinator {
     private readonly streamManager;
     private readonly getConfig;
     private readonly getLastAssistantPlainText;
-    private readonly runPersistentGoalPostTurn;
+    private readonly reviewTaskTurn;
     constructor(config: OutboundCoordinatorConfig);
     /**
      * Build the typing indicator controller for an inbound message. Returns
@@ -64,12 +60,7 @@ export declare class OutboundCoordinator {
      * silence guard, and the extension `message_sending` hook.
      */
     sendFinalResponse(msg: InboundMessage, sessionContext: SessionContext): Promise<void>;
-    /**
-     * Post-turn hook + `/goal` checklist evaluation. Wired into both the bus-driven
-     * inbound finally block and the webchat direct-stream finally. The goal verdict
-     * itself lives in `PersistentGoalService`; we just trigger the extension hook
-     * here and delegate the `/goal` work.
-     */
+    /** Run extension completion hooks and independently review an attached Task. */
     emitSessionTurnComplete(payload: SessionTurnCompletePayload): Promise<void>;
     /** Extension hook pass-through (Gateway ChannelManager). */
     invokeOutboundMessageSending(to: string, content: string, channel: string): Promise<{

package/dist/src/agent/messaging/outbound-coordinator.js

@@ -11,14 +11,14 @@ var OutboundCoordinator = class {
 	streamManager;
 	getConfig;
 	getLastAssistantPlainText;
-	runPersistentGoalPostTurn;
+	reviewTaskTurn;
 	constructor(config) {
 		this.bus = config.bus;
 		this.hookHandler = config.hookHandler;
 		this.streamManager = config.streamManager;
 		this.getConfig = config.getConfig;
 		this.getLastAssistantPlainText = config.getLastAssistantPlainText;
-		this.runPersistentGoalPostTurn = config.runPersistentGoalPostTurn;
+		this.reviewTaskTurn = config.reviewTaskTurn;
 	}
 	/**
 	* Build the typing indicator controller for an inbound message. Returns
@@ -91,12 +91,7 @@ var OutboundCoordinator = class {
 			}
 		});
 	}
-	/**
-	* Post-turn hook + `/goal` checklist evaluation. Wired into both the bus-driven
-	* inbound finally block and the webchat direct-stream finally. The goal verdict
-	* itself lives in `PersistentGoalService`; we just trigger the extension hook
-	* here and delegate the `/goal` work.
-	*/
+	/** Run extension completion hooks and independently review an attached Task. */
 	async emitSessionTurnComplete(payload) {
 		await this.hookHandler.triggerWithSessionKey(payload.sessionKey, "webchat_turn_complete", {
 			sessionKey: payload.sessionKey,
@@ -107,7 +102,7 @@ var OutboundCoordinator = class {
 			aborted: payload.aborted,
 			...payload.streamError !== void 0 ? { streamError: payload.streamError } : {}
 		});
-		await this.runPersistentGoalPostTurn(payload);
+		await this.reviewTaskTurn(payload);
 	}
 	/** Extension hook pass-through (Gateway ChannelManager). */
 	invokeOutboundMessageSending(to, content, channel) {

package/dist/src/agent/middleware/index.d.ts

@@ -2,5 +2,5 @@
  * Agent middleware — request-scoped log context (`ContextMiddleware`) and
  * harness-style self-verify tracking (`SelfVerifyMiddleware`).
  */
-export { SelfVerifyMiddleware, type FileEditRecord, type SelfVerifyConfig, type SelfVerifyAgentKind, type SelfVerifyState, type VerificationOutcome, type VerificationRecord, } from './self-verify.js';
+export { SelfVerifyMiddleware, type FileEditRecord, type SelfVerifyConfig, type SelfVerifyAgentKind, type SelfVerifyState, type VerificationTask, type VerificationRecord, } from './self-verify.js';
 export { ContextMiddleware, type RequestContext } from './context.js';

package/dist/src/agent/middleware/self-verify.d.ts

@@ -24,7 +24,7 @@ export interface SelfVerifyConfig {
     /** Reset counters on successful verification (default: true) */
     resetOnVerification: boolean;
 }
-export interface VerificationOutcome {
+export interface VerificationTask {
     isError?: boolean;
     result?: unknown;
 }
@@ -58,7 +58,7 @@ export declare class SelfVerifyMiddleware {
      * Record a file edit operation
      */
     recordEdit(filePath: string, operation: 'write' | 'edit' | 'command', sessionKey?: string): void;
-    recordVerification(toolName: string, args?: unknown, outcome?: VerificationOutcome, sessionKey?: string): void;
+    recordVerification(toolName: string, args?: unknown, task?: VerificationTask, sessionKey?: string): void;
     getVerificationState(sessionKey?: string): SelfVerifyState;
     getPendingVerificationContext(sessionKey?: string, agentId?: string): string;
     private extractExecCommand;

package/dist/src/agent/middleware/self-verify.js

@@ -67,13 +67,13 @@ var SelfVerifyMiddleware = class {
 			operation
 		}, "File edit recorded");
 	}
-	recordVerification(toolName, args, outcome, sessionKey) {
+	recordVerification(toolName, args, task, sessionKey) {
 		const state = this.getState(sessionKey);
 		const name = toolName.toLowerCase();
 		if (name === "exec_command") {
-			const command = this.extractExecCommand(args, outcome?.result);
-			const success = this.isSuccessfulExecVerification(outcome);
-			const details = this.extractResultDetails(outcome?.result);
+			const command = this.extractExecCommand(args, task?.result);
+			const success = this.isSuccessfulExecVerification(task);
+			const details = this.extractResultDetails(task?.result);
 			if (success && this.isDiffReviewCommand(command)) {
 				state.diffReviewed = true;
 				return;
@@ -139,9 +139,9 @@ var SelfVerifyMiddleware = class {
 		const details = result.details;
 		return details && typeof details === "object" ? details : null;
 	}
-	isSuccessfulExecVerification(outcome) {
-		if (!outcome || outcome.isError) return false;
-		const details = this.extractResultDetails(outcome.result);
+	isSuccessfulExecVerification(task) {
+		if (!task || task.isError) return false;
+		const details = this.extractResultDetails(task.result);
 		if (!details) return false;
 		if (details.timedOut === true) return false;
 		if (details.status === "success") return true;

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

@@ -1,19 +1,21 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
 import "../memory/dreaming/constants.js";
-import { resolveDreamingAgentScope } from "../memory/dreaming/scope.js";
 import { persistInboundAttachments } from "../../channels/attachments/inbound-persist.js";
 import { buildTranscriptUserMessage, clearPendingTranscriptUserMessage, hydrateUserTurnForLlm, setPendingTranscriptUserMessage } from "../inbound/attachment-pipeline.js";
 import { extractAgentUserPlainText } from "../memory/user-message-text.js";
 import { resolveEffectiveThinkingLevel } from "../../session/thinking-resolve.js";
 import { abortEmbeddedRun } from "../embedded/runs.js";
 import { runEmbeddedTurnForSession } from "../embedded/run-for-session.js";
-import { runDreamingDeepPromotion } from "../memory/dreaming/deep-promotion.js";
-import { appendDreamingEvent } from "../memory/dreaming/events.js";
-import { runLightSweep } from "../memory/dreaming/light-sweep.js";
-import { runRemPatterns } from "../memory/dreaming/rem-patterns.js";
+import { runDreamingPhase } from "../memory/dreaming/runner.js";
+import { randomUUID } from "node:crypto";
 //#region src/agent/orchestration/agent-orchestrator.ts
+/**
+* Agent Orchestrator - Coordinates Agent execution flow
+*
+* Manages the complete agent execution pipeline from message processing
+* to response generation.
+*/
 init_logger();
 const log = createLogger("AgentOrchestrator");
 var AgentOrchestrator = class {
@@ -58,65 +60,11 @@ var AgentOrchestrator = class {
 					log.warn({ sessionKey }, "Dreaming sweep skipped: config unavailable");
 					return;
 				}
-				const scope = resolveDreamingAgentScope(cfg, resolveEffectiveAgentProfileForSession(cfg, sessionKey).agentId);
-				const resolved = scope.config;
-				const t0 = Date.now();
-				if (content.includes("__xopc_memory_dreaming_light_sweep__")) {
-					const result = await runLightSweep({
-						workspaceDir: scope.workspaceDir,
-						dreamingRoot: scope.memoriesDir,
-						config: resolved.phases.light
-					});
-					const event = {
-						timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-						phase: "light",
-						ok: result.ok,
-						reason: result.reason,
-						durationMs: Date.now() - t0,
-						scannedEntries: result.scannedEntries,
-						newSignals: result.newSignals,
-						deduped: result.deduped
-					};
-					await appendDreamingEvent(scope.memoriesDir, event);
-				} else if (content.includes("__xopc_memory_dreaming_rem_sweep__")) {
-					const result = await runRemPatterns({
-						agentId: scope.agentId,
-						workspaceDir: scope.workspaceDir,
-						dreamingRoot: scope.memoriesDir,
-						config: resolved.phases.rem,
-						sensitiveWritePolicy: cfg.userContext.privacy.sensitiveWritePolicy,
-						promotionWritePolicy: resolved.promotionWritePolicy.decision
-					});
-					const event = {
-						timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-						phase: "rem",
-						ok: result.ok,
-						reason: result.reason,
-						durationMs: Date.now() - t0,
-						patternsDiscovered: result.patternsDiscovered,
-						entriesAnalyzed: result.entriesAnalyzed
-					};
-					await appendDreamingEvent(scope.memoriesDir, event);
-				} else {
-					const result = await runDreamingDeepPromotion({
-						agentId: scope.agentId,
-						workspaceDir: scope.workspaceDir,
-						dreamingRoot: scope.memoriesDir,
-						config: resolved.phases.deep,
-						sensitiveWritePolicy: cfg.userContext.privacy.sensitiveWritePolicy,
-						memoryManager: this.agentManager.getMemoryManagerForSession(sessionKey)
-					});
-					const event = {
-						timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-						phase: "deep",
-						ok: result.ok,
-						reason: result.reason,
-						durationMs: Date.now() - t0,
-						candidates: result.candidates,
-						applied: result.applied
-					};
-					await appendDreamingEvent(scope.memoriesDir, event);
-				}
+				await runDreamingPhase({
+					config: cfg,
+					phase: content.includes("__xopc_memory_dreaming_light_sweep__") ? "light" : content.includes("__xopc_memory_dreaming_rem_sweep__") ? "rem" : "deep",
+					triggerKind: "schedule"
+				});
 				return;
 			}
 		}
@@ -142,7 +90,8 @@ var AgentOrchestrator = class {
 			});
 			setPendingTranscriptUserMessage(sessionKey, userMessage);
 			const userPlainForMemory = extractAgentUserPlainText(userMessage);
-			const userMessageForModel = (await this.agentManager.prepareUserTurnContext(userMessage, sessionKey)).modelMessage;
+			const turnId = randomUUID();
+			const userMessageForModel = (await this.agentManager.prepareUserTurnContext(userMessage, sessionKey, turnId)).modelMessage;
 			const llmTurn = await hydrateUserTurnForLlm({
 				message: userMessage,
 				modelRef
@@ -152,6 +101,7 @@ var AgentOrchestrator = class {
 				try {
 					return await runEmbeddedTurnForSession({
 						sessionKey,
+						runId: turnId,
 						userMessage: userMessageForModel,
 						llmImages: llmTurn.images,
 						sessionStore: this.sessionStore,

package/dist/src/agent/prompt/response-language.d.ts

@@ -0,0 +1,3 @@
+import type { Config } from '../../config/schema.js';
+import { type ResponseLanguage } from '../../i18n/response-language.js';
+export declare function resolveResponseLanguageForSession(config: Config | undefined, sessionKey?: string): ResponseLanguage;

package/dist/src/agent/prompt/response-language.js

@@ -0,0 +1,11 @@
+import { isXopcDatabaseOpen } from "../../storage/sqlite/connection.js";
+import { getSessionConfig } from "../../storage/sqlite/config-repository.js";
+import "../../storage/sqlite/index.js";
+import { init_response_language, resolveResponseLanguage } from "../../i18n/response-language.js";
+//#region src/agent/prompt/response-language.ts
+init_response_language();
+function resolveResponseLanguageForSession(config, sessionKey) {
+	return resolveResponseLanguage(config?.userContext?.preferences?.responseLanguage ?? "auto", sessionKey && isXopcDatabaseOpen() ? getSessionConfig(sessionKey)?.responseLanguage : void 0);
+}
+//#endregion
+export { resolveResponseLanguageForSession };

package/dist/src/agent/prompt/sections/behavior.js

@@ -39,7 +39,7 @@ function buildAestheticSection() {
 function buildHumanCollaborationSection() {
 	return [
 		"## Human Collaboration",
-		"- Understand both the requested outcome and the human state around it. Decide whether the user primarily needs action, clarity, reassurance, or space to think.",
+		"- Understand both the requested task and the human state around it. Decide whether the user primarily needs action, clarity, reassurance, or space to think.",
 		"- When emotion is materially present, acknowledge it briefly and specifically. Do not perform empathy, exaggerate intimacy, diagnose the user, or repeat their feelings back mechanically.",
 		"- Preserve agency: reduce overwhelm, offer one clear next step, and let the user choose when a meaningful choice remains.",
 		"- Adapt to known communication preferences from user profile and memory. If they are unknown, be warm, calm, direct, and practical.",
@@ -47,7 +47,7 @@ function buildHumanCollaborationSection() {
 		"- Treat transient moods as current context, not durable identity. Remember stable support or communication preferences only when evidence and memory policy allow it.",
 		"",
 		"### Task Contract",
-		"- For non-trivial actionable work, privately establish: desired outcome, completion criteria, constraints, plan, and verification evidence.",
+		"- For non-trivial actionable work, privately establish: desired task, completion criteria, constraints, plan, and verification evidence.",
 		"- Keep implementation concepts such as agents, workflows, tools, and memory providers behind the experience unless naming them helps the user decide or debug.",
 		"- Communicate task state in human terms: working, needs a decision, blocked, or done.",
 		"- Do not claim completion from fluent output alone. Completion requires the requested result plus proportionate verification, or an explicit unresolved blocker."

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

@@ -1,21 +1,20 @@
 //#region src/agent/prompt/sections/memory-skills.ts
 function buildMemorySection(params) {
 	if (params.includeMemorySection === false) return "";
-	if (!(params.availableTools.has("memory_search") || params.availableTools.has("memory_get") || params.availableTools.has("curated_memory")) && !params.hasProfileMemory) return "";
+	if (!(params.availableTools.has("memory_search") || params.availableTools.has("memory_get")) && !params.hasProfileMemory) return "";
 	const citationsMode = params.citationsMode ?? "on";
-	const citationInstruction = citationsMode === "off" ? "Citations are disabled: do not mention file paths or line numbers in replies." : citationsMode === "source-only" ? "Citations: mention file path when it helps (e.g., Source: MEMORY.md)." : "Citations: include Source: <path#line> when it helps the user verify memory snippets.";
+	const citationInstruction = citationsMode === "off" ? "Citations are disabled: do not mention file paths or line numbers in replies." : citationsMode === "source-only" ? "Citations: mention the memory record id when it helps." : "Citations: include the memory record id when it helps the user verify recalled context.";
 	const toolLines = [];
-	if (params.availableTools.has("memory_search")) toolLines.push("1. Run `memory_search` to search indexed profile and curated memory sources");
+	if (params.availableTools.has("memory_search")) toolLines.push("1. Run `memory_search` to search structured user-understanding records");
 	if (params.availableTools.has("session_search")) toolLines.push(`${toolLines.length + 1}. For **other chat sessions** / cross-session history, use \`session_search\` with keywords (or omit \`query\` to list recent sessions)`);
-	if (params.availableTools.has("memory_get")) toolLines.push(`${toolLines.length + 1}. Use \`memory_get\` only for paths returned by \`memory_search\``);
-	if (params.availableTools.has("curated_memory")) toolLines.push(`${toolLines.length + 1}. For durable facts, preferences, and user-approved notes, use \`curated_memory\``);
+	if (params.availableTools.has("memory_get")) toolLines.push(`${toolLines.length + 1}. Use \`memory_get\` only for record ids returned by \`memory_search\``);
 	toolLines.push(`${toolLines.length + 1}. If low confidence after search, say you checked`);
 	return [
 		"## Memory Recall",
 		"",
 		citationInstruction,
 		"",
-		"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.",
+		"User understanding is compiled from structured records and injected above when relevant.",
 		"",
 		"Before answering anything about prior work, decisions, dates, people, preferences, or todos:",
 		...toolLines,
@@ -23,15 +22,13 @@ function buildMemorySection(params) {
 		"### Memory Sources",
 		"",
 		"- **Session history:** use `session_search` when available for other chats and prior turns.",
-		"- **Profile memory:** injected `MEMORY.md` content may appear in Project Context when present.",
-		"- **Indexed memory:** cite only paths and line numbers returned by `memory_search` / `memory_get`.",
-		"- **Curated memory:** use `curated_memory` for live read/write of durable facts and preferences.",
+		"- **Structured memory:** cite only record ids returned by `memory_search` / `memory_get`.",
 		"",
 		"### Writing to Memory",
 		"",
-		"- **Declarative vs procedural:** Save facts and preferences with `curated_memory`. Save reusable task playbooks with `skill_manage` as skills.",
-		"- When someone says \"remember this\" → use `curated_memory` when available; otherwise explain that durable memory is not writable from this turn.",
-		"- Do not invent, cite, or promise memory file paths that were not returned by a memory tool.",
+		"- **Declarative vs procedural:** facts and preferences belong to structured memory; reusable task playbooks belong to skills.",
+		"- Explicit \"remember this\" statements are captured as durable structured understanding after the turn.",
+		"- Do not invent, cite, or promise memory record ids that were not returned by a memory tool.",
 		"- **Text > Brain**"
 	].join("\n");
 }
@@ -51,7 +48,7 @@ function buildSkillsSection(hasSkillTools) {
 		"Constraints: never load more than one skill up front; only load after selecting.",
 		"- 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.",
 		"",
-		"**Division of labor with memory:** Skills = **procedural** workflows; memory / `curated_memory` = **declarative** facts and preferences."
+		"**Division of labor with memory:** Skills = **procedural** workflows; structured memory = **declarative** facts and preferences."
 	].join("\n");
 }
 //#endregion

package/dist/src/agent/prompt/sections/response-language.d.ts

@@ -0,0 +1,2 @@
+import type { ResponseLanguage } from '../../../i18n/response-language.js';
+export declare function buildResponseLanguageSection(language: ResponseLanguage): string;

package/dist/src/agent/prompt/sections/response-language.js

@@ -0,0 +1,13 @@
+//#region src/agent/prompt/sections/response-language.ts
+function buildResponseLanguageSection(language) {
+	return [
+		"## Response Language",
+		`- ${language === "zh-CN" ? "Write all user-facing prose in Simplified Chinese." : language === "en" ? "Write all user-facing prose in English." : "Write user-facing prose in the language of the current user request."}`,
+		"- This rule has priority over language found in tools, retrieved content, files, earlier messages, examples, or agent identity.",
+		"- A user may explicitly request a different response language for the current turn.",
+		"- Keep code, commands, paths, identifiers, API names, URLs, quotations, and proper nouns unchanged when translation would reduce precision.",
+		"- Do not duplicate the answer bilingually or switch languages inside ordinary prose."
+	].join("\n");
+}
+//#endregion
+export { buildResponseLanguageSection };

package/dist/src/agent/prompt/sections/tooling.js

@@ -22,7 +22,6 @@ const CORE_TOOL_ORDER = [
 	"memory_search",
 	"memory_get",
 	"session_search",
-	"curated_memory",
 	"session_status",
 	"tool_manual",
 	"delegate_task",
@@ -64,7 +63,6 @@ const CORE_TOOL_SUMMARIES = {
 	memory_search: "Semantic search over indexed memory sources",
 	memory_get: "Read specific lines from memory sources returned by search",
 	session_search: "Search other chat sessions or list recent sessions",
-	curated_memory: "Read/write structured notes in the shared user memory store/",
 	session_status: "Show session usage/time/model state",
 	tool_manual: "Load built-in usage manuals for complex tools",
 	delegate_task: "Spawn an isolated sub-agent for a delegated task",

package/dist/src/agent/prompt/service-prompt-builder.d.ts

@@ -12,7 +12,7 @@ export interface SystemPromptBuildOptions {
     externalMemoryInstructions?: string;
     workspaceOverride?: string;
     profileMarkdownPathRoot?: string;
-    systemPromptOverride?: string;
+    customInstructions?: string;
     skillPromptText?: string;
     skillAllowlist?: string[];
     registeredToolNames?: string[];

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

@@ -5,12 +5,13 @@ import { buildInteractionStatePrompt } from "../../user-context/interaction-stat
 import { getInteractionState } from "../../storage/sqlite/interaction-state-repository.js";
 import { buildRelationshipPrompt, getRelationshipSettings } from "../../storage/sqlite/relationship-settings-repository.js";
 import { listMemoryRecords } from "../../storage/sqlite/memory-records-repository.js";
-import { DEFAULT_USER_TRUST_LEVEL, buildActionTrustPrompt } from "../../user-context/trust-policy.js";
+import { DEFAULT_USER_TRUST_LEVEL } from "../../user-context/trust-policy.js";
 import { getUserTrustPolicy } from "../../storage/sqlite/user-trust-repository.js";
 import "../../storage/sqlite/index.js";
 import { init_session_key, parseSessionKey } from "../../routing/session-key.js";
 import { resolveSystemPromptBuildParams } from "./system-prompt-params.js";
 import { buildSystemPrompt } from "./system-prompt.js";
+import { resolveResponseLanguageForSession } from "./response-language.js";
 import { buildTtsSystemPromptHint } from "../../voice/tts/directives.js";
 import { mergeTtsConfigFromAppConfig } from "../../voice/tts/merge-config.js";
 import { buildPersonalPlaybookPrompt } from "../../user-context/personal-playbook.js";
@@ -44,33 +45,6 @@ var SystemPromptBuilder = class {
 		}) : "";
 		const continuityPrompt = buildRelationshipContinuityPrompt(activeMemories);
 		const interactionPrompt = interactionState ? buildInteractionStatePrompt(interactionState) : "";
-		if (options.systemPromptOverride?.trim()) {
-			const skillPrompt = options.skillPromptText !== void 0 ? options.skillPromptText : this.skillManager.getPromptForSkillAllowlist(options.skillAllowlist, options.registeredToolNames);
-			const trimmed = options.systemPromptOverride.trim();
-			let fullPrompt = skillPrompt.trim() ? `${trimmed}\n\n${skillPrompt}` : trimmed;
-			const ttsMerged = mergeTtsConfigFromAppConfig(this.config.messages?.tts);
-			const reg = options.registeredToolNames ?? [];
-			const ttsHint = buildTtsSystemPromptHint({
-				enabled: ttsMerged.enabled,
-				trigger: ttsMerged.trigger,
-				maxTextLength: ttsMerged.maxTextLength,
-				modelOverrides: ttsMerged.modelOverrides,
-				textToSpeechTool: ttsMerged.enabled && reg.includes("text_to_speech")
-			});
-			if (ttsHint?.trim()) fullPrompt = `${fullPrompt}\n\n## Voice (TTS)\n\n${ttsHint.trim()}`;
-			fullPrompt = `${fullPrompt}\n\n${buildActionTrustPrompt(actionTrustLevel)}`;
-			if (relationshipPrompt) fullPrompt = `${fullPrompt}\n\n${relationshipPrompt}`;
-			if (playbookPrompt) fullPrompt = `${fullPrompt}\n\n${playbookPrompt}`;
-			if (interactionPrompt) fullPrompt = `${fullPrompt}\n\n${interactionPrompt}`;
-			if (continuityPrompt) fullPrompt = `${fullPrompt}\n\n${continuityPrompt}`;
-			if (options.activeProjectContext?.trim()) fullPrompt = `${fullPrompt}\n\n${options.activeProjectContext.trim()}`;
-			log.debug({
-				baseLength: trimmed.length,
-				skillLength: skillPrompt.length,
-				totalLength: fullPrompt.length
-			}, "System prompt built (override)");
-			return fullPrompt;
-		}
 		const heartbeatEnabled = this.config.gateway?.heartbeat?.includeSystemPromptSection ?? false;
 		const userTimezone = this.extractTimezone(contextFiles);
 		const ttsMerged = mergeTtsConfigFromAppConfig(this.config.messages?.tts);
@@ -82,6 +56,7 @@ var SystemPromptBuilder = class {
 			modelOverrides: ttsMerged.modelOverrides,
 			textToSpeechTool: ttsMerged.enabled && reg.includes("text_to_speech")
 		});
+		const responseLanguage = resolveResponseLanguageForSession(this.config, options.sessionKey);
 		const resolved = resolveSystemPromptBuildParams(this.config, {
 			workspaceDir: ws,
 			sessionKey: options.sessionKey,
@@ -127,7 +102,9 @@ var SystemPromptBuilder = class {
 			promptContribution: resolved.promptContribution,
 			includeProblemSolving: resolved.includeProblemSolving,
 			includeToneSection: resolved.includeToneSection,
-			actionTrustLevel
+			actionTrustLevel,
+			responseLanguage,
+			customInstructions: options.customInstructions
 		});
 		const skillPrompt = options.skillPromptText !== void 0 ? options.skillPromptText : this.skillManager.getPromptForSkillAllowlist(options.skillAllowlist, options.registeredToolNames);
 		const fullPrompt = skillPrompt ? `${basePrompt}\n\n${skillPrompt}` : basePrompt;

package/dist/src/agent/prompt/subagent-context.d.ts

@@ -1,3 +1,4 @@
+import type { ResponseLanguage } from '../../i18n/response-language.js';
 export declare function buildSubagentContextSection(params: {
     goal: string;
     context?: string;
@@ -12,4 +13,5 @@ export declare function buildSubagentSystemPrompt(params: {
     requesterSessionKey?: string;
     childSessionKey?: string;
     toolNames?: string[];
+    responseLanguage?: ResponseLanguage;
 }): string;

package/dist/src/agent/prompt/subagent-context.js

@@ -59,6 +59,7 @@ function buildSubagentSystemPrompt(params) {
 	return buildSystemPrompt(params.workspace ?? ".", {
 		promptMode: "minimal",
 		toolNames: params.toolNames,
+		responseLanguage: params.responseLanguage,
 		extraSystemPrompt: extra
 	});
 }

package/dist/src/agent/prompt/system-prompt.d.ts

@@ -6,6 +6,7 @@
  * not to manually reread startup files.
  */
 import type { EmbeddedContextFile } from '../bootstrap/types.js';
+import type { ResponseLanguage } from '../../i18n/response-language.js';
 import { type UserTrustLevel } from '../../user-context/trust-policy.js';
 import type { ProviderSystemPromptContribution } from './contribution.js';
 import { type RuntimeInfoInput } from './sections/workspace-runtime.js';
@@ -37,6 +38,8 @@ export interface SystemPromptOptions {
     includeProblemSolving?: boolean;
     includeToneSection?: boolean;
     actionTrustLevel?: UserTrustLevel;
+    responseLanguage?: ResponseLanguage;
+    customInstructions?: string;
 }
 /**
  * Build system prompt with bootstrap Project Context integration.

package/dist/src/agent/prompt/system-prompt.js

@@ -6,6 +6,7 @@ import { buildHeartbeatBehaviorSection, buildMessagingSection, buildOutputDirect
 import { buildProjectContextSection, getContextFileBasename, isDynamicContextFile, sortContextFilesForPrompt } from "./sections/project-context.js";
 import { buildToolingSection, hasSkillsTools } from "./sections/tooling.js";
 import { buildRuntimeSection, buildWorkspaceFilesIntroSection, buildWorkspaceSection } from "./sections/workspace-runtime.js";
+import { buildResponseLanguageSection } from "./sections/response-language.js";
 import { buildOverridablePromptSection } from "./system-prompt-params.js";
 //#region src/agent/prompt/system-prompt.ts
 function joinSections(sections) {
@@ -15,8 +16,13 @@ function joinSections(sections) {
 * Build system prompt with bootstrap Project Context integration.
 */
 function buildSystemPrompt(workspaceDir, options = {}) {
-	const { contextFiles = [], promptMode = "full", heartbeatEnabled = false, heartbeatPrompt, toolNames: toolNamesOption, toolSummaries, availableTools = [], memoryCitationsMode = "on", includeMemorySection, userTimezone, runtime, agentId, channels = [], externalMemoryInstructions, ttsSystemHint, extraSystemPrompt, activeProjectContext, silentReplyPromptMode = "generic", promptContribution, includeProblemSolving = true, includeToneSection = true, actionTrustLevel } = options;
-	if (promptMode === "none") return joinSections(["You are a personal AI assistant running inside xopc.", activeProjectContext]);
+	const { contextFiles = [], promptMode = "full", heartbeatEnabled = false, heartbeatPrompt, toolNames: toolNamesOption, toolSummaries, availableTools = [], memoryCitationsMode = "on", includeMemorySection, userTimezone, runtime, agentId, channels = [], externalMemoryInstructions, ttsSystemHint, extraSystemPrompt, activeProjectContext, silentReplyPromptMode = "generic", promptContribution, includeProblemSolving = true, includeToneSection = true, actionTrustLevel, responseLanguage = "auto", customInstructions } = options;
+	if (promptMode === "none") return joinSections([
+		"You are a personal AI assistant running inside xopc.",
+		customInstructions?.trim() ? `<custom_instructions>\n${customInstructions.trim()}\n</custom_instructions>` : void 0,
+		buildResponseLanguageSection(responseLanguage),
+		activeProjectContext
+	]);
 	const isMinimal = promptMode === "minimal";
 	const toolNames = toolNamesOption ?? availableTools;
 	const normalizedTools = new Set(toolNames.map((tool) => tool.toLowerCase()));
@@ -28,6 +34,8 @@ function buildSystemPrompt(workspaceDir, options = {}) {
 	const hasProfileMemory = orderedContextFiles.some((file) => getContextFileBasename(file.path) === "memory.md");
 	const stableSections = [
 		"You are a personal AI assistant running inside xopc.",
+		...customInstructions?.trim() ? [`<custom_instructions>\n${customInstructions.trim()}\n</custom_instructions>`] : [],
+		buildResponseLanguageSection(responseLanguage),
 		buildToolingSection({
 			toolNames,
 			toolSummaries

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

@@ -21,7 +21,7 @@ export interface HydratePerTurnStateDeps {
 }
 /** Workspace + model + thinking level — common prep before any direct turn. */
 export declare function hydratePerTurnState(deps: HydratePerTurnStateDeps, sessionKey: string, thinking?: string): Promise<void>;
-export interface SlashCommandOutcome {
+export interface SlashCommandTask {
     /** True if the input parsed as a registered slash command (handled or not). */
     matched: boolean;
     /** Aggregated user-visible reply text (assistant view). */
@@ -52,7 +52,7 @@ export declare function tryRunSlashCommand(deps: TryRunSlashCommandDeps, ctx: {
 }, content: string, options?: {
     skipResetCommands?: boolean;
     emitEvent?: (event: CommandStreamEvent) => void | Promise<void>;
-}): Promise<SlashCommandOutcome>;
+}): Promise<SlashCommandTask>;
 export interface RunDirectAgentTurnDeps {
     sessionStore: SessionStore;
     agentManager: AgentInstanceGateway;