@xopcai/xopc 0.0.218 → 0.0.219

package/dist/src/storage/sqlite/user-context-repository.js

@@ -2,8 +2,31 @@ import { getSqliteDatabase, runSqliteWriteTransaction } from "./transaction.js";
 import { USER_CONTEXT_PRINCIPAL_ID } from "../../user-context/domain.js";
 import { retrievalQueryAuditValue } from "../../retrieval/audit.js";
 import { buildFts5SearchQuery, fts5RankToScore } from "./fts.js";
-import { randomUUID } from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
 //#region src/storage/sqlite/user-context-repository.ts
+function evidenceFromRow(row) {
+	return {
+		id: row.evidence_id,
+		sourceType: row.source_type,
+		...row.source_instance_id ? { sourceInstanceId: row.source_instance_id } : {},
+		sourceRef: row.source_ref,
+		...row.source_run_id ? { sourceRunId: row.source_run_id } : {},
+		...row.source_item_id ? { sourceItemId: row.source_item_id } : {},
+		...row.session_id ? { sessionId: row.session_id } : {},
+		...row.turn_id ? { turnId: row.turn_id } : {},
+		...row.message_id ? { messageId: row.message_id } : {},
+		...row.content_hash ? { contentHash: row.content_hash } : {},
+		...row.retention_policy ? { retentionPolicy: row.retention_policy } : {},
+		...row.processing_policy ? { processingPolicy: row.processing_policy } : {},
+		...row.extractor_id ? { extractorId: row.extractor_id } : {},
+		...row.extractor_version ? { extractorVersion: row.extractor_version } : {},
+		...row.redacted_excerpt ? { redactedExcerpt: row.redacted_excerpt } : {},
+		trustLevel: row.trust_level,
+		observedAt: row.observed_at,
+		ingestedAt: row.ingested_at ?? row.created_at,
+		createdAt: row.created_at
+	};
+}
 const UNDERSTANDING_SELECT = `
   SELECT u.*, v.statement, v.payload_json
   FROM user_understandings u
@@ -182,6 +205,16 @@ function setUnderstandingStatus(id, status, confirmation) {
         confidence = COALESCE(?, confidence),
         updated_at = ?
     WHERE understanding_id = ?`).run(status, confirmation?.explicitness ?? null, confirmation?.confidence ?? null, now, id);
