@xopcai/xopc 0.0.180 → 0.0.188

package/dist/packages/gateway-contract/src/tool-activity.js

@@ -0,0 +1,223 @@
+//#region packages/gateway-contract/src/tool-activity.ts
+const OTHER_ACTIVITY = {
+	category: "other",
+	action: "use",
+	source: "unknown",
+	sensitivity: "normal"
+};
+const TOOL_ACTIVITY_CATALOG = {
+	memory_search: {
+		category: "memory",
+		action: "search",
+		source: "memory",
+		sensitivity: "personal",
+		purpose: "personal_context"
+	},
+	memory_get: {
+		category: "memory",
+		action: "read",
+		source: "memory",
+		sensitivity: "personal",
+		purpose: "personal_context"
+	},
+	web_search: {
+		category: "web",
+		action: "search",
+		source: "internet",
+		sensitivity: "normal"
+	},
+	brave_search: {
+		category: "web",
+		action: "search",
+		source: "internet",
+		sensitivity: "normal"
+	},
+	image_query: {
+		category: "web",
+		action: "search",
+		source: "internet",
+		sensitivity: "normal"
+	},
+	web_fetch: {
+		category: "web",
+		action: "read",
+		source: "internet",
+		sensitivity: "normal"
+	},
+	fetch_url: {
+		category: "web",
+		action: "read",
+		source: "internet",
+		sensitivity: "normal"
+	},
+	open_url: {
+		category: "navigation",
+		action: "open",
+		source: "internet",
+		sensitivity: "normal"
+	},
+	browser_use: {
+		category: "navigation",
+		action: "open",
+		source: "internet",
+		sensitivity: "normal"
+	},
+	search_graph: {
+		category: "code",
+		action: "search",
+		source: "workspace",
+		sensitivity: "normal"
+	},
+	search_code: {
+		category: "code",
+		action: "search",
+		source: "workspace",
+		sensitivity: "normal"
+	},
+	query_graph: {
+		category: "code",
+		action: "search",
+		source: "workspace",
+		sensitivity: "normal"
+	},
+	trace_path: {
+		category: "code",
+		action: "search",
+		source: "workspace",
+		sensitivity: "normal"
+	},
+	get_architecture: {
+		category: "code",
+		action: "search",
+		source: "workspace",
+		sensitivity: "normal"
+	},
+	get_code_snippet: {
+		category: "file",
+		action: "read",
+		source: "workspace",
+		sensitivity: "normal"
+	},
+	grep: {
+		category: "code",
+		action: "search",
+		source: "workspace",
+		sensitivity: "normal"
+	},
+	glob: {
+		category: "code",
+		action: "search",
+		source: "workspace",
+		sensitivity: "normal"
+	},
+	find_files: {
+		category: "code",
+		action: "search",
+		source: "workspace",
+		sensitivity: "normal"
+	},
+	session_search: {
+		category: "other",
+		action: "search",
+		source: "runtime",
+		sensitivity: "normal"
+	},
+	search: {
+		category: "other",
+		action: "search",
+		source: "unknown",
+		sensitivity: "normal"
+	},
+	read_file: {
+		category: "file",
+		action: "read",
+		source: "workspace",
+		sensitivity: "normal"
+	},
+	"review.prepare_diff": {
+		category: "file",
+		action: "read",
+		source: "workspace",
+		sensitivity: "normal"
+	},
+	list_dir: {
+		category: "file",
+		action: "list",
+		source: "workspace",
+		sensitivity: "normal"
+	},
+	ls: {
+		category: "file",
+		action: "list",
+		source: "workspace",
+		sensitivity: "normal"
+	},
+	write_file: {
+		category: "file",
+		action: "write",
+		source: "workspace",
+		sensitivity: "normal"
+	},
+	apply_patch: {
+		category: "file",
+		action: "edit",
+		source: "workspace",
+		sensitivity: "normal"
+	},
+	exec_command: {
+		category: "command",
+		action: "execute",
+		source: "runtime",
+		sensitivity: "normal"
+	},
+	run_command: {
+		category: "command",
+		action: "execute",
+		source: "runtime",
+		sensitivity: "normal"
+	},
+	update_plan: {
+		category: "planning",
+		action: "plan",
+		source: "runtime",
+		sensitivity: "normal"
+	}
+};
+function toolActivityId(name) {
+	const normalized = name.trim().toLowerCase().replace(/-/g, "_");
+	const namespaced = normalized.split("__").at(-1) ?? normalized;
+	return namespaced.split(".").at(-1) ?? namespaced;
+}
+function resolveToolActivityDefinition(name) {
+	const normalized = name.trim().toLowerCase().replace(/-/g, "_");
+	return TOOL_ACTIVITY_CATALOG[normalized] ?? TOOL_ACTIVITY_CATALOG[toolActivityId(normalized)] ?? OTHER_ACTIVITY;
+}
+function asRecord(value) {
+	if (typeof value === "string") try {
+		return asRecord(JSON.parse(value));
+	} catch {
+		return null;
+	}
+	return value !== null && typeof value === "object" && !Array.isArray(value) ? value : null;
+}
+function resultCount(result) {
+	const record = asRecord(result);
+	const results = asRecord(record?.details)?.results ?? record?.results;
+	return Array.isArray(results) ? results.length : void 0;
+}
+function resultHasError(result) {
+	const record = asRecord(result);
+	return typeof (asRecord(record?.details)?.error ?? record?.error) === "string";
+}
+function resolveToolActivity(name, status, result) {
+	const definition = resolveToolActivityDefinition(name);
+	const count = resultCount(result);
+	const resolvedStatus = status === "completed" && resultHasError(result) ? "failed" : status === "completed" && count === 0 ? "empty" : status;
+	return {
+		...definition,
+		status: resolvedStatus,
+		...count === void 0 ? {} : { count }
+	};
+}
+//#endregion
+export { resolveToolActivity };

