@xopcai/xopc 0.0.179 → 0.0.187

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

@@ -1,6 +1,8 @@
 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";
@@ -21,8 +23,6 @@ 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";
@@ -30,6 +30,7 @@ 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";
@@ -117,13 +118,14 @@ var AgentManager = class {
 		this.workspaceRuntimes = new WorkspaceRuntimeRegistry({
 			getConfig: () => this.config.config,
 			bundledSkillsDir: resolveBundledSkillsDir(),
+			isWorkspaceTrusted: (resolvedPath) => this.isProjectWorkspaceTrusted(resolvedPath),
 			onRuntimeCreated: (resolvedPath) => {
 				this.skillFilesystemWatcher.watchWorkspace(resolvedPath);
 			}
 		});
 		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)
@@ -140,6 +142,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);
@@ -224,6 +229,11 @@ var AgentManager = class {
 			getCurrentContext: this.config.getCurrentContext,
 			hookRunner: this.config.hookRunner,
 			bus: this.config.bus,
+			toolExecutorConfig: { resolveTimeoutMs: (toolName) => {
+				const config = this.mergedConfig();
+				const sessionKey = this.config.getCurrentContext?.()?.sessionKey;
+				return resolveEffectiveAgentProfileForSession(config, sessionKey).manifest.tools.builtin[toolName]?.limits?.timeoutMs;
+			} },
 			getConfig: () => this.mergedConfig(),
 			getPrimaryModel: () => this.resolveModelStringToModel(this.pickDefaultModelRef()),
 			getMemoryManager: () => this.getCurrentWorkspaceRuntime().memoryManager,
@@ -233,8 +243,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?.();
@@ -280,8 +290,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.
@@ -295,7 +305,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);
 	}
 	/**
@@ -304,7 +314,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,
@@ -388,7 +398,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,
@@ -454,7 +464,9 @@ var AgentManager = class {
 		const base = resolve(s.baseDir);
 		const workspaceRoot = workspaceDir ? resolveWorkspaceSkillsDir(workspaceDir) : "";
 		const workspaceManaged = workspaceRoot ? s.source === "workspace" && base.startsWith(resolve(workspaceRoot) + sep) : false;
-		const managed = isUnderManagedSkillsDir(s.baseDir) || workspaceManaged;
+		const globalManaged = isUnderManagedSkillsDir(s.baseDir);
+		const managed = s.origin.managed && (globalManaged || workspaceManaged);
+		const writable = managed && s.origin.writable;
 		const directoryId = base.split(sep).filter(Boolean).pop() || s.name;
 		const enabled = !(skillsConfig.entries?.[s.name]?.enabled === false);
 		const hubKey = managed ? basename(base) : "";
@@ -465,8 +477,10 @@ var AgentManager = class {
 			description: s.description,
 			category: s.category,
 			source: s.source,
+			origin: s.origin.id,
 			path: s.baseDir,
 			managed,
+			writable,
 			enabled,
 			disableModelInvocation: s.disableModelInvocation,
 			...hub ? { hub } : {}
@@ -517,7 +531,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
 		};
@@ -538,7 +552,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,
@@ -570,6 +584,7 @@ var AgentManager = class {
 			return;
 		}
 		if (source === "explicit") this.lastExplicitSkillDiskRefreshAt = now;
+		this.skillFilesystemWatcher.refreshPrimaryWorkspace(this.baseWorkspacePath);
 		if (this.skillDiskRefreshInProgress) {
 			this.skillDiskRefreshPending = true;
 			return;
@@ -579,7 +594,7 @@ var AgentManager = class {
 		try {
 			do {
 				this.skillDiskRefreshPending = false;
-				this.applySkillsAfterDiskChange();
+				this.applySkillsAfterDiskChange(source === "trust" ? "trust" : "disk");
 				refreshed = true;
 			} while (this.skillDiskRefreshPending);
 		} finally {
@@ -587,6 +602,9 @@ var AgentManager = class {
 		}
 		if (refreshed) this.scheduleSkillsUpdated("disk");
 	}
+	refreshSkillsAfterTrustChange() {
+		this.refreshSkillsAfterDiskChange("trust");
+	}
 	scheduleSkillsUpdated(reason) {
 		this.pendingSkillsUpdatedReason = reason === "disk" ? "disk" : this.pendingSkillsUpdatedReason ?? "config";
 		if (this.skillsUpdatedTimer) clearTimeout(this.skillsUpdatedTimer);
@@ -597,9 +615,9 @@ var AgentManager = class {
 			this.config.onSkillsUpdated?.({ reason: nextReason });
 		}, 250);
 	}
-	applySkillsAfterDiskChange() {
+	applySkillsAfterDiskChange(reason = "disk") {
 		const cfg = this.config.config;
-		for (const rt of this.workspaceRuntimes.values()) rt.skillManager.reload();
+		for (const rt of this.workspaceRuntimes.values()) rt.skillManager.reload(reason);
 		for (const instance of this.agents.values()) {
 			const resolvedWorkspacePath = this.getResolvedWorkspaceForSession(instance.sessionKey);
 			const rt = this.workspaceRuntimes.getOrCreate(resolvedWorkspacePath, instance.effectiveProfile.agentId);
@@ -610,7 +628,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,
@@ -647,7 +665,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;
@@ -751,7 +768,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,
@@ -835,12 +852,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,
@@ -855,7 +870,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,
@@ -930,7 +945,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,
@@ -970,7 +985,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/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/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));
 	}

package/dist/src/agent/context/project-context.d.ts

@@ -1,12 +1,16 @@
-import { type GoalWithDetails } from '../../goals/index.js';
 import type { Project } from '../../projects/types.js';
+export interface ProjectTaskContext {
+    title: string;
+    state: string;
+    priority: string;
+}
 export declare function buildActiveProjectContextForPrompt(sessionKey: string, options?: {
     memoryQuery?: string;
 }): string | undefined;
 export declare function formatActiveProjectContextForPrompt(input: {
     project: Project;
     workspacePath?: string;
-    activeGoals: GoalWithDetails[];
+    activeTasks: ProjectTaskContext[];
     recentSessions: Array<{
         key: string;
         name?: string;

package/dist/src/agent/context/project-context.js

@@ -1,14 +1,14 @@
 import { listMemoryRecords, searchMemoryRecords } from "../../storage/sqlite/memory-records-repository.js";
 import "../../storage/sqlite/index.js";
-import { GoalService } from "../../goals/goal-service.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 { LocalAppStore } from "../../local-apps/store.js";
 import { ProjectStore } from "../../projects/project-store.js";
 import { getProjectForSession, getProjectWorkspacePathForSession } from "../../projects/workspace.js";
 //#region src/agent/context/project-context.ts
 const MAX_TEXT = 1200;
-const MAX_GOALS = 5;
+const MAX_TASKS = 5;
 const MAX_SESSIONS = 5;
 const MAX_RECENT_MEMORY = 5;
 const MAX_RELEVANT_MEMORY = 5;
@@ -19,15 +19,12 @@ function truncateText(value, max = MAX_TEXT) {
 	if (trimmed.length <= max) return trimmed;
 	return `${trimmed.slice(0, max - 1).trimEnd()}...`;
 }
-function formatGoal(goal) {
-	const parts = [
-		`- ${sanitizeForPromptLiteral(goal.title)}`,
-		`status=${goal.status}`,
-		`priority=${goal.priority}`
-	];
-	if (goal.nextAction?.trim()) parts.push(`next=${sanitizeForPromptLiteral(truncateText(goal.nextAction, 200) ?? "")}`);
-	if (goal.blockedReason?.trim()) parts.push(`blocked=${sanitizeForPromptLiteral(truncateText(goal.blockedReason, 200) ?? "")}`);
-	return parts.join(" | ");
+function formatTask(task) {
+	return [
+		`- ${sanitizeForPromptLiteral(task.title)}`,
+		`state=${task.state}`,
+		`priority=${task.priority}`
+	].join(" | ");
 }
 function selectProjectMemoryRecords(input) {
 	const selected = /* @__PURE__ */ new Map();
