@xopcai/xopc 0.0.303 → 0.0.306

package/dist/src/imports/inventory.js

@@ -93,7 +93,21 @@ async function scanProduct(service, source, owner = "gateway-owner") {
 		});
 		for (const candidate of relevant.candidates) {
 			if (candidate.kind === "mcp") {
-				inventory.notices.push(`${candidate.name}: reconnect this tool in Connections.`);
+				inventory.candidates.push({
+					id: candidate.id,
+					kind: "connection",
+					parentId: parent?.id,
+					name: candidate.name,
+					description: candidate.description,
+					displayPath: candidate.location,
+					location: candidate.location,
+					scope: candidate.scope,
+					status: candidate.compatibility === "needs_setup" ? "requires_setup" : "blocked",
+					reason: candidate.findings.join("; ") || void 0,
+					suggested: false,
+					candidate,
+					scanId: scan.id
+				});
 				continue;
 			}
 			const item = {
@@ -192,7 +206,7 @@ function previewInventoryItem(service, owner, inventoryId, itemId) {
 		text: item.reason ?? "",
 		truncated: false
 	};
-	const text = item.kind === "context" ? item.candidate?.content ?? "" : item.kind === "skill" ? Buffer.from(service.readSnapshot(item.scanId, item.id).find((f) => f.path === "SKILL.md").data, "base64").toString("utf8") : item.displayPath;
+	const text = item.kind === "context" ? item.candidate?.content ?? "" : item.kind === "skill" ? Buffer.from(service.readSnapshot(item.scanId, item.id).find((f) => f.path === "SKILL.md").data, "base64").toString("utf8") : item.kind === "connection" ? JSON.stringify(item.candidate?.mcp ?? {}, null, 2) : item.displayPath;
 	return {
 		text: text.slice(0, 2e4),
 		truncated: text.length > 2e4

package/dist/src/imports/productImport.js

@@ -30,7 +30,7 @@ function selectedItems(inventory, ids) {
 	if (!ids.length || new Set(ids).size !== ids.length) throw new ImportError("invalid_selection", "Select at least one item; duplicate selections are not allowed");
 	return ids.map((id) => {
 		const item = inventory.candidates.find((c) => c.id === id);
-		if (!item || item.status === "blocked" || item.status === "existing" && item.kind !== "project") throw new ImportError("invalid_selection", "Select available items from this list");
+		if (!item || item.kind === "connection" || item.status === "blocked" || item.status === "requires_setup" || item.status === "existing" && item.kind !== "project") throw new ImportError("invalid_selection", "Select available items from this list");
 		if (item.parentId && !ids.includes(item.parentId)) throw new ImportError("missing_parent", "Select the project entry along with its contents");
 		return item;
 	}).sort((a, b) => Number(b.kind === "project") - Number(a.kind === "project"));
@@ -55,7 +55,7 @@ async function preflight(service, inventory, items, retry) {
 				if (digest(readRegularFile(item.location, 128 * 1024).toString("utf8").trim()) !== candidate.hash) stale();
 				const projectId = parent ? projects.findByWorkspaceRoot(parent.location)?.id : void 0;
 				if ((!parent || projectId) && existingContext(candidate, projectId)) stale();
-			} else {
+			} else if (item.kind === "skill") {
 				if (parent && !service.isWorkspaceTrusted(parent.location)) stale();
 				if (fileHash(readTree(item.location)) !== candidate.hash) stale();
 				service.readSnapshot(item.scanId, candidate.id);
@@ -69,7 +69,7 @@ async function preflight(service, inventory, items, retry) {
 					projectId: parent?.projectId
 				});
 				if ([...existing.flatMap((e) => [e.name, e.directory]), ...reserved].some((n) => n.toLowerCase() === item.targetName.toLowerCase())) stale();
-			}
+			} else throw new ImportError("invalid_selection", "Connections must be configured separately");
 		} catch (error) {
 			if (error instanceof ImportError && error.code === "inventory_stale") throw error;
 			stale();
@@ -115,7 +115,7 @@ async function execute(service, repo, inventory, run) {
 				entry.status = status === "created" ? "imported" : "existing";
 				persist();
 			});
-			else {
+			else if (item.kind === "skill") {
 				const key = `${run.id}:${item.id}`;
 				let job = service.jobByKey(key);
 				if (!job) {
@@ -143,7 +143,7 @@ async function execute(service, repo, inventory, run) {
 				if (!["active", "skipped"].includes(published.status)) throw new ImportError("publish_failed", published.error ?? "Could not publish the skill. Retry this item.");
 				entry.targetId = join(item.targetRoot, item.targetName);
 				entry.status = published.status === "active" ? "imported" : "existing";
-			}
+			} else throw new ImportError("invalid_selection", "Connections must be configured separately");
 		} catch (error) {
 			entry.status = "failed";
 			delete entry.targetId;

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

@@ -70,10 +70,10 @@ export declare class ImportError extends Error {
     readonly status: 400 | 403 | 404 | 409 | 413;
     constructor(code: string, message: string, status?: 400 | 403 | 404 | 409 | 413);
 }
-export type InventoryStatus = 'ready' | 'existing' | 'conflict' | 'blocked';
+export type InventoryStatus = 'ready' | 'existing' | 'conflict' | 'requires_setup' | 'blocked';
 export interface InventoryItem {
     id: string;
-    kind: 'skill' | 'context' | 'project';
+    kind: 'skill' | 'context' | 'project' | 'connection';
     parentId?: string;
     name: string;
     description: string;
@@ -112,7 +112,7 @@ export interface ImportSelection {
 }
 export interface ImportRunItem {
     candidateId: string;
-    kind: InventoryItem['kind'];
+    kind: Exclude<InventoryItem['kind'], 'connection'>;
     name: string;
     status: 'pending' | 'imported' | 'existing' | 'failed';
     targetId?: string;

package/dist/src/infra/exec.d.ts

@@ -1,4 +1,4 @@
-import { spawn } from 'node:child_process';
+import type { ChildProcess } from 'node:child_process';
 export type ExecResult = {
     stdout: string;
     stderr: string;
@@ -13,4 +13,4 @@ export type ExecOptions = {
 export declare function runExec(file: string, args: string[], opts?: ExecOptions): Promise<ExecResult>;
 export declare function spawnDetached(file: string, args: string[], opts: {
     stdio?: 'ignore' | 'pipe';
-}): ReturnType<typeof spawn>;
+}): ChildProcess;

package/dist/src/infra/exec.js

@@ -1,37 +1,42 @@
-import { execFile, spawn } from "node:child_process";
+import { ProcessExitError } from "../process/process-spec.js";
+import { runProcess, spawnProcess } from "../process/run-process.js";
 //#region src/infra/exec.ts
-function execFileAsync(file, args, opts) {
-	return new Promise((resolve, reject) => {
-		execFile(file, args, {
-			encoding: "utf8",
-			maxBuffer: opts.maxBuffer ?? 1024 * 1024,
-			cwd: opts.cwd,
-			env: opts.env,
-			timeout: opts.timeoutMs
-		}, (err, stdout, stderr) => {
-			if (err) {
-				const enriched = err;
-				enriched.stdout = typeof stdout === "string" ? stdout : String(stdout ?? "");
-				enriched.stderr = typeof stderr === "string" ? stderr : String(stderr ?? "");
-				reject(enriched);
-				return;
-			}
-			resolve({
-				stdout: typeof stdout === "string" ? stdout : String(stdout ?? ""),
-				stderr: typeof stderr === "string" ? stderr : String(stderr ?? "")
-			});
-		});
-	});
-}
 /** Run a subprocess and capture stdout/stderr (OpenClaw-aligned). */
 async function runExec(file, args, opts = {}) {
-	return execFileAsync(file, args, opts);
+	const result = await runProcess({
+		program: file,
+		args,
+		cwd: opts.cwd,
+		env: opts.env,
+		timeoutMs: opts.timeoutMs,
+		maxOutputBytes: opts.maxBuffer,
+		terminationPolicy: "tree"
+	});
+	if (result.exitCode !== 0) {
+		const error = new ProcessExitError({
+			program: file,
+			args
+		}, result);
+		error.stdout = result.stdout;
+		error.stderr = result.stderr;
+		throw error;
+	}
+	return {
+		stdout: result.stdout,
+		stderr: result.stderr
+	};
 }
 function spawnDetached(file, args, opts) {
-	return spawn(file, args, {
-		stdio: opts.stdio ?? "ignore",
+	const handle = spawnProcess({
+		program: file,
+		args,
 		detached: false
 	});
+	if (opts.stdio === "ignore") {
+		handle.child.stdout?.resume();
+		handle.child.stderr?.resume();
+	}
+	return handle.child;
 }
 //#endregion
 export { runExec, spawnDetached };

package/dist/src/infra/gateway-processes.js

@@ -1,5 +1,5 @@
-import { listPortListeners } from "../gateway/ports.js";
 import { isGatewayArgv, parseProcCmdline } from "./gateway-process-argv.js";
+import { listPortListeners } from "../gateway/ports.js";
 import fs from "node:fs";
 import { spawnSync } from "node:child_process";
 //#region src/infra/gateway-processes.ts

package/dist/src/infra/run-command.js

@@ -1,11 +1,6 @@
-import { spawn } from "node:child_process";
+import { runProcess } from "../process/run-process.js";
 //#region src/infra/run-command.ts
 const MAX_CAPTURE_BYTES = 512 * 1024;
-function appendCaptured(current, chunk) {
-	const next = current + chunk.toString();
-	if (next.length <= MAX_CAPTURE_BYTES) return next;
-	return next.slice(-MAX_CAPTURE_BYTES);
-}
 function createDefaultCommandRunner() {
 	return (argv, options) => runCommandWithTimeout(argv, options);
 }
@@ -16,50 +11,20 @@ function runCommandWithTimeout(argv, options) {
 		stdout: "",
 		stderr: "empty argv"
 	});
-	return new Promise((resolve) => {
-		const child = spawn(command, args, {
-			cwd: options.cwd,
-			env: options.env ?? process.env,
-			stdio: [
-				"ignore",
-				"pipe",
-				"pipe"
-			],
-			...process.platform === "win32" ? { shell: process.env.ComSpec && process.env.ComSpec.trim() || "cmd.exe" } : {}
-		});
-		let stdout = "";
-		let stderr = "";
-		let settled = false;
-		const finish = (result) => {
-			if (settled) return;
-			settled = true;
-			clearTimeout(timeoutId);
-			resolve(result);
-		};
-		const timeoutId = setTimeout(() => {
-			child.kill("SIGTERM");
-		}, options.timeoutMs);
-		child.stdout?.on("data", (chunk) => {
-			stdout = appendCaptured(stdout, chunk);
-		});
-		child.stderr?.on("data", (chunk) => {
-			stderr = appendCaptured(stderr, chunk);
-		});
-		child.on("error", (err) => {
-			finish({
-				code: null,
-				stdout,
-				stderr: stderr || err.message
-			});
-		});
-		child.on("close", (code) => {
-			finish({
-				code,
-				stdout,
-				stderr
-			});
-		});
-	});
+	return runProcess({
+		program: command,
+		args,
+		cwd: options.cwd,
+		env: options.env,
+		timeoutMs: options.timeoutMs,
+		maxOutputBytes: MAX_CAPTURE_BYTES,
+		terminationPolicy: "tree",
+		...process.platform === "win32" ? { shell: process.env.ComSpec && process.env.ComSpec.trim() || "cmd.exe" } : {}
+	}).then((result) => ({
+		code: result.exitCode,
+		stdout: result.stdout,
+		stderr: result.stderr
+	}));
 }
 //#endregion
 export { createDefaultCommandRunner, runCommandWithTimeout };

package/dist/src/infra/update-restart.js

@@ -4,8 +4,8 @@ import { init_paths, resolveConfigPath } from "../config/paths.js";
 import { init_loader, loadConfig } from "../config/loader.js";
 import { isRestartEnabled } from "../config/commands.flags.js";
 import { resolveGatewayService } from "../daemon/service.js";
-import { authorizeGatewaySigusr1Restart, writeGatewayRestartIntentSync } from "./restart.js";
 import { findVerifiedGatewayListenerPidsOnPortSync, signalVerifiedGatewayPidSync } from "./gateway-processes.js";
+import { authorizeGatewaySigusr1Restart, writeGatewayRestartIntentSync } from "./restart.js";
 import { refreshGatewayServiceAfterUpdate } from "./update-service-refresh.js";
 //#region src/infra/update-restart.ts
 init_loader();

package/dist/src/infra/update-runner.js

@@ -1,11 +1,11 @@
 import { runPostUpdateExtensionSync } from "../extensions/update.js";
-import "./update-channels.js";
-import { compareSemver, resolveNpmChannelTag } from "./update-check.js";
 import { readPackageName, readPackageVersion } from "./package-json.js";
 import { createDefaultCommandRunner, runCommandWithTimeout } from "./run-command.js";
 import { XOPC_PACKAGE_NAME, cleanupGlobalRenameDirs, createGlobalInstallEnv, detectGlobalInstallManagerForRoot, resolveGlobalInstallSpec, resolveGlobalInstallTarget } from "./update-global.js";
 import { runGlobalPackageUpdateSteps } from "./package-update-steps.js";
 import { resolveStableNodePath } from "./stable-node-path.js";
+import "./update-channels.js";
+import { compareSemver, resolveNpmChannelTag } from "./update-check.js";
 import { trimLogTail } from "./update-log.js";
 import { maybeRestartGatewayAfterUpdate } from "./update-restart.js";
 import path from "node:path";

package/dist/src/infra/update-startup.js

@@ -3,9 +3,9 @@ import { init_paths_state, resolveUpdateCheckStatePath } from "../config/paths-s
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { init_write_file_atomic, writeTextAtomic } from "./write-file-atomic.js";
-import { acquireUpdateLock } from "./update-lock.js";
 import { normalizeUpdateChannel } from "./update-channels.js";
 import { compareSemver, detectInstallKind, resolveNpmChannelTag, resolvePackageRoot } from "./update-check.js";
+import { acquireUpdateLock } from "./update-lock.js";
 import { createHash, randomUUID } from "node:crypto";
 import { readFile } from "node:fs/promises";
 //#region src/infra/update-startup.ts

package/dist/src/knowledge/connected-knowledge-pipeline.js

@@ -2,7 +2,7 @@ import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { claimKnowledgeSourceItems, completeKnowledgeSourceItemSynthesis, listKnowledgeSourceItems, pruneBoundedKnowledgeSourceItems } from "../storage/sqlite/knowledge-repository.js";
 import "../storage/sqlite/index.js";
-import { listKnowledgeItems, setKnowledgeStatus, writeKnowledgeItem } from "../knowledge-memory/repository.js";
+import { listKnowledgeItems, transitionKnowledgeStatus, writeKnowledgeItem } from "../knowledge-memory/repository.js";
 import "../knowledge-memory/index.js";
 import { randomUUID } from "node:crypto";
 //#region src/knowledge/connected-knowledge-pipeline.ts
@@ -54,7 +54,12 @@ var ConnectedKnowledgePipeline = class {
 				limit: 2e3
 			}).find((entry) => entry.canonicalKey === `source-item:${item.sourceInstanceId}:${item.externalId}`);
 			if (item.deletedAt) {
-				if (existing) setKnowledgeStatus(existing.id, "archived");
+				if (existing) transitionKnowledgeStatus({
+					id: existing.id,
+					status: "archived",
+					actor: "runtime",
+					reason: "Connected source item was deleted."
+				});
 				completeKnowledgeSourceItemSynthesis({
 					itemId: item.id,
 					workerId: this.workerId,
@@ -139,7 +144,12 @@ var ConnectedKnowledgePipeline = class {
 			recordClass: "source_index",
 			limit: 2e3
 		})) if (typeof item.source.sourceItemId === "string" && expiredIds.has(item.source.sourceItemId)) {
-			if (setKnowledgeStatus(item.id, "archived")) derivedDeleted += 1;
+			if (transitionKnowledgeStatus({
+				id: item.id,
+				status: "archived",
+				actor: "maintenance",
+				reason: "Connected source retention window expired."
+			})) derivedDeleted += 1;
 		}
 		return {
 			rawDeleted: pruneBoundedKnowledgeSourceItems(sourceInstanceId, olderThanMs),

package/dist/src/knowledge-memory/domain.d.ts

@@ -1,9 +1,16 @@
 import type { UserModelScope } from '../user-model/domain.js';
 export type KnowledgeKind = 'project_fact' | 'workspace_fact' | 'decision' | 'task_lesson' | 'commitment' | 'open_question' | 'episode' | 'note';
 export type KnowledgeStatus = 'candidate' | 'active' | 'needs_review' | 'stale' | 'archived' | 'rejected';
+export type KnowledgeReviewAction = 'approve' | 'edit_and_approve' | 'reject' | 'archive';
+export type KnowledgeStatusActor = 'user' | 'agent' | 'runtime' | 'maintenance' | 'migration';
 export type KnowledgeOriginClass = 'owner' | 'agent' | 'system' | 'untrusted';
 export type KnowledgeRecordClass = 'memory' | 'source_index';
-export type KnowledgeSource = 'session' | 'workspace' | 'project' | 'connector';
+export type KnowledgeVisibilityScope = UserModelScope['type'];
+export type KnowledgeContentSource = 'memory' | 'local_import' | 'connector';
+export interface KnowledgeReadPolicy {
+    scopes: readonly KnowledgeVisibilityScope[];
+    contentSources: readonly KnowledgeContentSource[];
+}
 export interface KnowledgeItem {
     id: string;
     principalId: string;
@@ -34,3 +41,12 @@ export interface KnowledgeVisibilityContext {
     projectId?: string;
     conversationId: string;
 }
+export interface KnowledgeStatusEvent {
+    id: string;
+    knowledgeId: string;
+    fromStatus?: KnowledgeStatus;
+    toStatus: KnowledgeStatus;
+    actor: KnowledgeStatusActor;
+    reason: string;
+    createdAt: number;
+}

package/dist/src/knowledge-memory/index.js

@@ -1,2 +1,2 @@
-import { getKnowledgeItem, knowledgeSourceAllowed, listKnowledgeItems, searchKnowledgeItems, setKnowledgeStatus, writeKnowledgeItem } from "./repository.js";
-export { getKnowledgeItem, knowledgeSourceAllowed, listKnowledgeItems, searchKnowledgeItems, setKnowledgeStatus, writeKnowledgeItem };
+import { KnowledgeReviewConflictError, classifyKnowledgeContentSource, getKnowledgeItem, knowledgeItemAllowed, listKnowledgeItems, listKnowledgeStatusEvents, reviewKnowledgeItem, searchKnowledgeItems, transitionKnowledgeStatus, writeKnowledgeItem } from "./repository.js";
+export { KnowledgeReviewConflictError, classifyKnowledgeContentSource, getKnowledgeItem, knowledgeItemAllowed, listKnowledgeItems, listKnowledgeStatusEvents, reviewKnowledgeItem, searchKnowledgeItems, transitionKnowledgeStatus, writeKnowledgeItem };

package/dist/src/knowledge-memory/repository.d.ts

@@ -1,5 +1,5 @@
 import { type UserModelScope } from '../user-model/domain.js';
-import type { KnowledgeItem, KnowledgeKind, KnowledgeOriginClass, KnowledgeRecordClass, KnowledgeSource, KnowledgeStatus, KnowledgeVisibilityContext } from './domain.js';
+import type { KnowledgeItem, KnowledgeKind, KnowledgeOriginClass, KnowledgeRecordClass, KnowledgeContentSource, KnowledgeReadPolicy, KnowledgeStatus, KnowledgeReviewAction, KnowledgeStatusActor, KnowledgeStatusEvent, KnowledgeVisibilityContext } from './domain.js';
 export interface WriteKnowledgeInput {
     principalId?: string;
     kind: KnowledgeKind;
@@ -23,6 +23,9 @@ export interface WriteKnowledgeInput {
     replaceExisting?: boolean;
     now?: number;
 }
+export declare class KnowledgeReviewConflictError extends Error {
+    constructor(message: string);
+}
 export declare function writeKnowledgeItem(input: WriteKnowledgeInput): {
     item: KnowledgeItem;
     created: boolean;
@@ -36,7 +39,25 @@ export declare function listKnowledgeItems(input?: {
     recordClass?: KnowledgeRecordClass;
     limit?: number;
 }): KnowledgeItem[];
-export declare function setKnowledgeStatus(id: string, status: KnowledgeStatus, now?: number): KnowledgeItem | undefined;
+export declare function transitionKnowledgeStatus(input: {
+    id: string;
+    status: KnowledgeStatus;
+    actor: KnowledgeStatusActor;
+    reason: string;
+    expectedStatus?: KnowledgeStatus;
+    content?: string;
+    now?: number;
+}): KnowledgeItem | undefined;
+export declare function reviewKnowledgeItem(input: {
+    id: string;
+    action: KnowledgeReviewAction;
+    actor: KnowledgeStatusActor;
+    reason: string;
+    expectedStatus?: KnowledgeStatus;
+    content?: string;
+    now?: number;
+}): KnowledgeItem | undefined;
+export declare function listKnowledgeStatusEvents(knowledgeId: string): KnowledgeStatusEvent[];
 export declare function searchKnowledgeItems(input: {
     query: string;
     context: KnowledgeVisibilityContext;
@@ -44,7 +65,8 @@ export declare function searchKnowledgeItems(input: {
     asOf?: number;
     recordClass?: KnowledgeRecordClass;
     trustedOnly?: boolean;
-    sources?: readonly KnowledgeSource[];
+    policy?: KnowledgeReadPolicy;
     limit?: number;
 }): KnowledgeItem[];
-export declare function knowledgeSourceAllowed(item: KnowledgeItem, sources: readonly KnowledgeSource[]): boolean;
+export declare function classifyKnowledgeContentSource(item: KnowledgeItem): KnowledgeContentSource;
+export declare function knowledgeItemAllowed(item: KnowledgeItem, policy: KnowledgeReadPolicy): boolean;