@agentconnect.md/daemon 1.0.0-rc.53 → 1.0.0-rc.55

package/dist/index.js

@@ -17551,7 +17551,10 @@ const AgentScopeDenied = object({
 *
 * SECURITY: `integration/upsert` and `RegisterOk.integrations[]` carry PLAINTEXT
 * platform tokens (botToken/appToken). These payloads MUST NEVER be logged — no
-* body dump on decode error, no register/ok snapshot debug dump.
+* body dump on decode error, no register/ok snapshot debug dump. The daemon
+* persists them into the owning agent's local `agent.json` (same trust boundary
+* as hand-authored agents, which already keep tokens there) so integrations
+* survive a restart with the CP down.
 *
 * `signingSecret` is intentionally absent: Socket Mode authenticates with the
 * app-level token, so the daemon never needs a signing secret.
@@ -82315,7 +82318,7 @@ var CpCronRegistry = class {
 * matching `<agentsDir>/<id>/agent.json`:
 *
 *  - if one with that id exists  → field-level MERGE the CP-owned keys into it;
-*  - if none exists             → CREATE a new `<agentsDir>/<id>/agent.json`.
+*  - if none exists             → CREATE a new `<agentsDir>/<name>/agent.json`.
 *
 * CRITICAL: we operate on the RAW JSON TEXT (readFileSync → JSON.parse → set
 * only CP-owned keys → writeFileSync). We never serialize the parsed/interpolated
@@ -82381,7 +82384,8 @@ function applySpecFields(raw, spec, opts) {
 * workspace.path, and all locally-owned keys.
 *
 * CREATE (no file): synthesize a minimal valid agent.json under a fresh
-* `<agentsDir>/<agentId>/` dir — runtime from `spec.runtime` (falling back to
+* `<agentsDir>/<spec.name>/` dir (named by the unique slug) — runtime from
+* `spec.runtime` (falling back to
 * the first known runtime + a warn), workspace translated or defaulted to
 * from-scratch, path daemon-generated.
 */
@@ -82397,7 +82401,7 @@ function writeAgentSpec(agentsDir, agentId, spec, deps) {
 		writeFileSync(existingFile, JSON.stringify(raw, null, 2) + "\n");
 		return;
 	}
-	const agentDir = join(agentsDir, agentId);
+	const agentDir = join(agentsDir, spec.name);
 	const file = join(agentDir, "agent.json");
 	let runtime = spec.runtime;
 	if (!runtime) {
@@ -82469,7 +82473,23 @@ var CpAgentRegistry = class {
 	}
 };
 //#endregion
-//#region src/cp/cp-integration-registry.ts
+//#region src/agents/write-integration.ts
+/**
+* Persist CP-owned platform integrations onto the owning agent's on-disk
+* `agent.json`, which is the SINGLE SOURCE OF TRUTH — so integrations (and their
+* Slack tokens) survive a daemon restart with the Control Plane down (graceful
+* degradation: the daemon opens its Socket Mode connections from disk at start).
+*
+* Local hand-authored agents already store Slack tokens in `agent.json`
+* (agent-schema.ts SlackConfigSchema), so this adds no new secret-on-disk
+* concept. Tokens on disk are the same trust boundary as the daemon process;
+* they still MUST NEVER be logged.
+*
+* CRITICAL: like write-agent.ts, we operate on the RAW JSON TEXT (readFileSync →
+* JSON.parse → mutate only `integrations[]` → writeFileSync). We never serialize
+* the parsed/interpolated `LoadedAgent` — that has `${VAR}` already substituted
+* and `workspace.path` rewritten absolute. Editing the raw file preserves both.
+*/
 /** Map the wire spec to the daemon's `Integration` shape (agent-schema). */
 function toIntegration(spec) {
 	return {
@@ -82484,42 +82504,82 @@ function toIntegration(spec) {
 		}
 	};
 }
+/**
+* Upsert one integration into the owning agent's `agent.json` `integrations[]`
+* (replace by `integrationId`, else append). The owning agent is located by its
+* INTERNAL id (any directory layout). Returns false (with a warn) when no agent
+* with `spec.agentId` exists on disk — an orphan integration is not persisted;
+* it self-heals when the agent spec arrives and the CP re-sends (register/ok).
+*/
+function writeIntegrationSpec(agentsDir, spec, deps) {
+	const file = findAgentFileById(agentsDir, spec.agentId);
+	if (!file) {
+		deps.warn?.(`cp: integration ${spec.integrationId} references missing agent ${spec.agentId} — not persisted (will retry on next push)`);
+		return false;
+	}
+	const raw = JSON.parse(readFileSync(file, "utf8"));
+	const list = Array.isArray(raw.integrations) ? raw.integrations : [];
+	const next = toIntegration(spec);
+	const idx = list.findIndex((i) => typeof i === "object" && i !== null && i.id === next.id);
+	if (idx >= 0) list[idx] = next;
+	else list.push(next);
+	raw.integrations = list;
+	writeFileSync(file, JSON.stringify(raw, null, 2) + "\n");
+	return true;
+}
+/**
+* Remove one integration (by id) from whichever agent.json holds it. Scans all
+* agent files since the owning agent is not part of `integration/remove`.
+* Returns whether an entry was found and removed. Unparseable files are skipped.
+*/
+function removeIntegration(agentsDir, integrationId) {
+	for (const file of findAgentFiles(agentsDir)) {
+		let raw;
+		try {
+			raw = JSON.parse(readFileSync(file, "utf8"));
+		} catch {
+			continue;
+		}
+		if (!Array.isArray(raw.integrations)) continue;
+		const list = raw.integrations;
+		const idx = list.findIndex((i) => typeof i === "object" && i !== null && i.id === integrationId);
+		if (idx === -1) continue;
+		list.splice(idx, 1);
+		writeFileSync(file, JSON.stringify(raw, null, 2) + "\n");
+		return true;
+	}
+	return false;
+}
+//#endregion
+//#region src/cp/cp-integration-registry.ts
 var CpIntegrationRegistry = class {
+	agentsDir;
+	deps;
 	onChange;
-	byId = /* @__PURE__ */ new Map();
-	constructor(onChange) {
+	constructor(agentsDir, deps, onChange) {
+		this.agentsDir = agentsDir;
+		this.deps = deps;
 		this.onChange = onChange;
 	}
-	/** Add or replace one CP integration (integration/upsert EVT). */
+	/** Add or replace one integration on the owning agent's disk file (integration/upsert EVT). */
 	upsert(spec) {
-		this.byId.set(spec.integrationId, spec);
+		writeIntegrationSpec(this.agentsDir, spec, this.deps);
 		this.onChange();
 	}
-	/** Drop one CP integration (integration/remove EVT). */
+	/** Splice one integration out of whichever agent.json holds it (integration/remove EVT). */
 	remove(integrationId) {
-		if (this.byId.delete(integrationId)) this.onChange();
+		removeIntegration(this.agentsDir, integrationId);
+		this.onChange();
 	}
 	/**
-	* Replace the whole CP-owned set from the `register/ok` reconcile roster (the CP
-	* is authoritative and the roster is already filtered to THIS daemon).
+	* Apply the register/ok reconcile roster: upsert EACH entry and NOTHING else.
+	* Never prunes integrations absent from the roster (deletion is only via
+	* integration/remove).
 	*/
 	converge(specs) {
-		this.byId = new Map((specs ?? []).map((s) => [s.integrationId, s]));
+		for (const spec of specs ?? []) writeIntegrationSpec(this.agentsDir, spec, this.deps);
 		this.onChange();
 	}
-	/** CP integrations grouped by owning agentId, as daemon `Integration[]`. */
-	byAgent() {
-		const out = /* @__PURE__ */ new Map();
-		for (const spec of this.byId.values()) {
-			const list = out.get(spec.agentId) ?? [];
-			list.push(toIntegration(spec));
-			out.set(spec.agentId, list);
-		}
-		return out;
-	}
-	get size() {
-		return this.byId.size;
-	}
 };
 //#endregion
 //#region src/cp/config-apply.ts
@@ -82663,7 +82723,6 @@ var Daemon = class Daemon {
 	cpCrons;
 	cpAgents;
 	cpIntegrations;
-	warnedOrphanIntegrations = /* @__PURE__ */ new Set();
 	botUserIds = {};
 	cpRouting;
 	clock;
@@ -82726,7 +82785,7 @@ var Daemon = class Daemon {
 			knownRuntimes: Object.keys(this.runtimes),
 			warn: (m) => this.log.warn(m)
 		}, () => void this.reconcile().catch((err) => this.log.error(`cp: agent reconcile failed: ${err.stack ?? err}`)));
-		this.cpIntegrations = new CpIntegrationRegistry(() => void this.reconcile().catch((err) => this.log.error(`cp: integration reconcile failed: ${err.stack ?? err}`)));
+		this.cpIntegrations = new CpIntegrationRegistry(this.agentsDir, { warn: (m) => this.log.warn(m) }, () => void this.reconcile().catch((err) => this.log.error(`cp: integration reconcile failed: ${err.stack ?? err}`)));
 		for (const a of this.effectiveAgents()) {
 			this.agents.set(a.id, a);
 			this.prefetchClone(a);
@@ -82834,41 +82893,7 @@ var Daemon = class Daemon {
 	* routing (all of which read `agent.integrations`) see one merged view.
 	*/
 	effectiveAgents() {
-		const files = [...this.fileAgents.values()];
-		const cpByAgent = this.cpIntegrations?.byAgent();
-		if (!cpByAgent || cpByAgent.size === 0) return files;
-		return files.map((a) => {
-			const cp = cpByAgent.get(a.id);
-			if (!cp || cp.length === 0) return a;
-			const byId = new Map(a.integrations.map((i) => [i.id, i]));
-			for (const i of cp) byId.set(i.id, i);
-			return {
-				...a,
-				integrations: [...byId.values()]
-			};
-		});
-	}
-	/**
-	* Warn (once per orphan) about CP integrations whose owning agent is absent /
-	* inactive on disk: they are held in the registry but overlaid onto no agent, so
-	* no socket opens. Self-heals when the agent appears (a later reconcile connects
-	* it). Logs integrationId + agentId ONLY — never the token material.
-	*/
-	warnOrphanIntegrations() {
-		const cpByAgent = this.cpIntegrations?.byAgent();
-		if (!cpByAgent) return;
-		const live = /* @__PURE__ */ new Set();
-		for (const [agentId, ints] of cpByAgent) {
-			if (this.fileAgents.has(agentId)) continue;
-			for (const int of ints) {
-				live.add(int.id);
-				if (!this.warnedOrphanIntegrations.has(int.id)) {
-					this.warnedOrphanIntegrations.add(int.id);
-					this.log.warn(`slack: integration ${int.id} references missing/inactive agent ${agentId} — not connected`);
-				}
-			}
-		}
-		for (const id of this.warnedOrphanIntegrations) if (!live.has(id)) this.warnedOrphanIntegrations.delete(id);
+		return [...this.fileAgents.values()];
 	}
 	/**
 	* Converge the running set to the desired effective agents. Driven by both the
@@ -82902,7 +82927,6 @@ var Daemon = class Daemon {
 	async runReconcile() {
 		const files = this.loadAgentList();
 		this.fileAgents = new Map(files.map((a) => [a.id, a]));
-		this.warnOrphanIntegrations();
 		const desired = this.effectiveAgents();
 		const { toStart, toStop, toChange } = diffAgents(desired, this.agents);
 		if (toStart.length || toStop.length || toChange.length) this.log.info(`reconcile: ${desired.length} desired agent(s) from ${this.agentsDir}; start=[${toStart.map((a) => a.id).join(", ")}] stop=[${toStop.join(", ")}] change=[${toChange.map((c) => {