@@ -46,16 +43,11 @@ function buildActiveProjectContextForPrompt(sessionKey, options = {}) {
 	return formatActiveProjectContextForPrompt({
 		project,
 		workspacePath: getProjectWorkspacePathForSession(sessionKey) ?? project.workspaceRoot,
-		activeGoals: new GoalService().list({
-			projectId: project.id,
-			status: [
-				"active",
-				"paused",
-				"blocked",
-				"needs_input"
-			],
-			limit: MAX_GOALS
-		}),
+		activeTasks: new TaskRepository().listByProject(project.id, MAX_TASKS).filter((task) => task.phase !== "closed").map((task) => ({
+			priority: task.priority,
+			title: task.contract?.objective ?? task.title,
+			state: `${task.phase}/${new TaskReadModelProjector().project(task).operationalState}`
+		})),
 		recentSessions: new ProjectStore().getRecentSessions(project.id, MAX_SESSIONS),
 		memoryRecords: selectProjectMemoryRecords({
 			relevant: options.memoryQuery?.trim() ? searchMemoryRecords({
@@ -106,9 +98,9 @@ function formatActiveProjectContextForPrompt(input) {
 		const retained = input.localApp.retainedVersions.length ? input.localApp.retainedVersions.map((version) => `v${version}`).join(", ") : "none";
 		lines.push("", "## Local App Runtime", `Extension id: ${sanitizeForPromptLiteral(input.localApp.extensionId)}`, `Draft version: v${input.localApp.draftVersion}`, `Installed version: ${input.localApp.activeVersion ? `v${input.localApp.activeVersion}` : "none"}`, `Installation: ${input.localApp.installationState} | enabled=${String(input.localApp.enabled)}`, `Retained releases: ${retained}`, input.localApp.latestAcceptance ? `Latest acceptance: ${input.localApp.latestAcceptance.status} | source=${sanitizeForPromptLiteral(input.localApp.latestAcceptance.sourceHash.slice(0, 12))} | checked=${new Date(input.localApp.latestAcceptance.createdAt).toISOString()}` : "Latest acceptance: none", ...input.localApp.latestAcceptance?.failures.map((failure) => `Acceptance failure: ${sanitizeForPromptLiteral(truncateText(failure, 240) ?? "")}`) ?? [], "Edit only the Project draft. Do not modify installed release artifacts directly; installation and rollback are host-managed.");
 	}
-	lines.push("", "## Active Goals");
-	if (input.activeGoals.length === 0) lines.push("- None recorded.");
-	else lines.push(...input.activeGoals.map(formatGoal));
+	lines.push("", "## Active Tasks");
+	if (input.activeTasks.length === 0) lines.push("- None recorded.");
+	else lines.push(...input.activeTasks.map(formatTask));
 	lines.push("", "## Recent Project Sessions");
 	if (input.recentSessions.length === 0) lines.push("- None recorded.");
 	else for (const session of input.recentSessions) {

package/dist/src/agent/context/workspace-templates/AGENTS.md

@@ -22,7 +22,7 @@ Do not manually reread startup files unless:
 ## Memory
 
 - Use runtime memory tools for recall.
-- Use curated memory for durable facts and preferences when available.
+- Use structured user understanding for durable facts and preferences when available.
 - Cite only memory sources that a tool actually returns.
 - Keep memory concise, factual, and useful.
 - Do not store secrets unless the user explicitly asks and the storage location is appropriate.

package/dist/src/agent/embedded/run-for-session.d.ts

@@ -14,6 +14,8 @@ export type RunEmbeddedForSessionParams = {
     modelManager: ModelManager;
     thinkingOverride?: string | null;
     abortSignal?: AbortSignal;
+    /** Absolute parent deadline. The turn's own timeout is capped to the remaining budget. */
+    deadlineAtMs?: number;
     onEvent?: (event: EmbeddedStreamEvent) => void;
     getConfig?: () => Config | undefined;
     beforeTurn?: () => void | Promise<void>;

package/dist/src/agent/embedded/run-for-session.js

@@ -48,6 +48,8 @@ async function runEmbeddedTurnForSession(params) {
 	const thinkingLevel = params.thinkingOverride ?? agent.state.thinkingLevel;
 	const workspaceDir = agentManager.getResolvedWorkspaceForSession(sessionKey);
 	const config = params.getConfig?.();
+	const configuredTurnTimeoutMs = resolveAgentTurnTimeoutMs(config, sessionKey);
+	const turnTimeoutMs = params.deadlineAtMs === void 0 ? configuredTurnTimeoutMs : Math.max(1, Math.min(configuredTurnTimeoutMs, params.deadlineAtMs - Date.now()));
 	let userMessageForTurn = userMessage;
 	if (params.applyStartupContext !== false) userMessageForTurn = await applyStartupContextToUserMessage({
 		userMessage,
@@ -123,7 +125,7 @@ async function runEmbeddedTurnForSession(params) {
 						thinkingLevel,
 						workspaceDir,
 						sessionStore,
-						timeoutMs: resolveAgentTurnTimeoutMs(config),
+						timeoutMs: turnTimeoutMs,
 						abortSignal: params.abortSignal,
 						onEvent: params.onEvent,
 						resumeLastUserMessage

package/dist/src/agent/embedded/run-turn.js

@@ -112,6 +112,7 @@ async function runXopcEmbeddedTurn(params) {
 			thinkingLevel: thinkingLevel ?? "medium"
 		});
 		const { session, reused } = runner;
+		runner.piSm.setActiveTurnId?.(runId);
 		const streamFnWithXopcExtensions = wrapStreamFnForXopcExtensions(session.agent.streamFunction);
 		const loggingStreamFn = (streamModel, context, options) => {
 			const sourceMessages = [...context.messages];
@@ -263,6 +264,7 @@ async function runXopcEmbeddedTurn(params) {
 		try {
 			runner?.piSm.flushPendingToolResults?.();
 		} catch {}
+		runner?.piSm.setActiveTurnId?.(null);
 		runner?.release();
 	}
 }

package/dist/src/agent/embedded/session-tool-result-guard.d.ts

@@ -64,11 +64,13 @@ export interface InstallSessionToolResultGuardResult {
     flushPendingToolResults: () => void;
     clearPendingToolResults: () => void;
     getPendingIds: () => string[];
+    setActiveTurnId: (turnId: string | null) => void;
 }
 /** Idempotent wrapper that also adds the helper methods consumers expect. */
 export type GuardedPiTranscriptManager = SessionManager & {
     flushPendingToolResults?: () => void;
     clearPendingToolResults?: () => void;
+    setActiveTurnId?: (turnId: string | null) => void;
 };
 /**
  * Install the guard on a SessionManager and return its control API.

package/dist/src/agent/embedded/session-tool-result-guard.js

@@ -18,7 +18,8 @@ function installSessionToolResultGuard(sessionManager, opts = {}) {
 	return {
 		flushPendingToolResults: () => guard.flushPending(),
 		clearPendingToolResults: () => guard.clearPending(),
-		getPendingIds: () => guard.getPendingIds()
+		getPendingIds: () => guard.getPendingIds(),
+		setActiveTurnId: (turnId) => guard.setActiveTurnId(turnId)
 	};
 }
 /**
@@ -44,6 +45,7 @@ function guardSessionManager(sessionManager, opts) {
 	const tagged = sessionManager;
 	tagged.flushPendingToolResults = result.flushPendingToolResults;
 	tagged.clearPendingToolResults = result.clearPendingToolResults;
+	tagged.setActiveTurnId = result.setActiveTurnId;
 	return tagged;
 }
 /**
@@ -273,6 +275,7 @@ var ToolResultGuard = class {
 	originalAppend;
 	allowSyntheticToolResults;
 	maxToolResultChars;
+	activeTurnId = null;
 	constructor(sessionManager, opts) {
 		this.sessionManager = sessionManager;
 		this.opts = opts;
@@ -285,6 +288,15 @@ var ToolResultGuard = class {
 		const bound = this.guardedAppend.bind(this);
 		this.sessionManager.appendMessage = bound;
 	}
+	setActiveTurnId(turnId) {
+		this.activeTurnId = normalizeOptionalString(turnId) ?? null;
+	}
+	withActiveTurnId(message) {
+		return this.activeTurnId ? {
+			...message,
+			turnId: this.activeTurnId
+		} : message;
+	}
 	flushPending() {
 		if (this.pending.size() === 0) return;
 		if (this.allowSyntheticToolResults) for (const [id, name] of this.pending.entries()) {
@@ -293,7 +305,7 @@ var ToolResultGuard = class {
 				toolName: name,
 				text: this.opts.missingToolResultText
 			});
-			const flushed = this.applyBeforeWriteHook(this.persistToolResult(this.persistMessage(synthetic), {
+			const flushed = this.applyBeforeWriteHook(this.persistToolResult(this.withActiveTurnId(this.persistMessage(synthetic)), {
 				toolCallId: id,
 				toolName: name,
 				isSynthetic: true
@@ -344,7 +356,7 @@ var ToolResultGuard = class {
 			const toolName = id ? this.pending.getToolName(id) : void 0;
 			if (id) this.pending.delete(id);
 			const normalizedToolResult = normalizePersistedToolResultName(nextMessage, toolName);
-			const capped = capToolResultForPersistence(this.persistMessage(normalizedToolResult), this.maxToolResultChars);
+			const capped = capToolResultForPersistence(this.withActiveTurnId(this.persistMessage(normalizedToolResult)), this.maxToolResultChars);
 			const persisted = this.applyBeforeWriteHook(this.persistToolResult(capped, {
 				toolCallId: id ?? void 0,
 				toolName,
@@ -364,7 +376,7 @@ var ToolResultGuard = class {
 		const toolCalls = nextRole === "assistant" && stopReason !== "aborted" && stopReason !== "error" ? extractToolCallsFromAssistant(nextMessage) : [];
 		if (this.pending.shouldFlushBeforeNonToolResult(nextRole, toolCalls.length)) this.flushPending();
 		if (this.pending.shouldFlushBeforeNewToolCalls(toolCalls.length)) this.flushPending();
-		const finalMessage = this.applyBeforeWriteHook(this.persistMessage(nextMessage));
+		const finalMessage = this.applyBeforeWriteHook(this.withActiveTurnId(this.persistMessage(nextMessage)));
 		if (!finalMessage) return;
 		const result = this.originalAppend(finalMessage);
 		if (this.opts.sessionKey) emitSessionTranscriptUpdate({

package/dist/src/agent/inbound/inbound-loop.js

@@ -181,7 +181,7 @@ var InboundLoop = class {
 								assistantPlainText,
 								aborted: false,
 								...busProcessFailed !== void 0 ? { streamError: busProcessFailed } : {},
-								skipPersistentGoalPostTurn: false,
+								skipTaskReview: false,
 								outboundMetadata: {
 									accountId: meta?.accountId,
 									threadId: meta?.threadId

package/dist/src/agent/inbound/turn-dispatcher.d.ts

@@ -57,12 +57,17 @@ export interface TurnDispatcherConfig {
     sourceContextResolver?: AgentSourceContextResolver;
 }
 export type DirectAttachment = InboundAttachmentInput;
+export interface ProcessDirectOptions {
+    signal?: AbortSignal;
+    runId?: string;
+    deadlineAtMs?: number;
+}
 export declare class TurnDispatcher {
     private readonly cfg;
     private readonly log;
     constructor(cfg: TurnDispatcherConfig);
     /** One-shot direct turn (CLI / embedded TUI). */
-    processDirect(content: string, sessionKey?: string, attachments?: DirectAttachment[], thinking?: string): Promise<string>;
+    processDirect(content: string, sessionKey?: string, attachments?: DirectAttachment[], thinking?: string, options?: ProcessDirectOptions): Promise<string>;
     /** Streaming direct turn (webchat SSE / CLI streaming). */
     processDirectStreaming(content: string, sessionKey?: string, attachments?: DirectAttachment[], thinking?: string, options?: {
         signal?: AbortSignal;