+	const assertionStatus = status === "active" ? "active" : status === "archived" ? "closed" : status === "rejected" ? "rejected" : "candidate";
+	getSqliteDatabase().prepare(`UPDATE context_temporal_assertions
+    SET status = ?, updated_at = ? WHERE object_type = 'understanding' AND object_id = ?`).run(assertionStatus, now, id);
+	const result = getUnderstanding(id);
+	if (!result) throw new Error(`User understanding not found: ${id}`);
+	return result;
+}
+function closeUnderstandingValidity(id, validTo = Date.now()) {
+	getSqliteDatabase().prepare(`UPDATE user_understandings SET valid_to = ?, updated_at = ?
+    WHERE understanding_id = ?`).run(validTo, validTo, id);
 	const result = getUnderstanding(id);
 	if (!result) throw new Error(`User understanding not found: ${id}`);
 	return result;
@@ -263,25 +296,36 @@ function createContextEvidence(input, principalId = USER_CONTEXT_PRINCIPAL_ID) {
 	const existing = getSqliteDatabase().prepare(`SELECT * FROM context_evidence
     WHERE principal_id = ? AND source_type = ?
       AND COALESCE(source_instance_id, '') = COALESCE(?, '') AND source_ref = ?`).get(principalId, input.sourceType, input.sourceInstanceId ?? null, input.sourceRef);
-	if (existing) return {
-		id: existing.evidence_id,
-		sourceType: existing.source_type,
-		...existing.source_instance_id ? { sourceInstanceId: existing.source_instance_id } : {},
-		sourceRef: existing.source_ref,
-		...existing.redacted_excerpt ? { redactedExcerpt: existing.redacted_excerpt } : {},
-		trustLevel: existing.trust_level,
-		observedAt: existing.observed_at,
-		createdAt: existing.created_at
-	};
+	const derivedHash = input.contentHash ?? (input.redactedExcerpt ? createHash("sha256").update(input.redactedExcerpt).digest("hex") : void 0);
+	if (existing) {
+		getSqliteDatabase().prepare(`UPDATE context_evidence SET
+      source_run_id = COALESCE(source_run_id, ?), source_item_id = COALESCE(source_item_id, ?),
+      session_id = COALESCE(session_id, ?), turn_id = COALESCE(turn_id, ?),
+      message_id = COALESCE(message_id, ?), content_hash = COALESCE(content_hash, ?),
+      retention_policy = COALESCE(retention_policy, ?),
+      processing_policy = CASE
+        WHEN processing_policy = 'local_only' OR ? = 'local_only' THEN 'local_only'
+        ELSE COALESCE(processing_policy, ?)
+      END,
+      extractor_id = COALESCE(extractor_id, ?), extractor_version = COALESCE(extractor_version, ?),
+      ingested_at = COALESCE(ingested_at, ?)
+      WHERE evidence_id = ?`).run(input.sourceRunId ?? null, input.sourceItemId ?? null, input.sessionId ?? null, input.turnId ?? null, input.messageId ?? null, derivedHash ?? null, input.retentionPolicy ?? null, input.processingPolicy ?? null, input.processingPolicy ?? null, input.extractorId ?? null, input.extractorVersion ?? null, input.ingestedAt ?? Date.now(), existing.evidence_id);
+		return evidenceFromRow(getSqliteDatabase().prepare("SELECT * FROM context_evidence WHERE evidence_id = ?").get(existing.evidence_id));
+	}
+	const createdAt = Date.now();
 	const evidence = {
 		...input,
 		id: randomUUID(),
-		createdAt: Date.now()
+		...derivedHash ? { contentHash: derivedHash } : {},
+		ingestedAt: input.ingestedAt ?? createdAt,
+		createdAt
 	};
 	getSqliteDatabase().prepare(`INSERT INTO context_evidence (
-    evidence_id, principal_id, source_type, source_instance_id, source_ref,
-    redacted_excerpt, trust_level, observed_at, created_at
-  ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(evidence.id, principalId, evidence.sourceType, evidence.sourceInstanceId ?? null, evidence.sourceRef, evidence.redactedExcerpt ?? null, evidence.trustLevel, evidence.observedAt, evidence.createdAt);
+    evidence_id, principal_id, source_type, source_instance_id, source_ref, source_run_id,
+    source_item_id, session_id, turn_id, message_id, content_hash, retention_policy,
+    processing_policy, extractor_id, extractor_version, redacted_excerpt, trust_level,
+    observed_at, ingested_at, created_at
+  ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(evidence.id, principalId, evidence.sourceType, evidence.sourceInstanceId ?? null, evidence.sourceRef, evidence.sourceRunId ?? null, evidence.sourceItemId ?? null, evidence.sessionId ?? null, evidence.turnId ?? null, evidence.messageId ?? null, evidence.contentHash ?? null, evidence.retentionPolicy ?? null, evidence.processingPolicy ?? null, evidence.extractorId ?? null, evidence.extractorVersion ?? null, evidence.redactedExcerpt ?? null, evidence.trustLevel, evidence.observedAt, evidence.ingestedAt, evidence.createdAt);
 	return evidence;
 }
 function linkUnderstandingEvidence(versionId, evidenceId, relation, confidence) {
@@ -295,16 +339,7 @@ function listUnderstandingEvidence(understandingId, relation) {
     JOIN understanding_evidence_links l ON l.evidence_id = e.evidence_id
     JOIN user_understanding_versions v ON v.version_id = l.version_id
     WHERE v.understanding_id = ? AND (? IS NULL OR l.relation = ?)
-    ORDER BY e.observed_at DESC`).all(understandingId, relation ?? null, relation ?? null).map((row) => ({
-		id: row.evidence_id,
-		sourceType: row.source_type,
-		...row.source_instance_id ? { sourceInstanceId: row.source_instance_id } : {},
-		sourceRef: row.source_ref,
-		...row.redacted_excerpt ? { redactedExcerpt: row.redacted_excerpt } : {},
-		trustLevel: row.trust_level,
-		observedAt: row.observed_at,
-		createdAt: row.created_at
-	}));
+    ORDER BY e.observed_at DESC`).all(understandingId, relation ?? null, relation ?? null).map(evidenceFromRow);
 }
 function recordContextRun(input) {
 	const auditedQuery = retrievalQueryAuditValue(input.query);
@@ -320,9 +355,9 @@ function recordContextRun(input) {
       ) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`).run(runId, input.principalId ?? "local-owner", input.turnId, input.sessionKey, auditedQuery, input.budget, input.durationMs, Date.now());
 		const insert = db.prepare(`INSERT INTO context_run_items (
       context_run_id, object_type, object_id, version_id, decision, reason, content_snapshot,
-      source_label, rank, score, injected_chars
-    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`);
-		for (const item of input.items) insert.run(runId, item.objectType, item.objectId, item.versionId ?? null, item.decision, item.reason, item.content, item.sourceLabel, item.rank ?? null, item.score ?? null, item.injectedChars);
+      source_label, origin, rank, score, injected_chars
+    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`);
+		for (const item of input.items) insert.run(runId, item.objectType, item.objectId, item.versionId ?? null, item.decision, item.reason, item.content, item.sourceLabel, item.origin, item.rank ?? null, item.score ?? null, item.injectedChars);
 	});
 	return runId;
 }
@@ -341,6 +376,7 @@ function getTurnPersonalization(turnId) {
 			reason: row.reason,
 			content: row.content_snapshot,
 			sourceLabel: row.source_label,
+			origin: row.origin,
 			...row.rank === null ? {} : { rank: row.rank },
 			...row.score === null ? {} : { score: row.score },
 			injectedChars: row.injected_chars
@@ -406,4 +442,4 @@ function decideContextConsent(id, decision) {
 	return Number(result.changes) > 0;
 }
 //#endregion
-export { consumeContextConsent, createCollaborationRule, createContextEvidence, createUnderstanding, decideContextConsent, deleteCollaborationRule, deleteUnderstanding, ensureContextConsent, getCollaborationRule, getTurnPersonalization, getUnderstanding, getUserProfile, hasContextConsent, isUnderstandingSuppressed, linkUnderstandingEvidence, listCollaborationRules, listUnderstandingEvidence, listUnderstandings, recordContextFeedback, recordContextRun, rejectUnderstanding, reviseCollaborationRule, reviseUnderstanding, searchActiveUnderstandings, setCollaborationRuleStatus, setUnderstandingStatus, updateUserProfile };
+export { closeUnderstandingValidity, consumeContextConsent, createCollaborationRule, createContextEvidence, createUnderstanding, decideContextConsent, deleteCollaborationRule, deleteUnderstanding, ensureContextConsent, getCollaborationRule, getTurnPersonalization, getUnderstanding, getUserProfile, hasContextConsent, isUnderstandingSuppressed, linkUnderstandingEvidence, listCollaborationRules, listUnderstandingEvidence, listUnderstandings, recordContextFeedback, recordContextRun, rejectUnderstanding, reviseCollaborationRule, reviseUnderstanding, searchActiveUnderstandings, setCollaborationRuleStatus, setUnderstandingStatus, updateUserProfile };

package/dist/src/tasks/index.d.ts

@@ -16,6 +16,7 @@ export * from './task-context-repository.js';
 export * from './task-conversation-repository.js';
 export * from './task-handoff-service.js';
 export * from './task-dependency-service.js';
+export * from './task-deletion-service.js';
 export * from './task-read-model-projector.js';
 export * from './task-outbox-dispatcher.js';
 export * from './task-run-dispatcher.js';

package/dist/src/tasks/index.js

@@ -18,7 +18,8 @@ import { ProjectMonitoringService, decideProactiveDisposition, isInQuietHours, n
 import { ProjectOperatingViewService, summarizeProjectOperatingView } from "./project-operating-view-service.js";
 import { TaskValueMetricsService } from "./task-value-metrics-service.js";
 import { TaskHandoffService } from "./task-handoff-service.js";
+import { TaskDeletionService } from "./task-deletion-service.js";
 import { TaskOutboxDispatcher } from "./task-outbox-dispatcher.js";
 import { TaskRunDispatcher } from "./task-run-dispatcher.js";
 import { TaskSignalService } from "./task-signal-service.js";
-export { AttentionGovernor, HomeQueryService, ModelTaskContractPlanner, ProjectMonitoringService, ProjectOperatingViewService, TaskApplicationService, TaskContextRepository, TaskConversationConflictError, TaskConversationRepository, TaskDependencyError, TaskDependencyService, TaskHandoffService, TaskOutboxDispatcher, TaskReadModelProjector, TaskRepository, TaskRunCoordinator, TaskRunDispatcher, TaskRunRepository, TaskSignalService, TaskValueMetricsService, TaskWorkflowCoordinator, assembleTaskContext, buildHomeWorkbench, buildTaskExecutionDirective, decideProactiveDisposition, decisionFromTask, defineTaskContract, enqueueTaskChanged, enqueueTaskChangedEvent, getTaskContextManifest, getTaskExecutionBrief, isInQuietHours, nextQuietHoursEnd, parseTaskContractResponse, proactiveDispositionReason, resolveExecutionContext, summarizeProjectOperatingView };
+export { AttentionGovernor, HomeQueryService, ModelTaskContractPlanner, ProjectMonitoringService, ProjectOperatingViewService, TaskApplicationService, TaskContextRepository, TaskConversationConflictError, TaskConversationRepository, TaskDeletionService, TaskDependencyError, TaskDependencyService, TaskHandoffService, TaskOutboxDispatcher, TaskReadModelProjector, TaskRepository, TaskRunCoordinator, TaskRunDispatcher, TaskRunRepository, TaskSignalService, TaskValueMetricsService, TaskWorkflowCoordinator, assembleTaskContext, buildHomeWorkbench, buildTaskExecutionDirective, decideProactiveDisposition, decisionFromTask, defineTaskContract, enqueueTaskChanged, enqueueTaskChangedEvent, getTaskContextManifest, getTaskExecutionBrief, isInQuietHours, nextQuietHoursEnd, parseTaskContractResponse, proactiveDispositionReason, resolveExecutionContext, summarizeProjectOperatingView };

package/dist/src/tasks/task-deletion-service.d.ts

@@ -0,0 +1,21 @@
+import type { Task, TaskRun } from '@xopcai/gateway-contract';
+import { TaskRepository } from './task-repository.js';
+import { TaskRunRepository } from './task-run-repository.js';
+export type TaskDeletionInspection = {
+    ok: true;
+    task: Task;
+} | {
+    ok: false;
+    reason: 'not_found';
+} | {
+    ok: false;
+    reason: 'active_run';
+    run: TaskRun;
+};
+export declare class TaskDeletionService {
+    private readonly tasks;
+    private readonly runs;
+    constructor(tasks?: TaskRepository, runs?: TaskRunRepository);
+    inspect(taskId: string): TaskDeletionInspection;
+    delete(taskId: string): TaskDeletionInspection;
+}

package/dist/src/tasks/task-deletion-service.js

@@ -0,0 +1,35 @@
+import { TaskRepository } from "./task-repository.js";
+import { TaskRunRepository } from "./task-run-repository.js";
+//#region src/tasks/task-deletion-service.ts
+var TaskDeletionService = class {
+	constructor(tasks = new TaskRepository(), runs = new TaskRunRepository()) {
+		this.tasks = tasks;
+		this.runs = runs;
+	}
+	inspect(taskId) {
+		const task = this.tasks.get(taskId);
+		if (!task) return {
+			ok: false,
+			reason: "not_found"
+		};
+		const run = this.runs.getActiveRoot(taskId);
+		return run ? {
+			ok: false,
+			reason: "active_run",
+			run
+		} : {
+			ok: true,
+			task
+		};
+	}
+	delete(taskId) {
+		const inspection = this.inspect(taskId);
+		if (!inspection.ok) return inspection;
+		return this.tasks.delete(taskId) ? inspection : {
+			ok: false,
+			reason: "not_found"
+		};
+	}
+};
+//#endregion
+export { TaskDeletionService };

package/dist/src/tasks/task-repository.js

@@ -187,7 +187,28 @@ var TaskRepository = class {
 		});
 	}
 	delete(taskId) {
-		return getSqliteDatabase().prepare("DELETE FROM tasks WHERE task_id = ?").run(taskId).changes > 0;
+		return runSqliteWriteTransaction((db) => {
+			const task = db.prepare("SELECT project_id FROM tasks WHERE task_id = ?").get(taskId);
+			if (!task) return false;
+			const runIds = db.prepare("SELECT run_id FROM task_runs WHERE task_id = ?").all(taskId).map((row) => row.run_id);
+			db.prepare(`DELETE FROM context_edges WHERE owner_kind = 'task' AND owner_id = ?`).run(taskId);
+			db.prepare(`DELETE FROM command_deduplication WHERE subject_kind = 'task' AND subject_id = ?`).run(taskId);
+			db.prepare(`DELETE FROM domain_outbox WHERE subject_kind = 'task' AND subject_id = ?`).run(taskId);
+			const deleted = db.prepare("DELETE FROM tasks WHERE task_id = ?").run(taskId).changes > 0;
+			db.prepare(`DELETE FROM context_snapshots WHERE owner_kind = 'task' AND owner_id = ?`).run(taskId);
+			if (runIds.length > 0) db.prepare(`DELETE FROM context_snapshots
+           WHERE owner_kind = 'task_run' AND owner_id IN (SELECT value FROM json_each(?))`).run(JSON.stringify(runIds));
+			const deletedAt = Date.now();
+			db.prepare(`INSERT INTO domain_outbox (
+          event_id, event_type, subject_kind, subject_id, correlation_id,
+          payload_json, created_at
+        ) VALUES (?, 'task.deleted.v1', 'task', ?, ?, ?, ?)`).run(randomUUID(), taskId, randomUUID(), JSON.stringify({
+				taskId,
+				...task.project_id ? { projectId: task.project_id } : {},
+				deletedAt
+			}), deletedAt);
+			return deleted;
+		});
 	}
 	insertContract(db, contract) {
 		db.prepare(`INSERT INTO task_contracts (

package/dist/src/tui/backends/embedded-backend.js

@@ -15,7 +15,6 @@ import { inferSuggestedProjectDefaultAgentId } from "../../projects/project-agen
 import "../../projects/index.js";
 import { setTuiDefaultAgentConfig } from "../../commands/agents.config.js";
 import { evictEmbeddedSessionRunner } from "../../agent/embedded/session-runner.js";
-import { prependEnvelopeTimestamp } from "../../channels/envelope-timestamp.js";
 import { buildSessionTimeline } from "../../session/transcript-outline.js";
 import { transcriptRowsToClientHistory } from "../../session/client-history.js";
 import { SessionIndex } from "../../session/manager.js";
@@ -24,6 +23,7 @@ import { parseModelRef } from "../../agent/models/selection.js";
 import { buildReviewContext, resolveGitRoot } from "../../review/review-git.js";
 import { MessageBus, MessageBusShutdownError } from "../../infra/bus/queue.js";
 import "../../infra/bus/index.js";
+import { prependEnvelopeTimestamp } from "../../channels/envelope-timestamp.js";
 import { getWorkspacePath } from "../../config/workspace-path-helpers.js";
 import "../../config/index.js";
 import { buildWorkflowChildTools } from "../../agent/workflow/workflow-child-tools.js";
@@ -579,7 +579,8 @@ var EmbeddedBackend = class {
 				contextWindow: usage.contextWindow,
 				contextUsagePercent: usage.usagePercent,
 				effectiveWorkspacePath: cfg.effectiveWorkspacePath,
-				workingDirectoryLocked: cfg.workingDirectoryLocked
+				workingDirectoryLocked: cfg.workingDirectoryLocked,
+				projectId: getSessionMetadata(sessionKey)?.projectId
 			};
 		} catch (err) {
 			const errorMessage = err instanceof Error ? err.message : String(err);
@@ -609,6 +610,7 @@ var EmbeddedBackend = class {
 	}
 	async patchSession(sessionKey, patch) {
 		const agent = await this.ensureAgent();
+		const hasProjectPatch = Object.prototype.hasOwnProperty.call(patch, "projectId");
 		const projectId = typeof patch.projectId === "string" ? patch.projectId.trim() : "";
 		const result = await agent.sessionConfig.patch(sessionKey, {
 			model: typeof patch.model === "string" ? patch.model : void 0,
@@ -622,7 +624,7 @@ var EmbeddedBackend = class {
 			await this.sessionIndexReady;
 			await this.sessionIndex?.getStore().resolveTranscriptPath(sessionKey);
 			new ProjectService().attachSession(sessionKey, projectId);
-		}
+		} else if (hasProjectPatch && patch.projectId === null) new ProjectService().detachSession(sessionKey);
 		const hiddenFromSessionList = typeof patch.hiddenFromSessionList === "boolean" ? patch.hiddenFromSessionList : void 0;
 		const customData = patch.customData && typeof patch.customData === "object" && !Array.isArray(patch.customData) ? patch.customData : void 0;
 		if (hiddenFromSessionList !== void 0 || customData !== void 0) {

package/dist/src/tui/backends/gateway-realtime-backend.js

@@ -1,8 +1,8 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { prependEnvelopeTimestamp } from "../../channels/envelope-timestamp.js";
 import { transcriptRowsToClientHistory } from "../../session/client-history.js";
 import { parseModelRef } from "../../agent/models/selection.js";
+import { prependEnvelopeTimestamp } from "../../channels/envelope-timestamp.js";
 import { gatewayCredentialAuthorization } from "../../gateway/credential.js";
 import { RealtimeClient } from "../../../packages/realtime-client/src/index.js";
 import { buildTuiTranscriptTree, transcriptTreeEntryIdToRowNumber } from "../tui-transcript-tree.js";
@@ -422,6 +422,7 @@ var GatewayRealtimeBackend = class {
 				if (session) {
 					if (session.name) out.displayName = session.name;
 					if (session.estimatedTokens != null) out.totalTokens = session.estimatedTokens;
+					if (session.projectId?.trim()) out.projectId = session.projectId.trim();
 				}
 			}
 			if (agentCfgRes.ok) {
@@ -645,12 +646,13 @@ var GatewayRealtimeBackend = class {
 		});
 		const json = await res.json().catch(() => ({}));
 		if (!res.ok || json.ok === false) throw new Error(json.error ?? `Session config patch failed (${res.status})`);
+		const hasProjectPatch = Object.prototype.hasOwnProperty.call(patch, "projectId");
 		const projectId = typeof patch.projectId === "string" ? patch.projectId.trim() : "";
 		const hiddenFromSessionList = typeof patch.hiddenFromSessionList === "boolean" ? patch.hiddenFromSessionList : void 0;
 		const customData = patch.customData && typeof patch.customData === "object" && !Array.isArray(patch.customData) ? patch.customData : void 0;
-		if (projectId || hiddenFromSessionList !== void 0 || customData !== void 0) {
+		if (hasProjectPatch || hiddenFromSessionList !== void 0 || customData !== void 0) {
 			const metadataPatch = {
-				...projectId ? { projectId } : {},
+				...hasProjectPatch ? { projectId: projectId || null } : {},
 				...hiddenFromSessionList !== void 0 ? { hiddenFromSessionList } : {},
 				...customData ? { customData } : {}
 			};

package/dist/src/tui/chat-history.js

@@ -1,3 +1,4 @@
+import { stripRuntimeContextFromUserMessage } from "../session/user-message-display.js";
 import { createAssistantMessageFromText } from "./components/assistant-message.js";
 //#region src/tui/chat-history.ts
 function historyMessageKey(message, index) {
@@ -77,7 +78,7 @@ function appendHistoryToChatLog(chatLog, messages, toolsExpanded, showThinking =
 			return;
 		}
 		if (hm.role === "user") {
-			chatLog.addUser(historyContentText(hm.content), {
+			chatLog.addUser(stripRuntimeContextFromUserMessage(historyContentText(hm.content)), {
 				displayIndex,
 				historyIndex,
 				role: "user"

package/dist/src/tui/tui-agent-events.js

@@ -1,4 +1,5 @@
 import { formatAgentRunErrorForDisplay } from "../agent/client-error-format.js";
+import { stripRuntimeContextFromUserContent } from "../session/user-message-display.js";
 import { createAssistantMessageFromText } from "./components/assistant-message.js";
 import { markRunEvent, markRunIdleAfterCompletion } from "./tui-run-state.js";
 //#region src/tui/tui-agent-events.ts
@@ -175,12 +176,13 @@ function dispatchAgentEvent(event, data, state, chatLog, tui, setActivityStatus,
 			break;
 		case "user_message": {
 			const message = p.message;
-			chatLog.addUser(Array.isArray(message?.content) || typeof message?.content === "string" ? message.content : []);
+			const content = Array.isArray(message?.content) || typeof message?.content === "string" ? stripRuntimeContextFromUserContent(message.content) : [];
+			chatLog.addUser(content);
 			tui.requestRender();
 			break;
 		}
 		case "user_transcript":
-			chatLog.addUser(String(p.text ?? ""));
+			chatLog.addUser(stripRuntimeContextFromUserContent(String(p.text ?? "")));
 			tui.requestRender();
 			break;
 		case "assistant_message_start": {

package/dist/src/tui/tui-commands.d.ts

@@ -109,6 +109,7 @@ export type CommandHandlerDeps = {
     extensionShortcuts?: TuiHotkeyExtensionShortcut[];
     currentAgentId?: string;
     setSession?: (rawKey: string) => Promise<void>;
+    newSession?: () => Promise<void>;
     resetSession?: () => Promise<void>;
     recoverStream?: () => void | Promise<void>;
     retryLastMessage?: () => void | Promise<void>;

package/dist/src/tui/tui-commands.js

@@ -584,6 +584,7 @@ function runTuiProjectCommand(state, args) {
 				...parsed.projectKind ? { projectKind: parsed.projectKind } : {}
 			});
 			projects.attachSession(state.currentSessionKey, project.id);
+			state.sessionInfo.projectId = project.id;
 			return `Created and attached project:\n${formatTuiProject(project)}`;
 		}
 		if (subcommand === "switch" || subcommand === "attach") {
@@ -592,10 +593,12 @@ function runTuiProjectCommand(state, args) {
 			const project = resolveTuiProject(projects, ref);
 			if (!project) return `Project not found: ${ref}`;
 			projects.attachSession(state.currentSessionKey, project.id);
+			state.sessionInfo.projectId = project.id;
 			return `Attached current session to project: ${project.name}`;
 		}
 		if (subcommand === "detach") {
 			projects.detachSession(state.currentSessionKey);
+			state.sessionInfo.projectId = void 0;
 			return "Detached current session from project.";
 		}
 		if (subcommand === "archive") {
@@ -1260,9 +1263,11 @@ function createTuiCommandHandler(deps) {
 				(async () => {
 					try {
 						await abortActive();
-						const uniqueKey = `tui-${randomUUID()}`;
-						if (setSession) {
-							await setSession(uniqueKey);
+						if (deps.newSession) {
+							await deps.newSession();
+							chatLog.addSystem(`new session: ${state.currentSessionKey}`);
+						} else if (setSession) {
+							await setSession(`tui-${randomUUID()}`);
 							chatLog.addSystem(`new session: ${state.currentSessionKey}`);
 						} else {
 							chatLog.clearAll();

package/dist/src/tui/tui-empty-session-cleanup.d.ts

@@ -8,4 +8,3 @@ export declare const GENERATED_TUI_SESSION_SHELL_PATCH: {
 export declare function isGeneratedTuiSessionKey(sessionKey: string): boolean;
 export declare function deleteGeneratedTuiSessionIfEmpty(client: Pick<TuiBackend, 'getSessionStats' | 'deleteSession'>, sessionKey: string): Promise<boolean>;
 export declare function cleanupAbandonedTuiSessions(client: Pick<TuiBackend, 'listSessions' | 'getSessionStats' | 'deleteSession'>, currentSessionKey: string, nowMs?: number): Promise<string[]>;
-export declare function hideLegacyEmptyTuiSessions(client: Pick<TuiBackend, 'listSessions' | 'patchSession'>): Promise<string[]>;

package/dist/src/tui/tui-empty-session-cleanup.js

@@ -23,15 +23,5 @@ async function cleanupAbandonedTuiSessions(client, currentSessionKey, nowMs = Da
 	for (const session of candidates) if (await deleteGeneratedTuiSessionIfEmpty(client, session.key)) deleted.push(session.key);
 	return deleted;
 }
-async function hideLegacyEmptyTuiSessions(client) {
-	const sessions = await client.listSessions();
-	const hidden = [];
-	for (const session of sessions) {
-		if (session.messageCount !== 0 || !isGeneratedTuiSessionKey(session.key)) continue;
-		await client.patchSession(session.key, GENERATED_TUI_SESSION_SHELL_PATCH);
-		hidden.push(session.key);
-	}
-	return hidden;
-}
 //#endregion
-export { GENERATED_TUI_SESSION_SHELL_PATCH, cleanupAbandonedTuiSessions, deleteGeneratedTuiSessionIfEmpty, hideLegacyEmptyTuiSessions, isGeneratedTuiSessionKey };
+export { GENERATED_TUI_SESSION_SHELL_PATCH, cleanupAbandonedTuiSessions, deleteGeneratedTuiSessionIfEmpty, isGeneratedTuiSessionKey };

package/dist/src/tui/tui-new-session-preferences.d.ts

@@ -0,0 +1,10 @@
+import { type AgentModelPreference, type NewSessionPreferences, type SessionInitialAgentConfig } from '@xopcai/gateway-contract';
+import type { TuiSettings } from './tui-settings.js';
+export declare function tuiGatewayPreferenceKey(url?: string): string;
+export declare function getTuiNewSessionPreferences(settings: TuiSettings, gatewayKey: string): NewSessionPreferences;
+export declare function rememberTuiSessionContext(settings: TuiSettings, gatewayKey: string, context: {
+    agentId: string;
+    projectId?: string | null;
+}): TuiSettings;
+export declare function rememberTuiAgentModel(settings: TuiSettings, gatewayKey: string, agentId: string, preference: AgentModelPreference): TuiSettings;
+export declare function tuiInitialAgentConfig(settings: TuiSettings, gatewayKey: string, agentId: string): SessionInitialAgentConfig | undefined;

package/dist/src/tui/tui-new-session-preferences.js

@@ -0,0 +1,32 @@
+import { createDefaultNewSessionPreferences, modelPreferenceForAgent, withAgentModelPreference, withLastChatScope, withSelectedAgent } from "../../packages/gateway-contract/src/new-session.js";
+//#region src/tui/tui-new-session-preferences.ts
+function tuiGatewayPreferenceKey(url) {
+	return url?.trim() || "local";
+}
+function getTuiNewSessionPreferences(settings, gatewayKey) {
+	return settings.newSessionPreferencesByGateway[gatewayKey] ?? createDefaultNewSessionPreferences();
+}
+function withPreferences(settings, gatewayKey, preferences) {
+	return {
+		...settings,
+		newSessionPreferencesByGateway: {
+			...settings.newSessionPreferencesByGateway,
+			[gatewayKey]: preferences
+		}
+	};
+}
+function rememberTuiSessionContext(settings, gatewayKey, context) {
+	return withPreferences(settings, gatewayKey, withLastChatScope(withSelectedAgent(getTuiNewSessionPreferences(settings, gatewayKey), context.agentId), context.projectId));
+}
+function rememberTuiAgentModel(settings, gatewayKey, agentId, preference) {
+	return withPreferences(settings, gatewayKey, withAgentModelPreference(getTuiNewSessionPreferences(settings, gatewayKey), agentId, preference));
+}
+function tuiInitialAgentConfig(settings, gatewayKey, agentId) {
+	const preference = modelPreferenceForAgent(getTuiNewSessionPreferences(settings, gatewayKey), agentId);
+	return preference ? {
+		model: preference.modelRef,
+		...preference.thinkingLevel ? { thinkingLevel: preference.thinkingLevel } : {}
+	} : void 0;
+}
+//#endregion
+export { getTuiNewSessionPreferences, rememberTuiAgentModel, rememberTuiSessionContext, tuiGatewayPreferenceKey, tuiInitialAgentConfig };

package/dist/src/tui/tui-session-actions.d.ts

@@ -15,6 +15,7 @@ export type SessionActionsContext = {
     historyLimit?: number;
     onAgentIdChange?: (agentId: string) => void;
     sessionSnapshot?: TuiSessionSnapshot;
+    onSessionInfoChange?: () => void;
 };
 export declare function createSessionActions(context: SessionActionsContext): {
     refreshSessionInfo: () => Promise<void>;

package/dist/src/tui/tui-session-actions.js

@@ -6,7 +6,7 @@ import { clearSeenStreamEvents } from "./tui-agent-events.js";
 //#region src/tui/tui-session-actions.ts
 init_agent_session_key();
 function createSessionActions(context) {
-	const { client, chatLog, tui, state, resolveSessionKey, updateHeader, updateFooter, setActivityStatus, historyLimit = 200, onAgentIdChange, sessionSnapshot } = context;
+	const { client, chatLog, tui, state, resolveSessionKey, updateHeader, updateFooter, setActivityStatus, historyLimit = 200, onAgentIdChange, sessionSnapshot, onSessionInfoChange } = context;
 	let refreshSessionInfoPromise = Promise.resolve();
 	let lastHistoryKeys = [];
 	const updateAgentFromSessionKey = (key) => {
@@ -17,6 +17,7 @@ function createSessionActions(context) {
 	const runRefreshSessionInfo = async () => {
 		try {
 			state.sessionInfo = await client.getSessionInfo(state.currentSessionKey);
+			onSessionInfoChange?.();
 			updateFooter();
 			tui.requestRender();
 		} catch {}

package/dist/src/tui/tui-settings.d.ts

@@ -1,3 +1,4 @@
+import { type NewSessionPreferences } from '@xopcai/gateway-contract';
 export type TuiThemeId = 'auto' | 'dark' | 'light' | (string & {});
 export type DoubleEscapeAction = 'none' | 'tree' | 'fork';
 export type TreeFilterMode = 'default' | 'no-tools' | 'user-only' | 'labeled-only' | 'all';
@@ -24,6 +25,7 @@ export interface TuiSettings {
     clearOnShrink: boolean;
     /** Default transcript filter when opening `/tree`. */
     treeFilterMode: TreeFilterMode;
+    newSessionPreferencesByGateway: Record<string, NewSessionPreferences>;
 }
 export declare const DEFAULT_TUI_SETTINGS: TuiSettings;
 /** Load persisted TUI settings from `~/.xopc/tui-settings.json`. */

package/dist/src/tui/tui-settings.js

@@ -1,5 +1,6 @@
 import { resolveStateDir } from "../config/paths-state.js";
 import { init_paths } from "../config/paths.js";
+import { parseNewSessionPreferences } from "../../packages/gateway-contract/src/new-session.js";
 import { join } from "node:path";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 //#region src/tui/tui-settings.ts
@@ -17,7 +18,8 @@ const DEFAULT_TUI_SETTINGS = {
 	editorPaddingX: 0,
 	autocompleteMaxVisible: 5,
 	clearOnShrink: false,
-	treeFilterMode: "default"
+	treeFilterMode: "default",
+	newSessionPreferencesByGateway: {}
 };
 const SETTINGS_PATH = join(resolveStateDir(), "tui-settings.json");
 function isDoubleEscapeAction(value) {
@@ -43,6 +45,7 @@ function normalizeSettings(raw) {
 	if (typeof obj.autocompleteMaxVisible === "number" && Number.isFinite(obj.autocompleteMaxVisible)) base.autocompleteMaxVisible = Math.max(3, Math.min(20, Math.floor(obj.autocompleteMaxVisible)));
 	if (typeof obj.clearOnShrink === "boolean") base.clearOnShrink = obj.clearOnShrink;
 	if (isTreeFilterMode(obj.treeFilterMode)) base.treeFilterMode = obj.treeFilterMode;
+	if (obj.newSessionPreferencesByGateway && typeof obj.newSessionPreferencesByGateway === "object" && !Array.isArray(obj.newSessionPreferencesByGateway)) base.newSessionPreferencesByGateway = Object.fromEntries(Object.entries(obj.newSessionPreferencesByGateway).map(([gatewayId, preferences]) => [gatewayId, parseNewSessionPreferences(preferences)]));
 	return base;
 }
 /** Load persisted TUI settings from `~/.xopc/tui-settings.json`. */

package/dist/src/tui/tui-startup-resources.js

@@ -1,6 +1,6 @@
 import { resolveStateDir } from "../config/paths-state.js";
-import { init_paths, resolveAgentProfileDir, resolveBundledSkillsDir } from "../config/paths.js";
 import { resolveEffectiveAgentProfileForSession } from "../config/agent-profile.js";
+import { init_paths, resolveAgentProfileDir, resolveBundledSkillsDir } from "../config/paths.js";
 import { resolveBootstrapFilesSync } from "../agent/bootstrap/bootstrap-files.js";
 import { createSkillConfigManager, isSkillEnabled } from "../agent/skills/config.js";
 import { loadSkills } from "../agent/skills/index.js";

package/dist/src/tui/tui-types.d.ts

@@ -57,6 +57,7 @@ export interface SessionInfo {
     displayName?: string;
     effectiveWorkspacePath?: string;
     workingDirectoryLocked?: boolean;
+    projectId?: string;
 }
 /** Mutable state bag for the TUI runtime. */
 export interface TuiState {