@xopcai/xopc 0.0.332 → 0.0.334

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

@@ -1,15 +1,23 @@
+import { resolveStateDir } from "../../config/paths-state.js";
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
+import { sessionInputCommandSchema } from "../../../packages/gateway-contract/src/session-input-command.js";
+import { isSessionCommandRejected } from "../../../packages/gateway-contract/src/session-command-rejection.js";
+import { init_src } from "../../../packages/gateway-contract/src/index.js";
+import { init_paths } from "../../config/paths.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";
 import { computeTuiSessionStats } from "../tui-session-stats.js";
 import { createRequire } from "node:module";
+import { join } from "node:path";
 import crypto from "node:crypto";
+import { mkdir, readFile, readdir, rename, unlink, writeFile } from "node:fs/promises";
 //#region src/tui/backends/gateway-realtime-backend.ts
+init_paths();
+init_src();
 init_logger();
 const log = createLogger("TUI:GatewayRealtime");
 const { WebSocket } = createRequire(import.meta.url)("ws");
@@ -49,6 +57,10 @@ var GatewayRealtimeBackend = class {
 	activeRunId = null;
 	observedConversationId = null;
 	chatAbort = null;
+	drafts = /* @__PURE__ */ new Map();
+	pendingInputs = /* @__PURE__ */ new Map();
+	draftDirectory;
+	draftInitialization;
 	onEvent;
 	onConnected;
 	onDisconnected;
@@ -60,6 +72,52 @@ var GatewayRealtimeBackend = class {
 	get connectionLabel() {
 		return this.baseUrl;
 	}
+	async getComposerDraftDirectory() {
+		await this.initializeDrafts();
+		return join(this.draftDirectory, "composers");
+	}
+	initializeDrafts() {
+		return this.draftInitialization ??= (async () => {
+			const response = await gatewayFetch(this.baseUrl, "/api/browser-session", this.credential);
+			if (!response.ok) throw new Error("Gateway identity is unavailable");
+			const identity = await response.json();
+			if (!identity.conversationId) throw new Error("Gateway identity is missing");
+			const directory = join(resolveStateDir(), "client-drafts", crypto.createHash("sha256").update(identity.conversationId).digest("hex"));
+			await mkdir(directory, {
+				recursive: true,
+				mode: 448
+			});
+			for (const file of await readdir(directory)) {
+				if (!/^[0-9a-f-]{36}\.json$/.test(file)) continue;
+				const saved = JSON.parse(await readFile(join(directory, file), "utf8"));
+				const id = file.slice(0, -5);
+				if (saved.creation) this.drafts.set(id, saved.creation);
+				if (saved.command) this.pendingInputs.set(id, sessionInputCommandSchema.parse(saved.command));
+			}
+			this.draftDirectory = directory;
+		})().catch((error) => {
+			this.draftInitialization = void 0;
+			throw error;
+		});
+	}
+	async persistDraft(conversationId) {
+		if (!this.draftDirectory || !/^[0-9a-f-]{36}$/.test(conversationId)) throw new Error("Local conversation storage is unavailable");
+		const path = join(this.draftDirectory, `${conversationId}.json`);
+		const creation = this.drafts.get(conversationId);
+		const command = this.pendingInputs.get(conversationId);
+		if (!creation && !command) {
+			await unlink(path).catch((error) => {
+				if (error.code !== "ENOENT") throw error;
+			});
+			return;
+		}
+		const temporary = `${path}.${crypto.randomUUID()}.tmp`;
+		await writeFile(temporary, JSON.stringify({
+			creation,
+			command
+		}), { mode: 384 });
+		await rename(temporary, path);
+	}
 	start() {
 		this.startRealtime();
 	}
@@ -88,27 +146,97 @@ var GatewayRealtimeBackend = class {
 		if (!res.ok) throw new Error(`Failed to save composer history (${res.status})`);
 		return (await res.json()).item;
 	}
+	async acceptReceipt(conversationId, command, raw) {
+		const payload = raw?.payload;
+		if (payload?.receipt?.conversationId !== conversationId || payload.receipt.clientMessageId !== command.clientMessageId || !payload.session?.transcriptId) throw new Error("Invalid input receipt; pending input retained");
+		this.drafts.delete(conversationId);
+		this.pendingInputs.delete(conversationId);
+		await this.persistDraft(conversationId);
+	}
+	async reconcileInput(conversationId) {
+		const pending = this.pendingInputs.get(conversationId);
+		if (!pending) return;
+		const response = await gatewayFetch(this.baseUrl, `/api/sessions/${encodeURIComponent(conversationId)}/input-receipts/${encodeURIComponent(pending.clientMessageId)}`, this.credential);
+		if (response.status === 404) return;
+		if (!response.ok) throw new Error(`Input confirmation failed (${response.status})`);
+		await this.acceptReceipt(conversationId, pending, await response.json());
+	}
+	async prepareInput(conversationId, clientMessageId, content, delivery, attachments) {
+		const pending = this.pendingInputs.get(conversationId);
+		if (pending) {
+			if (pending.input.content !== content || JSON.stringify(pending.input.attachments) !== JSON.stringify(attachments)) throw new Error("Previous input is awaiting confirmation; retry it before sending different content");
+			return pending;
+		}
+		const creation = this.drafts.get(conversationId);
+		const input = {
+			content,
+			...attachments?.length ? { attachments } : {}
+		};
+		const origin = {
+			type: "system",
+			source: "cli"
+		};
+		let command;
+		if (creation) {
+			if (!creation.model) {
+				const response = await gatewayFetch(this.baseUrl, `/api/models?agentId=${encodeURIComponent(creation.agentId)}`, this.credential);
+				if (!response.ok) throw new Error("Agent model configuration is unavailable");
+				const { payload } = await response.json();
+				const model = payload.models.find((item) => item.id === payload.defaultId);
+				if (!model) throw new Error("Configure a model before sending");
+				creation.model = model.id;
+				creation.thinkingLevel = model.thinking?.initialValue ?? "off";
+			}
+			command = sessionInputCommandSchema.parse({
+				kind: "start",
+				clientMessageId,
+				creation,
+				input,
+				origin
+			});
+		} else {
+			const path = `/api/sessions/${encodeURIComponent(conversationId)}`;
+			const [detailResponse, configResponse] = await Promise.all([gatewayFetch(this.baseUrl, path, this.credential), gatewayFetch(this.baseUrl, `${path}/agent-config`, this.credential)]);
+			if (!detailResponse.ok || !configResponse.ok) throw new Error("Session identity is unavailable");
+			const detail = await detailResponse.json();
+			const config = await configResponse.json();
+			command = sessionInputCommandSchema.parse({
+				kind: "append",
+				clientMessageId,
+				expectedTranscriptId: detail.session.transcriptId,
+				configVersion: config.payload.configVersion,
+				delivery,
+				input,
+				origin
+			});
+		}
+		this.pendingInputs.set(conversationId, command);
+		await this.persistDraft(conversationId);
+		return command;
+	}
 	async sendChat(opts) {
 		this.observedConversationId = opts.conversationId;
 		this.chatAbort?.abort();
 		this.chatAbort = new AbortController();
 		const signal = this.chatAbort.signal;
 		const clientMessageId = crypto.randomUUID();
+		const command = await this.prepareInput(opts.conversationId, clientMessageId, opts.message, "next", opts.attachments);
 		const res = await gatewayFetch(this.baseUrl, `/api/sessions/${encodeURIComponent(opts.conversationId)}/inputs`, this.credential, {
 			method: "POST",
-			body: JSON.stringify({
-				clientMessageId,
-				delivery: "next",
-				content: opts.message.trimStart().startsWith("/") ? opts.message : prependEnvelopeTimestamp(opts.message),
-				attachments: opts.attachments,
-				thinking: opts.thinking
-			}),
+			body: JSON.stringify(command),
 			signal
 		});
 		const json = await res.json().catch(() => null);
-		if (!res.ok) throw new Error(json?.error?.message ?? `Gateway error: ${res.status}`);
-		const state = json?.payload?.state;
-		const own = state?.inputs?.find((input) => input.clientMessageId === clientMessageId);
+		if (!res.ok) {
+			if (isSessionCommandRejected(res.status, json)) {
+				this.pendingInputs.delete(opts.conversationId);
+				await this.persistDraft(opts.conversationId);
+			}
+			throw new Error(json?.error?.message ?? `Gateway error: ${res.status}`);
+		}
+		await this.acceptReceipt(opts.conversationId, command, json);
+		const state = json?.payload?.inputState;
+		const own = state?.inputs?.find((input) => input.clientMessageId === command.clientMessageId);
 		const runId = state?.activeRunId ?? crypto.randomUUID();
 		if (state?.activeRunId && own?.id === state.activeInputId) this.resumeChat({
 			conversationId: opts.conversationId,
@@ -121,7 +249,7 @@ var GatewayRealtimeBackend = class {
 			const params = new URLSearchParams();
 			params.set("q", query);
 			params.set("limit", String(options?.limit ?? 15));
-			const context = await gatewayFetch(this.baseUrl, `/api/files/contexts/session/${encodeURIComponent(conversationId)}`, this.credential);
+			const context = await gatewayFetch(this.baseUrl, this.drafts.has(conversationId) ? `/api/files/contexts/${this.drafts.get(conversationId).projectId ? "project" : "agent"}/${encodeURIComponent(this.drafts.get(conversationId).projectId || this.drafts.get(conversationId).agentId)}` : `/api/files/contexts/session/${encodeURIComponent(conversationId)}`, this.credential);
 			if (!context.ok) return [];
 			const contextJson = await context.json();
 			if (!contextJson.space?.id) return [];
@@ -144,7 +272,11 @@ var GatewayRealtimeBackend = class {
 		}
 	}
 	async getReviewContext(conversationId) {
-		const params = new URLSearchParams({ conversationId });
+		const draft = this.drafts.get(conversationId);
+		const params = new URLSearchParams(draft ? {
+			agentId: draft.agentId,
+			...draft.projectId ? { projectId: draft.projectId } : {}
+		} : { conversationId });
 		const res = await gatewayFetch(this.baseUrl, `/api/review/context?${params.toString()}`, this.credential);
 		const json = await res.json().catch(() => ({}));
 		if (!res.ok || !json.ok || !json.payload) throw new Error(json.error?.message ?? `Review context failed (${res.status})`);
@@ -177,7 +309,10 @@ var GatewayRealtimeBackend = class {
 	async resolveStartupProject(opts) {
 		const res = await gatewayFetch(this.baseUrl, "/api/projects/resolve-workspace", this.credential, {
 			method: "POST",
-			body: JSON.stringify(opts)
+			body: JSON.stringify({
+				...opts,
+				...this.drafts.has(opts.conversationId) ? { conversationId: void 0 } : {}
+			})
 		});
 		const json = await res.json().catch(() => ({}));
 		if (!res.ok || json.ok === false) throw new Error(json.error ?? `Project workspace resolve failed (${res.status})`);
@@ -212,26 +347,35 @@ var GatewayRealtimeBackend = class {
 	async submitChatInput(opts) {
 		this.observedConversationId = opts.conversationId;
 		try {
+			const command = await this.prepareInput(opts.conversationId, crypto.randomUUID(), opts.message, opts.delivery);
 			const res = await gatewayFetch(this.baseUrl, `/api/sessions/${encodeURIComponent(opts.conversationId)}/inputs`, this.credential, {
 				method: "POST",
-				body: JSON.stringify({
-					clientMessageId: crypto.randomUUID(),
-					delivery: opts.delivery,
-					content: opts.message
-				})
+				body: JSON.stringify(command)
 			});
-			if (!res.ok) return { ok: false };
+			if (!res.ok) {
+				if (isSessionCommandRejected(res.status, await res.json().catch(() => null))) {
+					this.pendingInputs.delete(opts.conversationId);
+					await this.persistDraft(opts.conversationId);
+				}
+				return { ok: false };
+			}
 			const json = await res.json();
+			await this.acceptReceipt(opts.conversationId, command, json);
 			return {
 				ok: json.ok === true,
 				effectiveDelivery: json.payload?.effectiveDelivery,
-				state: json.payload?.state
+				state: json.payload?.inputState
 			};
 		} catch {
 			return { ok: false };
 		}
 	}
 	async getChatInputState(conversationId) {
+		if (this.drafts.has(conversationId)) return {
+			conversationId,
+			revision: 0,
+			inputs: []
+		};
 		const res = await gatewayFetch(this.baseUrl, `/api/sessions/${encodeURIComponent(conversationId)}/input-state`, this.credential);
 		if (!res.ok) throw new Error(`Input state failed (${res.status})`);
 		return (await res.json()).payload;
@@ -266,7 +410,7 @@ var GatewayRealtimeBackend = class {
 			connectors: []
 		};
 		try {
-			const res = await gatewayFetch(this.baseUrl, `/api/tui/startup-resources?conversationId=${encodeURIComponent(conversationId)}`, this.credential);
+			const res = await gatewayFetch(this.baseUrl, `/api/tui/startup-resources?${this.drafts.has(conversationId) ? `agentId=${encodeURIComponent(this.drafts.get(conversationId).agentId)}` : `conversationId=${encodeURIComponent(conversationId)}`}`, this.credential);
 			if (!res.ok) return empty;
 			const json = await res.json();
 			return {
@@ -286,6 +430,8 @@ var GatewayRealtimeBackend = class {
 		}
 	}
 	async loadHistory(opts) {
+		await this.reconcileInput(opts.conversationId);
+		if (this.drafts.has(opts.conversationId)) return { messages: [] };
 		try {
 			const res = await gatewayFetch(this.baseUrl, `/api/sessions/${encodeURIComponent(opts.conversationId)}?include=transcriptRows`, this.credential);
 			if (!res.ok) return { messages: [] };
@@ -393,7 +539,6 @@ var GatewayRealtimeBackend = class {
 				key: s.key,
 				agentId: s.agentId,
 				sourceChannel: s.sourceChannel,
-				generatedShell: s.customData?.genericNewChatShell === true,
 				displayName: s.name,
 				updatedAt: s.updatedAt ? Date.parse(s.updatedAt) : void 0,
 				totalTokens: s.estimatedTokens ?? null,
@@ -446,18 +591,27 @@ var GatewayRealtimeBackend = class {
 		return { agentId: typeof saved === "string" && saved.trim() ? saved.trim().toLowerCase() : target };
 	}
 	async createConversation(agentId, conversationId) {
-		const res = await gatewayFetch(this.baseUrl, "/api/sessions", this.credential, {
-			method: "POST",
-			body: JSON.stringify({
-				agentId,
-				conversationId,
-				channel: "tui"
-			})
+		const id = conversationId ?? crypto.randomUUID();
+		this.drafts.set(id, {
+			agentId,
+			projectId: null,
+			execution: null,
+			temporary: false,
+			model: "",
+			thinkingLevel: "off"
 		});
-		if (!res.ok) throw new Error(`Conversation creation failed (${res.status})`);
-		return (await res.json()).conversationId;
+		await this.persistDraft(id);
+		return id;
 	}
 	async getSessionInfo(conversationId) {
+		await this.reconcileInput(conversationId);
+		const draft = this.drafts.get(conversationId);
+		if (draft) return {
+			agentId: draft.agentId,
+			model: draft.model,
+			thinkingLevel: draft.thinkingLevel,
+			projectId: draft.projectId ?? void 0
+		};
 		const out = {};
 		try {
 			const sessionPath = `/api/sessions/${encodeURIComponent(conversationId)}`;
@@ -467,7 +621,6 @@ var GatewayRealtimeBackend = class {
 				session = (await sessionRes.json()).session;
 				if (session) {
 					out.agentId = session.agentId;
-					out.generatedShell = session.customData?.genericNewChatShell === true;
 					if (session.name) out.displayName = session.name;
 					if (session.estimatedTokens != null) out.totalTokens = session.estimatedTokens;
 					if (session.projectId?.trim()) out.projectId = session.projectId.trim();
@@ -688,6 +841,33 @@ var GatewayRealtimeBackend = class {
 		return { ok: true };
 	}
 	async patchSession(conversationId, patch) {
+		const draft = this.drafts.get(conversationId);
+		if (draft) {
+			if (this.pendingInputs.has(conversationId)) throw new Error("First input is awaiting confirmation");
+			if (typeof patch.workingDirectory === "string") {
+				const resolved = await this.resolveStartupProject({
+					workspacePath: patch.workingDirectory,
+					conversationId,
+					agentId: draft.agentId,
+					autoCreate: true
+				});
+				if (!resolved.project) throw new Error("Working directory could not be bound to a project");
+				draft.projectId = resolved.project.id;
+				draft.execution = { mode: "local_checkout" };
+			}
+			if (typeof patch.model === "string") draft.model = patch.model;
+			if (typeof patch.thinkingLevel === "string") draft.thinkingLevel = patch.thinkingLevel;
+			if (typeof patch.projectId === "string") {
+				draft.projectId = patch.projectId;
+				draft.execution = { mode: "local_checkout" };
+			}
+			if (patch.projectId === null) {
+				draft.projectId = null;
+				draft.execution = null;
+			}
+			await this.persistDraft(conversationId);
+			return;
+		}
 		const res = await gatewayFetch(this.baseUrl, `/api/sessions/${encodeURIComponent(conversationId)}/agent-config`, this.credential, {
 			method: "PATCH",
 			body: JSON.stringify(patch)
@@ -745,6 +925,7 @@ var GatewayRealtimeBackend = class {
 				return url.toString();
 			},
 			issueTicket: async () => {
+				await this.initializeDrafts();
 				const response = await gatewayFetch(this.baseUrl, "/api/realtime/tickets", this.credential, {
 					method: "POST",
 					body: JSON.stringify({

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

@@ -37,7 +37,6 @@ export interface TuiComposerHistoryItem {
 export interface TuiSessionItem {
     agentId?: string;
     sourceChannel?: string;
-    generatedShell?: boolean;
     key: string;
     updatedAt?: number | null;
     model?: string | null;
@@ -193,6 +192,7 @@ export interface TuiBackend {
     getActiveSignal?(): AbortSignal | undefined;
     /** Global composer history, shared across sessions and clients. */
     getComposerInputHistory(): Promise<TuiComposerHistoryItem[]>;
+    getComposerDraftDirectory(): Promise<string>;
     /** Persist one submitted chat input. */
     recordComposerInputHistory(text: string): Promise<TuiComposerHistoryItem>;
     /** Send a chat message, returns the run id. */

package/dist/src/tui/tui-chat-input-state.d.ts

@@ -3,6 +3,7 @@ export type TuiChatInputStatus = 'queued' | 'running' | 'injecting' | 'completed
 export interface TuiChatInput {
     id: string;
     content: string;
+    attachments?: unknown[];
     requestedDelivery: TuiChatInputDelivery;
     effectiveDelivery: TuiChatInputDelivery;
     status: TuiChatInputStatus;

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

@@ -2,8 +2,8 @@ import { closeXopcDatabase, isXopcDatabaseOpen, openXopcDatabase } from "../stor
 import { TaskRepository } from "../tasks/task-repository.js";
 import { getSessionMetadata } from "../storage/sqlite/session-read-repository.js";
 import { init_sqlite } from "../storage/sqlite/index.js";
-import { init_agent_session_key, isValidAgentId, normalizeAgentId } from "../routing/agent-session-key.js";
 import { resolveConfigPath } from "../config/paths.js";
+import { init_agent_session_key, isValidAgentId, normalizeAgentId } from "../routing/agent-session-key.js";
 import { init_providers, providerSupportsOAuth } from "../providers/index.js";
 import { ProjectService } from "../projects/project-service.js";
 import { isValidProjectAgentId, normalizeProjectAgentId } from "../projects/project-agent.js";

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

@@ -29,7 +29,6 @@ function sessionMetadataToTuiItem(meta) {
 		key: meta.key,
 		agentId: meta.agentId,
 		sourceChannel: meta.sourceChannel,
-		generatedShell: meta.customData?.genericNewChatShell === true,
 		displayName: meta.name,
 		updatedAt: Date.parse(meta.updatedAt),
 		totalTokens: meta.estimatedTokens ?? null,

package/dist/src/tui/tui-startup-resources.d.ts

@@ -1,5 +1,6 @@
 import type { Config } from '../config/schema.js';
 import type { TuiStartupResources } from './tui-backend.js';
 export declare function collectTuiStartupResources(config: Config, conversationId?: string, options?: {
+    agentId?: string;
     isWorkspaceTrusted?: (workspaceDir: string) => boolean;
 }): TuiStartupResources;

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

@@ -1,6 +1,6 @@
 import { resolveStateDir } from "../config/paths-state.js";
-import { resolveEffectiveAgentProfileForSession } from "../config/agent-profile.js";
 import { init_paths, resolveAgentProfileDir, resolveBundledSkillsDir } from "../config/paths.js";
+import { resolveEffectiveAgentProfile, resolveEffectiveAgentProfileForSession } from "../config/agent-profile.js";
 import { resolveBootstrapFilesSync } from "../agent/bootstrap/bootstrap-files.js";
 import { listConnectorInstances } from "../connectors/instances.js";
 import { createSkillConfigManager, isSkillEnabled } from "../agent/skills/config.js";
@@ -15,7 +15,7 @@ function uniqueSorted(values) {
 	return [...new Set([...values].map((value) => value.trim()).filter(Boolean))].sort((a, b) => a.localeCompare(b));
 }
 function collectTuiStartupResources(config, conversationId, options = {}) {
-	const profile = resolveEffectiveAgentProfileForSession(conversationId);
+	const profile = options.agentId ? resolveEffectiveAgentProfile(options.agentId) : resolveEffectiveAgentProfileForSession(conversationId);
 	const profileDir = resolveAgentProfileDir(profile.agentId);
 	const workspaceDir = profile.resolvedWorkspacePath || getWorkspacePath(config);
 	const context = uniqueSorted(resolveBootstrapFilesSync({

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

@@ -47,7 +47,6 @@ export interface TuiRunStatus {
 /** Session metadata shown in the TUI footer. */
 export interface SessionInfo {
     agentId?: string;
-    generatedShell?: boolean;
     model?: string;
     modelProvider?: string;
     thinkingLevel?: string;