@xopcai/xopc 0.0.247 → 0.0.249

package/dist/src/share/site-share-store.js

@@ -1,33 +1,22 @@
-import { resolveStateDir } from "../config/paths-state.js";
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
-import { init_paths } from "../config/paths.js";
+import { requireXopcDatabase } from "../storage/sqlite/connection.js";
+import { runSqliteWriteTransaction } from "../storage/sqlite/transaction.js";
+import { DurableState } from "../storage/sqlite/durable-state.js";
 import { SITE_SHARE_CONFIG_DEFAULTS } from "./site-share-types.js";
 import { isPathUnderWorkspace } from "../gateway/workspace-editor-path.js";
-import { join, relative, resolve } from "node:path";
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { relative, resolve } from "node:path";
 import { randomBytes, randomUUID } from "node:crypto";
 import { lstat, readdir, realpath, stat } from "node:fs/promises";
 //#region src/share/site-share-store.ts
-init_paths();
 init_logger();
 const log = createLogger("SiteShareStore");
-const SITE_SHARES_FILE = "site-shares.json";
 const CLEANUP_INTERVAL_MS = 10 * 6e4;
 const EXPIRED_RETENTION_MS = 1440 * 6e4;
-const MAX_STORED = 200;
-const REQUEST_COUNT_DEBOUNCE_MS = 5e3;
 const SUBDOMAIN_PATTERN = /^[a-z0-9]([a-z0-9-]{0,30}[a-z0-9])?$/;
-function resolveStorePath() {
-	return join(resolveStateDir(), SITE_SHARES_FILE);
-}
 var SiteShareStore = class {
-	shares = /* @__PURE__ */ new Map();
-	byToken = /* @__PURE__ */ new Map();
-	bySubdomain = /* @__PURE__ */ new Map();
+	shares = new DurableState("site-shares");
 	config;
-	dirty = false;
-	debounceTimer = null;
 	cleanupTimer = null;
 	/** Optional cleanup hook invoked when a record is dropped (e.g. delete staging dir). */
 	onCleanup = null;
@@ -36,9 +25,15 @@ var SiteShareStore = class {
 			...SITE_SHARE_CONFIG_DEFAULTS,
 			...config
 		};
-		this.load();
 		this.startCleanupTimer();
 	}