package/dist/src/activity/types.d.ts

@@ -1,4 +1,4 @@
-export type ActivityObjectKind = 'project' | 'note' | 'work_item' | 'session' | 'goal' | 'workflow_run' | 'automation';
+export type ActivityObjectKind = 'project' | 'note' | 'session' | 'task' | 'workflow_run' | 'automation';
 export type ActivityVisibility = 'timeline' | 'audit' | 'debug';
 export type ActivityImportance = 'low' | 'normal' | 'high';
 export type ActivityPrincipalKind = 'user' | 'agent' | 'system' | 'automation' | 'workflow';
@@ -8,7 +8,7 @@ export type ActivityScopeReason = 'explicit' | 'object_owner' | 'inherited_sessi
 export type ActivityRelatedProjectReason = 'object_link' | 'session_link' | 'derived_context';
 export type ObjectLinkRelation = 'belongs_to' | 'created_from' | 'discussed_in' | 'attached_to';
 export type ObjectLinkSource = 'user' | 'agent' | 'system';
-export type ActivityEventType = 'project.created' | 'project.updated' | 'project.status_changed' | 'project.workspace_changed' | 'note.created' | 'note.appended' | 'note.updated' | 'note.status_changed' | 'note.preview_generated' | 'work_item.created' | 'work_item.updated' | 'work_item.status_changed' | 'work_item.archived' | 'work_item.link_added' | 'session.attached_to_project' | 'session.detached_from_project' | 'session.renamed' | 'goal.created' | 'goal.status_changed' | 'workflow_run.started' | 'workflow_run.completed' | 'automation.run_started' | 'automation.run_completed' | 'work_discovery.started' | 'work_discovery.completed' | 'work_discovery.failed' | 'work_discovery.canceled' | 'work_discovery.suggestion_selected' | (string & {});
+export type ActivityEventType = 'project.created' | 'project.updated' | 'project.status_changed' | 'project.workspace_changed' | 'note.created' | 'note.appended' | 'note.updated' | 'note.status_changed' | 'note.preview_generated' | 'session.attached_to_project' | 'session.detached_from_project' | 'session.renamed' | 'task.created' | 'task.created.v2' | 'task.commanded.v2' | 'task.phase_changed.v2' | 'task.attention_required.v2' | 'workflow_run.started' | 'workflow_run.completed' | 'automation.run_started' | 'automation.run_completed' | 'work_discovery.started' | 'work_discovery.completed' | 'work_discovery.failed' | 'work_discovery.canceled' | 'work_discovery.suggestion_selected' | (string & {});
 export interface ActivityPrincipal {
     kind: ActivityPrincipalKind;
     id?: string;

package/dist/src/agent/agent-instance-gateway.d.ts

@@ -39,7 +39,7 @@ export interface AgentInstanceGateway {
     /** Last assistant text from the in-memory agent (empty when no agent / no assistant yet). */
     getLastAssistantContent(sessionKey: string): string | null;
     /** Build the bounded, policy-filtered context used for this model turn. */
-    prepareUserTurnContext(userMessage: AgentMessage, sessionKey: string): Promise<import('./memory/context/types.js').UserContextPlan>;
+    prepareUserTurnContext(userMessage: AgentMessage, sessionKey: string, turnId: string): Promise<import('./memory/context/types.js').UserContextPlan>;
     /** Post-turn: sync external memory providers, queue next prefetch. */
     afterAgentTurn(sessionKey: string, userPlainText: string): Promise<import('./memory/understanding/types.js').UnderstandingReviewResult | undefined>;
     /** Bump the per-session "turns since memory review" counter. */

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

@@ -18,7 +18,6 @@ import type { AutomationService } from '../automations/index.js';
 import type { SessionStore } from '../session/store.js';
 import type { NotesService } from '../notes/index.js';
 import type { ProjectService } from '../projects/index.js';
-import type { WorkItemService } from '../work-items/index.js';
 import type { SessionContext } from './session/session-context.js';
 import type { Skill, SkillDiagnostic, SkillMarkdownPreviewPayload, SkillRuntimeStatus } from './skills/types.js';
 import { type SkillHubLockEntry } from './skills/hub-lock.js';
@@ -90,8 +89,8 @@ export interface AgentManagerConfig {
     /** Gateway: exposes first-class xopc product objects for the `xopc_use` tool. */
     getNotesService?: () => NotesService | undefined;
     getProjectService?: () => ProjectService | undefined;
-    getWorkItemService?: () => WorkItemService | undefined;
     getLocalAppService?: () => import('../local-apps/index.js').LocalAppService | undefined;
+    dispatchTaskRuns?: () => void;
     /** Gateway: starts persisted workflow runs (dedicated chat session per run). */
     getWorkflowRunService?: () => import('../workflows/service/workflow-run-service.types.js').WorkflowRunServiceLike | undefined;
     /** Runtime notification for UI/CLI shells that cache skill catalogs. */
@@ -155,6 +154,7 @@ export declare class AgentManager implements AgentInstanceGateway {
     private pendingSkillsUpdatedReason;
     private projectTrustStore;
     constructor(config: AgentManagerConfig);
+    private isUserContextEnabledForSession;
     private computeBaseWorkspacePath;
     /**
      * Workspace root for inbound attachments / side effects for this session's agent id.
@@ -192,7 +192,7 @@ export declare class AgentManager implements AgentInstanceGateway {
     getMemoryManagerForSession(sessionKey: string): MemoryManager;
     markCodeIntelligenceDirty(sessionKey: string, paths: readonly string[]): void;
     /** Build the bounded, policy-filtered context used for this model turn. */
-    prepareUserTurnContext(userMessage: AgentMessage, sessionKey: string): Promise<UserContextPlan>;
+    prepareUserTurnContext(userMessage: AgentMessage, sessionKey: string, turnId: string): Promise<UserContextPlan>;
     /**
      * After a completed turn: sync external providers and queue next-turn prefetch.
      * Delegates to {@link UserContextCoordinator}.

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

@@ -1,35 +1,35 @@
 import { resolveStateDir } from "../config/paths-state.js";
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
+import { getSessionConfig } from "../storage/sqlite/config-repository.js";
+import "../storage/sqlite/index.js";
 import { getAgentDefaultModelRef, init_schema } from "../config/schema.js";
+import { applyConfigOverrides } from "../config/runtime-overrides.js";
 import { expandWorkspacePathString, init_workspace_path } from "../config/workspace-path.js";
 import { init_agent_scope, resolveAgentProfileDir } from "./agent-scope.js";
+import { resolveEffectiveAgentProfile, resolveEffectiveAgentProfileForSession } from "../config/agent-profile.js";
 import { init_paths, resolveBundledSkillsDir, resolveUserProfilePath } from "../config/paths.js";
-import { CredentialResolver, init_credentials } from "../auth/credentials.js";
 import { init_sync_provider_auth, resolveProviderApiKeySync } from "../auth/sync-provider-auth.js";
+import { CredentialResolver, init_credentials } from "../auth/credentials.js";
 import { getApiKeySync, getDefaultModelSync, init_providers, resolveModel } from "../providers/index.js";
 import { createExtensionAwareStreamFn } from "../providers/extension-stream-bridge.js";
-import { applyConfigOverrides } from "../config/runtime-overrides.js";
-import { resolveEffectiveAgentProfile, resolveEffectiveAgentProfileForSession } from "../config/agent-profile.js";
 import { extractTextContent } from "./context/workspace.js";
 import { buildExecutionScopeContextForPrompt } from "./context/execution-scope.js";
 import { clearBootstrapSnapshot } from "./bootstrap/bootstrap-cache.js";
 import { resolveBootstrapContextSync } from "./bootstrap/bootstrap-files.js";
 import { loadProjectAgentsContextFile } from "./bootstrap/project-agents-context.js";
+import { disposeAllSessionMcpRuntimes, retireSessionMcpRuntimeForSessionKey } from "./mcp/bundle-mcp-runtime.js";
 import { createSkillConfigManager, isSkillEnabled, resolveSkillConfig } from "./skills/config.js";
 import { isValidSkillEnvVarName } from "./skills/required-env-vars.js";
 import { resolveWorkspaceSkillsDir, resolveWorkspaceSkillsLockPath } from "./skills/workspace-skills-dir.js";
 import { loadSkillsLock } from "./skills/hub-lock.js";
 import { isUnderManagedSkillsDir } from "./skills/managed-store.js";
-import { isMemorySubsystemEnabled, shouldRegisterCuratedMemoryTool } from "./memory/memory-config.js";
-import { resolveDreamingRoot } from "./memory/dreaming/scope.js";
 import { createAgentCapabilitySessionState, resolveAgentCapabilityCatalog } from "./capabilities/registry.js";
 import "./capabilities/index.js";
 import { AgentToolsFactory } from "./tools/factory.js";
-import { parseMcpToolName } from "./mcp/bundle-mcp-policy.js";
-import { disposeAllSessionMcpRuntimes, retireSessionMcpRuntimeForSessionKey } from "./mcp/bundle-mcp-runtime.js";
 import "./mcp/bundle-mcp-tools.js";
 import { evictAllEmbeddedSessionRunners, evictEmbeddedSessionRunner } from "./embedded/session-runner.js";
+import { isMemorySubsystemEnabled } from "./memory/memory-config.js";
 import { UserContextCoordinator } from "./memory/user-context-coordinator.js";
 import { WorkspaceRuntimeRegistry } from "./workspace-runtime/registry.js";
 import { BackgroundReviewCoordinator } from "./background-review/coordinator.js";
@@ -124,7 +124,7 @@ var AgentManager = class {
 		});
 		this.userContext = new UserContextCoordinator({
 			getConfig: () => this.config.config,
-			isEnabledForSession: () => Boolean(this.config.config?.userContext.enabled && this.config.config.userContext.memory.mode !== "off"),
+			isEnabledForSession: (sessionKey) => this.isUserContextEnabledForSession(sessionKey),
 			getAgentIdForSession: (sk) => this.agents.get(sk)?.effectiveProfile.agentId ?? "main",
 			getMemoryManagerForSession: (sk) => this.getMemoryManagerForSession(sk),
 			getLastAssistantContent: (sk) => this.getLastAssistantContent(sk)
@@ -141,6 +141,9 @@ var AgentManager = class {
 			}, `Credential cache pre-warm failed: ${em}`);
 		});
 	}
+	isUserContextEnabledForSession(sessionKey) {
+		return Boolean(this.config.config?.userContext.enabled && this.config.config.userContext.memory.mode !== "off" && getSessionConfig(sessionKey)?.userContextMode !== "off");
+	}
 	computeBaseWorkspacePath() {
 		const cfg = this.config.config;
 		if (!cfg) return expandWorkspacePathString(this.config.workspace);
@@ -239,8 +242,8 @@ var AgentManager = class {
 			getBrowserRecipeService: this.config.getBrowserRecipeService,
 			getNotesService: this.config.getNotesService,
 			getProjectService: this.config.getProjectService,
-			getWorkItemService: this.config.getWorkItemService,
 			getLocalAppService: this.config.getLocalAppService,
+			dispatchTaskRuns: this.config.dispatchTaskRuns,
 			getWorkflowRunService: this.config.getWorkflowRunService,
 			getSkillIndexingContext: () => {
 				const ctx = this.config.getCurrentContext?.();
@@ -286,8 +289,8 @@ var AgentManager = class {
 		this.getWorkspaceRuntimeForSession(sessionKey).codeIntelligence.markDirty(paths);
 	}
 	/** Build the bounded, policy-filtered context used for this model turn. */
-	prepareUserTurnContext(userMessage, sessionKey) {
-		return this.userContext.prepare(userMessage, sessionKey);
+	prepareUserTurnContext(userMessage, sessionKey, turnId) {
+		return this.userContext.prepare(userMessage, sessionKey, turnId);
 	}
 	/**
 	* After a completed turn: sync external providers and queue next-turn prefetch.
@@ -301,7 +304,7 @@ var AgentManager = class {
 	* Delegates to {@link BackgroundReviewCoordinator}.
 	*/
 	beginBackgroundReviewUserTurn(sessionKey) {
-		if (!this.agents.get(sessionKey)) return;
+		if (!this.agents.get(sessionKey) || !this.isUserContextEnabledForSession(sessionKey)) return;
 		this.backgroundReview.beginUserTurn(sessionKey);
 	}
 	/**
@@ -310,7 +313,7 @@ var AgentManager = class {
 	*/
 	scheduleBackgroundReviewAfterUserTurn(sessionKey) {
 		const inst = this.agents.get(sessionKey);
-		if (!inst) return;
+		if (!inst || !this.isUserContextEnabledForSession(sessionKey)) return;
 		this.backgroundReview.scheduleAfterUserTurn({
 			sessionKey,
 			agent: inst.agent,
@@ -394,7 +397,7 @@ var AgentManager = class {
 			externalMemoryInstructions: rt.memoryManager.buildExternalSystemPrompt(),
 			workspaceOverride: resolvedWorkspacePath,
 			profileMarkdownPathRoot: resolveAgentProfileDir(cfg, instance.effectiveProfile.agentId),
-			systemPromptOverride: instance.effectiveProfile.systemPromptOverride,
+			customInstructions: instance.effectiveProfile.customInstructions,
 			skillAllowlist: instance.effectiveProfile.skillsAllowlist,
 			registeredToolNames,
 			sessionKey: instance.sessionKey,
@@ -527,7 +530,7 @@ var AgentManager = class {
 			loadedAt: rt.skillManager.getLoadedAt(),
 			diagnostics: rt.skillManager.getDiagnostics(),
 			status: rt.skillManager.getStatus(),
-			...entry?.skills.mode === "allowlist" ? { agentAllowlist: [...entry.skills.allow ?? []] } : {},
+			...entry?.skills?.mode === "allowlist" ? { agentAllowlist: [...entry.skills.allow ?? []] } : {},
 			...profile.skillsAllowlist !== void 0 ? { effectiveAllowlist: [...profile.skillsAllowlist] } : {},
 			skills
 		};
@@ -548,7 +551,7 @@ var AgentManager = class {
 				externalMemoryInstructions: rt.memoryManager.buildExternalSystemPrompt(),
 				workspaceOverride: resolvedWorkspacePath,
 				profileMarkdownPathRoot: resolveAgentProfileDir(cfg, instance.effectiveProfile.agentId),
-				systemPromptOverride: instance.effectiveProfile.systemPromptOverride,
+				customInstructions: instance.effectiveProfile.customInstructions,
 				skillAllowlist: instance.effectiveProfile.skillsAllowlist,
 				registeredToolNames: instance.registeredToolNames,
 				sessionKey: instance.sessionKey,
@@ -624,7 +627,7 @@ var AgentManager = class {
 				externalMemoryInstructions: rt.memoryManager.buildExternalSystemPrompt(),
 				workspaceOverride: resolvedWorkspacePath,
 				profileMarkdownPathRoot: resolveAgentProfileDir(cfg, instance.effectiveProfile.agentId),
-				systemPromptOverride: instance.effectiveProfile.systemPromptOverride,
+				customInstructions: instance.effectiveProfile.customInstructions,
 				skillAllowlist: instance.effectiveProfile.skillsAllowlist,
 				registeredToolNames: instance.registeredToolNames,
 				sessionKey: instance.sessionKey,
@@ -661,7 +664,6 @@ var AgentManager = class {
 			err,
 			sessionKey
 		}, "memory initializeAll failed"));
-		if (isMemorySubsystemEnabled(cfg) && shouldRegisterCuratedMemoryTool(cfg)) rt.builtinMemoryStore.loadFromDiskSync();
 		const activeProjectContext = buildExecutionScopeContextForPrompt(sessionKey);
 		const activeSelfVerifyContext = this.getSelfVerifyPromptContext(sessionKey, profile.agentId);
 		const profileModelRef = profile.primaryModelRef?.trim() || this.defaultModel;
@@ -765,7 +767,7 @@ var AgentManager = class {
 			externalMemoryInstructions: rt.memoryManager.buildExternalSystemPrompt(),
 			workspaceOverride: resolvedWorkspacePath,
 			profileMarkdownPathRoot: resolveAgentProfileDir(cfg, instance.effectiveProfile.agentId),
-			systemPromptOverride: instance.effectiveProfile.systemPromptOverride,
+			customInstructions: instance.effectiveProfile.customInstructions,
 			skillAllowlist: instance.effectiveProfile.skillsAllowlist,
 			registeredToolNames: instance.registeredToolNames,
 			sessionKey,
@@ -849,12 +851,10 @@ var AgentManager = class {
 		const model = this.resolveModelStringToModel(modelRef);
 		let agent;
 		const contextFiles = this.resolveContextFilesForSession(sessionKey, profile);
-		const dreamingRoot = resolveDreamingRoot();
 		const tools = this.toolsFactory.createAllTools({
 			workspace: resolvedWorkspacePath,
 			profileMarkdownRoot: resolveAgentProfileDir(this.config.config, profile.agentId),
 			agentId: profile.agentId,
-			dreamingRoot,
 			disabledTools: profile.tools.denied,
 			getPrimaryModel: () => agent?.state.model ?? model,
 			getMemoryManager: () => rt.memoryManager,
@@ -869,7 +869,7 @@ var AgentManager = class {
 					externalMemoryInstructions: rt.memoryManager.buildExternalSystemPrompt(),
 					workspaceOverride: resolvedWorkspacePath,
 					profileMarkdownPathRoot: resolveAgentProfileDir(this.config.config, profile.agentId),
-					systemPromptOverride: profile.systemPromptOverride,
+					customInstructions: profile.customInstructions,
 					skillAllowlist: profile.skillsAllowlist,
 					registeredToolNames,
 					sessionKey,
@@ -913,12 +913,7 @@ var AgentManager = class {
 					}
 				}
 				if (!this.config.hookRunner) return;
-				const parsed = parseMcpToolName(toolName);
-				const hookResult = await this.config.hookRunner.runBeforeToolCall(toolName, args ?? {}, {
-					sessionKey,
-					isMcpTool: parsed !== null,
-					mcpServerId: parsed?.serverId
-				});
+				const hookResult = await this.config.hookRunner.runBeforeToolCall(toolName, args ?? {}, { sessionKey });
 				if (!hookResult.allowed) return {
 					block: true,
 					reason: hookResult.reason ?? "Tool call blocked by policy hook."
@@ -944,7 +939,7 @@ var AgentManager = class {
 			externalMemoryInstructions: rt.memoryManager.buildExternalSystemPrompt(),
 			workspaceOverride: resolvedWorkspacePath,
 			profileMarkdownPathRoot: resolveAgentProfileDir(cfg, instance.effectiveProfile.agentId),
-			systemPromptOverride: instance.effectiveProfile.systemPromptOverride,
+			customInstructions: instance.effectiveProfile.customInstructions,
 			skillAllowlist: instance.effectiveProfile.skillsAllowlist,
 			registeredToolNames: instance.registeredToolNames,
 			sessionKey: instance.sessionKey,
@@ -984,7 +979,7 @@ var AgentManager = class {
 				externalMemoryInstructions: rt.memoryManager.buildExternalSystemPrompt(),
 				workspaceOverride: resolvedWorkspacePath,
 				profileMarkdownPathRoot: resolveAgentProfileDir(cfg, instance.effectiveProfile.agentId),
-				systemPromptOverride: instance.effectiveProfile.systemPromptOverride,
+				customInstructions: instance.effectiveProfile.customInstructions,
 				skillAllowlist: instance.effectiveProfile.skillsAllowlist,
 				registeredToolNames: instance.registeredToolNames,
 				sessionKey,

package/dist/src/agent/bootstrap/filter-bootstrap-files.js

@@ -1,6 +1,6 @@
 import { isCronSessionKey, isSubagentSessionKey } from "../../routing/session-key-utils.js";
-import { USER_PROFILE_FILENAME, init_paths } from "../../config/paths.js";
 import { init_session_key } from "../../routing/session-key.js";
+import { USER_PROFILE_FILENAME, init_paths } from "../../config/paths.js";
 import { DEFAULT_AGENTS_FILENAME, DEFAULT_IDENTITY_FILENAME, DEFAULT_SOUL_FILENAME, DEFAULT_TOOLS_FILENAME } from "../context/workspace.js";
 //#region src/agent/bootstrap/filter-bootstrap-files.ts
 init_paths();

package/dist/src/agent/child-agent-factory.d.ts

@@ -4,8 +4,6 @@ import type { Config } from '../config/schema.js';
 import type { MessageBus } from '../infra/bus/index.js';
 import type { AgentTool } from '@earendil-works/pi-agent-core';
 import type { ToolExecutorConfig } from './tools/executor.js';
-/** @deprecated Use buildSubagentSystemPrompt */
-export declare function buildChildSystemPrompt(goal: string, context?: string, workspace?: string): string;
 export interface BuildChildToolsOptions {
     workspace: string;
     bus: MessageBus;
@@ -31,6 +29,7 @@ export interface DelegateChildHandleOptions {
     workspace: string;
     goal: string;
     context?: string;
+    requesterSessionKey?: string;
     allowedToolNames: string[];
     maxIterations: number;
     model: Model<Api>;

package/dist/src/agent/child-agent-factory.js

@@ -6,20 +6,13 @@ import { createExtensionAwareStreamFn } from "../providers/extension-stream-brid
 import { extractTextContent } from "./context/workspace.js";
 import { resolveAgentTurnTimeoutMs, runAgentTurnWithTimeout } from "./orchestration/run-agent-turn-with-timeout.js";
 import { buildSubagentSystemPrompt } from "./prompt/subagent-context.js";
+import { resolveResponseLanguageForSession } from "./prompt/response-language.js";
 import { Agent } from "@earendil-works/pi-agent-core";
 //#region src/agent/child-agent-factory.ts
 init_sync_provider_auth();
 init_providers();
 init_logger();
 const log = createLogger("delegate-child");
-/** @deprecated Use buildSubagentSystemPrompt */
-function buildChildSystemPrompt(goal, context, workspace) {
-	return buildSubagentSystemPrompt({
-		goal,
-		context,
-		workspace
-	});
-}
 /**
 * Build an isolated tool factory (no extensions, no session memory hooks) and a child {@link Agent}.
 */
@@ -53,7 +46,8 @@ function createDelegateChildHandle(options) {
 				goal: options.goal,
 				context: options.context,
 				workspace: options.workspace,
-				toolNames: filteredTools.map((t) => t.name)
+				toolNames: filteredTools.map((t) => t.name),
+				responseLanguage: resolveResponseLanguageForSession(options.getConfig(), options.requesterSessionKey)
 			}),
 			model: options.model,
 			thinkingLevel: "low",
@@ -182,4 +176,4 @@ function createDelegateChildHandle(options) {
 	};
 }
 //#endregion
-export { buildChildSystemPrompt, createDelegateChildHandle };
+export { createDelegateChildHandle };

package/dist/src/agent/code-intelligence/binary.js

@@ -8,9 +8,9 @@ import { dirname, join, resolve } from "node:path";
 import { accessSync, chmodSync, constants, copyFileSync, createReadStream, createWriteStream, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { execFile } from "node:child_process";
 import { createHash, randomBytes } from "node:crypto";
+import { Readable } from "node:stream";
 import { promisify } from "node:util";
 import { pipeline } from "node:stream/promises";
-import { Readable } from "node:stream";
 import lockfile from "proper-lockfile";
 //#region src/agent/code-intelligence/binary.ts
 init_paths();

package/dist/src/agent/context/execution-scope.d.ts

@@ -1,12 +1,12 @@
 export type ExecutionObjective = {
-    kind: 'goal';
+    kind: 'task';
     id: string;
     title: string;
     objective: string;
     status: string;
     scopeBoundary?: string;
     acceptanceCriteria: string[];
-    deliverables: string[];
+    expectedOutputs: string[];
     nextAction?: string;
     blockedReason?: string;
 } | {

package/dist/src/agent/context/execution-scope.js

@@ -1,10 +1,9 @@
 import { isXopcDatabaseOpen } from "../../storage/sqlite/connection.js";
 import { getSessionMetadata } from "../../storage/sqlite/session-repository.js";
 import "../../storage/sqlite/index.js";
-import { GoalService } from "../../goals/goal-service.js";
-import { OutcomeRepository } from "../../work/outcome-repository.js";
-import "../../goals/index.js";
 import { sanitizeForPromptLiteral } from "../prompt/sanitize-for-prompt.js";
+import { TaskRepository } from "../../tasks/task-repository.js";
+import { TaskReadModelProjector } from "../../tasks/task-read-model-projector.js";
 import { buildActiveProjectContextForPrompt } from "./project-context.js";
 //#region src/agent/context/execution-scope.ts
 const MAX_OBJECTIVE_TEXT = 1200;
@@ -14,19 +13,19 @@ function bounded(value, max = MAX_OBJECTIVE_TEXT) {
 	if (!text) return void 0;
 	return text.length <= max ? text : `${text.slice(0, max - 1).trimEnd()}…`;
 }
-function goalObjective(goal) {
-	const contract = new OutcomeRepository().getContract(goal.outcomeId, goal.outcomeContractVersion);
+function taskObjective(sessionKey) {
+	const task = new TaskRepository().getBySession(sessionKey);
+	if (!task) return void 0;
+	const contract = task.contract;
 	return {
-		kind: "goal",
-		id: goal.id,
-		title: goal.title,
-		objective: contract?.objective.trim() || goal.title,
-		status: goal.status,
+		kind: "task",
+		id: task.id,
+		title: task.title,
+		objective: contract?.objective.trim() || task.title,
+		status: `${task.phase}/${new TaskReadModelProjector().project(task).operationalState}`,
 		scopeBoundary: bounded(contract?.constraints.join("\n")),
-		acceptanceCriteria: goal.checklist.slice(0, MAX_CRITERIA).map((item) => item.text),
-		deliverables: contract?.deliverables.slice(0, MAX_CRITERIA) ?? [],
-		nextAction: bounded(goal.nextAction),
-		blockedReason: bounded(goal.blockedReason)
+		acceptanceCriteria: contract?.acceptanceCriteria.slice(0, MAX_CRITERIA) ?? [],
+		expectedOutputs: contract?.expectedOutputs.slice(0, MAX_CRITERIA) ?? []
 	};
 }
 function workflowObjective(sessionKey) {
@@ -46,12 +45,10 @@ function workflowObjective(sessionKey) {
 }
 function resolveExecutionScope(sessionKey) {
 	if (!isXopcDatabaseOpen()) return { sessionKey };
-	const metadata = getSessionMetadata(sessionKey);
-	const activeGoal = new GoalService().getActiveForSession(sessionKey);
 	return {
 		sessionKey,
-		projectId: metadata?.projectId,
-		objective: activeGoal ? goalObjective(activeGoal) : workflowObjective(sessionKey)
+		projectId: getSessionMetadata(sessionKey)?.projectId,
+		objective: taskObjective(sessionKey) ?? workflowObjective(sessionKey)
 	};
 }
 function formatCurrentWorkForPrompt(scope) {
@@ -68,10 +65,10 @@ function formatCurrentWorkForPrompt(scope) {
 		"## Objective",
 		sanitizeForPromptLiteral(objective.objective)
 	];
-	if (objective.kind === "goal") {
+	if (objective.kind === "task") {
 		if (objective.scopeBoundary) lines.push("", "## Scope Boundary", sanitizeForPromptLiteral(objective.scopeBoundary));
 		if (objective.acceptanceCriteria.length > 0) lines.push("", "## Acceptance Criteria", ...objective.acceptanceCriteria.map((item) => `- ${sanitizeForPromptLiteral(item)}`));
-		if (objective.deliverables.length > 0) lines.push("", "## Deliverables", ...objective.deliverables.map((item) => `- ${sanitizeForPromptLiteral(item)}`));
+		if (objective.expectedOutputs.length > 0) lines.push("", "## Expected outputs", ...objective.expectedOutputs.map((item) => `- ${sanitizeForPromptLiteral(item)}`));
 		if (objective.nextAction) lines.push("", "Next action:", sanitizeForPromptLiteral(objective.nextAction));
 		if (objective.blockedReason) lines.push("", "Blocked reason:", sanitizeForPromptLiteral(objective.blockedReason));
 	}