+	saveNew(record) {
+		requireXopcDatabase();
+		runSqliteWriteTransaction(() => {
+			if (this.getActiveShares().length >= this.config.maxActiveSites) throw new Error("Maximum active shares reached");
+			this.shares.set(record.id, record);
+		});
+	}
 	updateConfig(config) {
 		this.config = {
 			...this.config,
@@ -75,10 +70,7 @@ var SiteShareStore = class {
 			uniqueClientCount: 0,
 			maxRequests: params.maxRequests ?? null
 		};
-		this.shares.set(id, record);
-		this.byToken.set(token, id);
-		if (subdomain) this.bySubdomain.set(subdomain, id);
-		this.persistSync();
+		this.saveNew(record);
 		log.info({
 			id,
 			tokenPrefix: token.slice(0, 8),
@@ -132,19 +124,17 @@ var SiteShareStore = class {
 		if (!preferred) return null;
 		const lower = preferred.trim().toLowerCase();
 		if (!SUBDOMAIN_PATTERN.test(lower)) throw new Error("Subdomain must match /^[a-z0-9]([a-z0-9-]{0,30}[a-z0-9])?$/");
-		if (this.bySubdomain.has(lower)) throw new Error(`Subdomain '${lower}' already in use`);
+		if (this.hasSubdomain(lower)) throw new Error(`Subdomain '${lower}' already in use`);
 		return lower;
 	}
 	getById(id) {
 		return this.shares.get(id) ?? null;
 	}
 	getByToken(token) {
-		const id = this.byToken.get(token);
-		return id ? this.shares.get(id) ?? null : null;
+		return this.shares.values().find((record) => record.token === token) ?? null;
 	}
 	getBySubdomain(subdomain) {
-		const id = this.bySubdomain.get(subdomain.toLowerCase());
-		return id ? this.shares.get(id) ?? null : null;
+		return this.shares.values().find((record) => record.subdomain === subdomain.toLowerCase()) ?? null;
 	}
 	/**
 	* Look up a record by token first, then by subdomain. Subdomain label may
@@ -175,134 +165,98 @@ var SiteShareStore = class {
 		};
 		return { valid: true };
 	}
-	/** Increment counters when a request lands. Debounced persist. */
+	/** Increment counters when a request lands. Persisted before returning. */
 	recordRequest(id, clientIp) {
-		const record = this.shares.get(id);
-		if (!record) return;
-		record.requestCount++;
-		const recent = record.recentClientIps ??= [];
-		if (!recent.includes(clientIp)) {
-			recent.unshift(clientIp);
-			if (recent.length > 200) recent.length = 200;
-			record.uniqueClientCount = recent.length;
-		}
-		this.scheduleDebouncedPersist();
+		this.shares.update(id, (record) => {
+			if (record) {
+				record.requestCount++;
+				const recent = record.recentClientIps ??= [];
+				if (!recent.includes(clientIp)) {
+					recent.unshift(clientIp);
+					if (recent.length > 200) recent.length = 200;
+					record.uniqueClientCount = recent.length;
+				}
+			}
+			return {
+				value: record,
+				result: void 0
+			};
+		});
 	}
 	setThumbnailStatus(id, status) {
-		const record = this.shares.get(id);
-		if (!record) return;
-		record.thumbnailStatus = status;
-		if (status === "ready") record.thumbnailGeneratedAt = (/* @__PURE__ */ new Date()).toISOString();
-		if (status === "failed") record.thumbnailFailedAt = (/* @__PURE__ */ new Date()).toISOString();
-		this.persistSync();
+		requireXopcDatabase();
+		return runSqliteWriteTransaction(() => {
+			const record = this.shares.get(id);
+			if (!record) return;
+			record.thumbnailStatus = status;
+			if (status === "ready") record.thumbnailGeneratedAt = (/* @__PURE__ */ new Date()).toISOString();
+			if (status === "failed") record.thumbnailFailedAt = (/* @__PURE__ */ new Date()).toISOString();
+			this.shares.set(record.id, record);
+		});
 	}
 	revoke(id) {
-		const record = this.shares.get(id);
-		if (!record) return false;
-		record.revoked = true;
-		this.persistSync();
-		if (this.onCleanup) try {
-			this.onCleanup(record);
-		} catch (err) {
-			log.warn({
-				err,
-				id
-			}, "Site share cleanup hook threw on revoke");
-		}
-		log.info({
-			id,
-			tokenPrefix: record.token.slice(0, 8)
-		}, "Site share revoked");
-		return true;
+		requireXopcDatabase();
+		return runSqliteWriteTransaction(() => {
+			const record = this.shares.get(id);
+			if (!record) return false;
+			record.revoked = true;
+			this.shares.set(record.id, record);
+			if (this.onCleanup) try {
+				this.onCleanup(record);
+			} catch (err) {
+				log.warn({
+					err,
+					id
+				}, "Site share cleanup hook threw on revoke");
+			}
+			log.info({
+				id,
+				tokenPrefix: record.token.slice(0, 8)
+			}, "Site share revoked");
+			return true;
+		});
 	}
 	revokeMany(ids) {
-		let count = 0;
-		for (const id of ids) {
-			const record = this.shares.get(id);
-			if (record && !record.revoked) {
-				record.revoked = true;
-				count++;
+		requireXopcDatabase();
+		return runSqliteWriteTransaction(() => {
+			let count = 0;
+			for (const id of ids) {
+				const record = this.shares.get(id);
+				if (record && !record.revoked) {
+					record.revoked = true;
+					this.shares.set(record.id, record);
+					count++;
+				}
 			}
-		}
-		if (count > 0) this.persistSync();
-		return count;
+			return count;
+		});
 	}
 	revokeExpired() {
-		const now = Date.now();
-		let count = 0;
-		for (const record of this.shares.values()) if (!record.revoked && now >= new Date(record.expiresAt).getTime()) {
-			record.revoked = true;
-			count++;
-		}
-		if (count > 0) this.persistSync();
-		return count;
-	}
-	update(id, patch) {
-		const record = this.shares.get(id);
-		if (!record) return null;
-		if (patch.extendTtlMs !== void 0) record.expiresAt = new Date(Date.now() + patch.extendTtlMs).toISOString();
-		if (patch.maxRequests !== void 0) record.maxRequests = patch.maxRequests;
-		this.persistSync();
-		return record;
-	}
-	load() {
-		const path = resolveStorePath();
-		if (!existsSync(path)) return;
-		try {
-			const raw = readFileSync(path, "utf8");
-			const data = JSON.parse(raw);
-			if (data.version !== 1 || !Array.isArray(data.shares)) return;
+		requireXopcDatabase();
+		return runSqliteWriteTransaction(() => {
 			const now = Date.now();
-			let cleaned = 0;
-			for (const record of data.shares) {
-				if (now - new Date(record.expiresAt).getTime() > EXPIRED_RETENTION_MS) {
-					cleaned++;
-					continue;
-				}
+			let count = 0;
+			for (const record of this.shares.values()) if (!record.revoked && now >= new Date(record.expiresAt).getTime()) {
+				record.revoked = true;
 				this.shares.set(record.id, record);
-				this.byToken.set(record.token, record.id);
-				if (record.subdomain) this.bySubdomain.set(record.subdomain, record.id);
-			}
-			if (cleaned > 0) {
-				log.info({ cleaned }, `Cleaned ${cleaned} expired site-share records on load`);
-				this.persistSync();
+				count++;
 			}
-		} catch (err) {
-			log.warn({ err }, "Failed to load site-shares.json");
-		}
+			return count;
+		});
 	}
-	persistSync() {
-		const path = resolveStorePath();
-		mkdirSync(resolveStateDir(), { recursive: true });
-		let records = [...this.shares.values()];
-		if (records.length > MAX_STORED) {
-			records.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
-			records = records.slice(0, MAX_STORED);
-			this.shares.clear();
-			this.byToken.clear();
-			this.bySubdomain.clear();
-			for (const r of records) {
-				this.shares.set(r.id, r);
-				this.byToken.set(r.token, r.id);
-				if (r.subdomain) this.bySubdomain.set(r.subdomain, r.id);
-			}
-		}
-		writeFileSync(path, `${JSON.stringify({
-			version: 1,
-			shares: records
-		}, null, 2)}\n`, "utf8");
+	update(id, patch) {
+		requireXopcDatabase();
+		return runSqliteWriteTransaction(() => {
+			const record = this.shares.get(id);
+			if (!record) return null;
+			if (patch.extendTtlMs !== void 0) record.expiresAt = new Date(Date.now() + patch.extendTtlMs).toISOString();
+			if (patch.maxRequests !== void 0) record.maxRequests = patch.maxRequests;
+			this.shares.set(record.id, record);
+			return record;
+		});
 	}
-	scheduleDebouncedPersist() {
-		this.dirty = true;
-		if (this.debounceTimer) return;
-		this.debounceTimer = setTimeout(() => {
-			this.debounceTimer = null;
-			if (this.dirty) {
-				this.dirty = false;
-				this.persistSync();
-			}
-		}, REQUEST_COUNT_DEBOUNCE_MS);
-		this.debounceTimer.unref?.();
+	hasSubdomain(subdomain) {
+		return this.getBySubdomain(subdomain) !== null;
 	}
 	startCleanupTimer() {
 		this.cleanupTimer = setInterval(() => {
@@ -310,8 +264,6 @@ var SiteShareStore = class {
 			let removed = 0;
 			for (const [id, record] of this.shares) if (now - new Date(record.expiresAt).getTime() > EXPIRED_RETENTION_MS) {
 				this.shares.delete(id);
-				this.byToken.delete(record.token);
-				if (record.subdomain) this.bySubdomain.delete(record.subdomain);
 				if (this.onCleanup) try {
 					this.onCleanup(record);
 				} catch (err) {
@@ -322,10 +274,7 @@ var SiteShareStore = class {
 				}
 				removed++;
 			}
-			if (removed > 0) {
-				this.persistSync();
-				log.debug({ removed }, `Cleaned ${removed} expired site shares`);
-			}
+			if (removed > 0) log.debug({ removed }, `Cleaned ${removed} expired site shares`);
 		}, CLEANUP_INTERVAL_MS);
 		this.cleanupTimer.unref?.();
 	}
@@ -334,14 +283,6 @@ var SiteShareStore = class {
 			clearInterval(this.cleanupTimer);
 			this.cleanupTimer = null;
 		}
-		if (this.debounceTimer) {
-			clearTimeout(this.debounceTimer);
-			this.debounceTimer = null;
-		}
-		if (this.dirty) {
-			this.dirty = false;
-			this.persistSync();
-		}
 	}
 };
 async function scanStatic(root, maxFileCount, maxRootDirSize) {

package/dist/src/share/site-share-types.d.ts

@@ -49,10 +49,6 @@ export interface SiteShareRecord {
     thumbnailGeneratedAt?: string;
     thumbnailFailedAt?: string;
 }
-export interface SiteShareStoreData {
-    version: 1;
-    shares: SiteShareRecord[];
-}
 export interface CreateSiteShareParams {
     /** 'static' uses workspace path; 'proxy' uses upstreamUrl. */
     kind: SiteSourceKind;

package/dist/src/storage/sqlite/collaboration-rule-repository.d.ts

@@ -0,0 +1,17 @@
+import { type UserModelScope } from '../../user-model/domain.js';
+export interface CollaborationRule {
+    id: string;
+    category: 'communication' | 'execution' | 'boundary' | 'routine' | 'proactive';
+    status: 'active' | 'disabled' | 'archived';
+    priority: number;
+    scope: UserModelScope;
+    conditions: Record<string, unknown>;
+    statement: string;
+    revisionId: string;
+    createdAt: number;
+    updatedAt: number;
+}
+export declare function getCollaborationRule(id: string): CollaborationRule | undefined;
+export declare function listCollaborationRules(principalId?: string): CollaborationRule[];
+export declare function createCollaborationRule(input: Pick<CollaborationRule, 'category' | 'priority' | 'scope' | 'conditions' | 'statement'>): CollaborationRule;
+export declare function setCollaborationRuleStatus(id: string, status: CollaborationRule['status']): CollaborationRule | undefined;

package/dist/src/storage/sqlite/collaboration-rule-repository.js

@@ -0,0 +1,54 @@
+import { getSqliteDatabase, runSqliteWriteTransaction } from "./transaction.js";
+import { USER_MODEL_PRINCIPAL_ID } from "../../user-model/domain.js";
+import { randomUUID } from "node:crypto";
+//#region src/storage/sqlite/collaboration-rule-repository.ts
+function fromRow(row) {
+	return {
+		id: row.rule_id,
+		category: row.category,
+		status: row.status,
+		priority: row.priority,
+		scope: {
+			type: row.scope_type,
+			...row.scope_id ? { id: row.scope_id } : {}
+		},
+		conditions: JSON.parse(row.conditions_json),
+		statement: row.statement,
+		revisionId: row.current_revision_id,
+		createdAt: row.created_at,
+		updatedAt: row.updated_at
+	};
+}
+function getCollaborationRule(id) {
+	const row = getSqliteDatabase().prepare(`SELECT r.*, v.statement FROM collaboration_rules r
+    JOIN collaboration_rule_revisions v ON v.revision_id = r.current_revision_id
+    WHERE r.rule_id = ?`).get(id);
+	return row ? fromRow(row) : void 0;
+}
+function listCollaborationRules(principalId = USER_MODEL_PRINCIPAL_ID) {
+	return getSqliteDatabase().prepare(`SELECT r.*, v.statement FROM collaboration_rules r
+    JOIN collaboration_rule_revisions v ON v.revision_id = r.current_revision_id
+    WHERE r.principal_id = ? ORDER BY r.priority, r.updated_at DESC`).all(principalId).map(fromRow);
+}
+function createCollaborationRule(input) {
+	if (!input.statement.trim()) throw new Error("Collaboration rule statement is required.");
+	if (input.scope.type === "agent") throw new Error("Agent-scoped collaboration rules are not supported.");
+	const id = randomUUID();
+	const revisionId = randomUUID();
+	const now = Date.now();
+	runSqliteWriteTransaction((db) => {
+		db.prepare(`INSERT INTO collaboration_rules (
+      rule_id, principal_id, category, status, priority, scope_type, scope_id,
+      conditions_json, current_revision_id, created_at, updated_at
+    ) VALUES (?, ?, ?, 'active', ?, ?, ?, ?, ?, ?, ?)`).run(id, USER_MODEL_PRINCIPAL_ID, input.category, input.priority, input.scope.type, input.scope.id ?? null, JSON.stringify(input.conditions), revisionId, now, now);
+		db.prepare(`INSERT INTO collaboration_rule_revisions (
+      revision_id, rule_id, statement, created_by, created_at
+    ) VALUES (?, ?, ?, 'user', ?)`).run(revisionId, id, input.statement.trim(), now);
+	});
+	return getCollaborationRule(id);
+}
+function setCollaborationRuleStatus(id, status) {
+	return getSqliteDatabase().prepare(`UPDATE collaboration_rules SET status = ?, updated_at = ? WHERE rule_id = ?`).run(status, Date.now(), id).changes ? getCollaborationRule(id) : void 0;
+}
+//#endregion
+export { createCollaborationRule, getCollaborationRule, listCollaborationRules, setCollaborationRuleStatus };

package/dist/src/storage/sqlite/connection-wait-repository.d.ts

@@ -0,0 +1,30 @@
+import type { ConnectionCheckpoint, ConnectionNeed, ConnectionWait } from '@xopcai/gateway-contract';
+import { type SessionInput } from './session-input-repository.js';
+export declare function onConnectionWaitChanged(listener: (sessionKey: string) => void): () => void;
+export declare function publishConnectionWait(sessionKey: string): void;
+export declare function getConnectionWait(id: string): ConnectionWait | undefined;
+export declare function getActiveConnectionWait(sessionKey: string): ConnectionWait | undefined;
+export declare function isConnectionSuspended(sessionKey: string, runId: string): boolean;
+export declare function updateConnectionWait(wait: ConnectionWait, expectedVersion: number): ConnectionWait;
+export declare function requireSessionConnection(input: {
+    sessionKey: string;
+    principalId: string;
+    agentId: string;
+    summary: string;
+    needs: ConnectionNeed[];
+    checkpoint?: Omit<ConnectionCheckpoint, 'entryId'>;
+}): {
+    status: 'connection_required' | 'skipped' | 'objective_conflict';
+    waitId?: string;
+};
+/** The input and the wait transition commit together, using the existing queue's unique key. */
+export declare function queueConnectionResolution(wait: ConnectionWait, resolution: 'continued' | 'skipped'): ConnectionWait;
+export declare function consumeConnectionResume(input: SessionInput): boolean;
+export declare function connectionBindings(sessionKey: string): ConnectionNeed[];
+export declare function connectionBinding(sessionKey: string, connectorId: string): string | undefined;
+/** New input wins over an outstanding auto-resume intent, including an already queued resume. */
+export declare function invalidateConnectionResumeIntent(sessionKey: string): void;
+export declare function reviseCurrentConnectionObjective(sessionKey: string, summary: string | undefined): void;
+export declare function cancelConnectionObjective(sessionKey: string): void;
+export declare function getConnectionResumeInput(sessionKey: string, runId: string): SessionInput | undefined;
+export declare function listConnectionWaitsToCheck(): ConnectionWait[];