@themoltnet/agent-daemon 0.62.0 → 0.63.1

package/README.md

@@ -649,10 +649,36 @@ Server configuration root. **Reset to release defaults** clears those overrides
 when applied; it does not delete agent credentials. Launch environment values
 have priority and appear read-only. Operators who explicitly set both
 `MOLTNET_OPERATOR_API_URL` and `MOLTNET_OPERATOR_OAUTH_ISSUER` should also use
-`MOLTNET_AGENT_SERVER_ROOT` to select a dedicated environment root.
+`MOLTNET_HOME` to select a dedicated environment root.
 
 Release defaults use `https://api.themolt.net`, `https://auth.themolt.net`, and
 public client IDs `moltnet-native` / `moltnet-console`. Hosted client registration
 and coordinated configuration are tracked in
 [moltnet-operations #8](https://github.com/getlarge/moltnet-operations/issues/8).
 These IDs are public configuration; they do not contain a client secret.
+
+### Isolated local development
+
+Use the development targets to keep development state and installations in
+separate directories:
+
+```bash
+pnpm exec nx run @moltnet/agent-desktop:tauri:dev
+pnpm exec nx run @themoltnet/agent-daemon:dev -- server
+```
+
+The launchers choose `~/.local/share/moltnet/development/<worktree-id>/store`
+and the sibling `agent` installation directory. The worktree ID is a stable
+hash of the canonical checkout path. Repeated launches reuse that environment;
+another worktree gets its own environment. Use `MOLTNET_DEV_HOME` and `MOLTNET_DEV_AGENT_HOME` to override these development
+locations. Use absolute overrides: relative paths start at the Nx target’s
+working directory (`apps/agent-daemon` for daemon `dev`, the repository root
+for Desktop `tauri:dev`). All daemon `dev` commands, including `poll`, use
+this isolated store.
+The launchers ignore inherited production store and installation selectors.
+The renderer-only Desktop `dev` target starts Vite without a native server.
+
+For direct CLI or SDK development commands, set `MOLTNET_HOME` explicitly. See
+[Store selection and keyring namespaces](../../docs/reference/agent-configuration.md#store-selection-and-keyring-namespaces)
+for precedence, secret namespaces and daemon discovery. Automated tests use fresh
+temporary roots.

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAGzD,wBAAsB,iBAAiB,CAAC,OAAO,EAAE;IAC/C,OAAO,EAAE,oBAAoB,CAAC;IAC9B,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB,GAAG,OAAO,CAAC,MAAM,CAAC,CA6ClB"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAGzD,wBAAsB,iBAAiB,CAAC,OAAO,EAAE;IAC/C,OAAO,EAAE,oBAAoB,CAAC;IAC9B,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB,GAAG,OAAO,CAAC,MAAM,CAAC,CAyDlB"}

package/dist/cli.js

@@ -11,7 +11,7 @@ import "typebox/value";
 import { execFile, spawn } from "node:child_process";
 import { basename, dirname, isAbsolute, join, resolve, sep } from "node:path";
 import { parseArgs, parseEnv, promisify } from "node:util";
-import { CredentialPersistenceError, EnrollmentRecoveryError, FILE_SECRET_PROVIDER, FileSecretProvider, ProjectConfigError, ProvisioningNotStartedError, RegisterIdentityError, WORKSPACE_STRATEGIES, boundedIdentitySignal, canonicalDirectory, connect, createNodeSecretProviderRegistry, enrollTeam, getProjectConfigPath, readProjectConfig, register, resolveProjectBinding } from "@themoltnet/sdk/node";
+import { CredentialPersistenceError, EnrollmentRecoveryError, FILE_SECRET_PROVIDER, FileSecretProvider, ProjectConfigError, ProvisioningNotStartedError, RegisterIdentityError, WORKSPACE_STRATEGIES, boundedIdentitySignal, canonicalDirectory, canonicalStoreRoot, connect, createNodeSecretProviderRegistry, defaultStoreRoot, enrollTeam, getProjectConfigPath, isDefaultStore, readProjectConfig, register, resolveProjectBinding, resolveStoreRoot, resolveStoreSelection } from "@themoltnet/sdk/node";
 import { constants, copyFileSync, createReadStream, createWriteStream, existsSync, lstatSync, mkdirSync, mkdtempSync, openSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, symlinkSync, writeFileSync } from "node:fs";
 import { AuthenticationError, IDENTITY_ALIAS_PATTERN, MoltNetError, assertIdentityAlias, assertTrustedConfigApiUrl, createExecutorAttestor, formatSecretReferenceString, getConfigDir, getIdentityDir, hasAgentKeyConfiguration, isCanonicalConfig, parseSecretReferenceString, readConfig, requireSecureCredentialApiUrl, resolveAgentKey, resolveEnvSecretReference, resolveIdentitySeed, selectAgentKeyReference, signBytes } from "@themoltnet/sdk";
 import { AgentRuntime, ApiTaskReporter, ApiTaskSource, PollingApiTaskSource, RuntimeProfilePrerequisiteError, createLocalSeedSigner, resolveAgentIdentity, resolveRuntimeProfile, resolveRuntimeProfiles, validateRuntimeProfilePrerequisites } from "@themoltnet/agent-runtime";
@@ -3757,6 +3757,13 @@ async function resolveSelectionApiUrl(agentName, options) {
 * here, so the rest of the daemon imports typed values rather than
 * sprinkling string lookups across the codebase.
 */
+/** All daemon commands announce the same legacy alias policy as Go and Desktop. */
+function markLegacyStoreNoticeShown() {
+	process.env["MOLTNET_LEGACY_STORE_NOTICE_SHOWN"] = "1";
+}
+function legacyStoreNotice() {
+	return process.env["MOLTNET_AGENT_SERVER_ROOT"] !== void 0 && process.env["MOLTNET_LEGACY_STORE_NOTICE_SHOWN"] !== "1" ? "MOLTNET_AGENT_SERVER_ROOT is deprecated; use MOLTNET_HOME. Both select the entire store; no data is migrated." : void 0;
+}
 function loadConfig() {
 	assertSingleCredentialForm("MOLTNET_AGENT_KEY", "MOLTNET_AGENT_KEY_REF");
 	assertSingleCredentialForm("MOLTNET_PRIVATE_KEY", "MOLTNET_PRIVATE_KEY_REF");
@@ -3767,7 +3774,7 @@ function loadConfig() {
 		profilePrerequisiteEnv: process.env,
 		profilePrerequisitePath: process.env.PATH ?? "",
 		piCodingAgentDir: process.env["PI_CODING_AGENT_DIR"] ?? "",
-		agentServerRoot: process.env["MOLTNET_AGENT_SERVER_ROOT"] ?? "",
+		agentServerRoot: resolveStoreRoot(),
 		credentialSource: detectCredentialSource(process.env),
 		apiUrl: process.env["MOLTNET_API_URL"] ?? "",
 		signingPrivateKey: process.env["MOLTNET_PRIVATE_KEY"] ?? "",
@@ -3815,7 +3822,8 @@ function activatePiCodingAgentDir(path, env = {}) {
 	process.env["PI_CODING_AGENT_DIR"] = path;
 	Object.assign(process.env, env);
 }
-function loadAgentServerEnvConfig() {
+function loadAgentServerEnvConfig(root) {
+	const selection = resolveStoreSelection({ root });
 	const issuer = process.env["MOLTNET_OPERATOR_OAUTH_ISSUER"];
 	const publicUrl = process.env["MOLTNET_OPERATOR_OAUTH_PUBLIC_URL"] ?? issuer;
 	const nativeClientId = process.env["MOLTNET_NATIVE_OAUTH_CLIENT_ID"];
@@ -3831,7 +3839,8 @@ function loadAgentServerEnvConfig() {
 		},
 		port: process.env["MOLTNET_AGENT_SERVER_PORT"] ?? "",
 		allowedOrigins: process.env["MOLTNET_AGENT_SERVER_ALLOWED_ORIGINS"] ?? "",
-		root: process.env["MOLTNET_AGENT_SERVER_ROOT"] ?? "",
+		root: selection.root,
+		rootSource: selection.source,
 		apiUrl: process.env["MOLTNET_API_URL"] ?? "",
 		logLevel: process.env["LOG_LEVEL"] ?? "",
 		activeIdentity: process.env["MOLTNET_ACTIVE_IDENTITY"] ?? ""
@@ -3841,8 +3850,9 @@ function loadAgentServerEnvConfig() {
 function processEnvSnapshot() {
 	return process.env;
 }
-function loadUpdateEnvConfig() {
+function loadUpdateEnvConfig(root) {
 	return {
+		...!isDefaultStore({ root }) ? { storeRoot: resolveStoreRoot({ root }) } : {},
 		xdgCacheHome: process.env["XDG_CACHE_HOME"] ?? "",
 		localAppData: process.env["LOCALAPPDATA"] ?? ""
 	};
@@ -4162,7 +4172,9 @@ Example:
     --agent legreffier \\
     --state idle`;
 function isHelpFlag(args) {
-	return args.includes("--help") || args.includes("-h");
+	const separator = args.indexOf("--");
+	const flags = separator === -1 ? args : args.slice(0, separator);
+	return flags.includes("--help") || flags.includes("-h");
 }
 var AGENT_SERVER_HELP = `\
 agent-daemon server — local supervisor for managed runs.
@@ -4172,14 +4184,14 @@ Agent Desktop instead uses a private Unix socket with a process-scoped grant.
 Both modes configure agents and providers and start/stop child runs.
 
 Options:
-  --port <n>                  Loopback port. Default: 17374.
+  --port <n>                  Loopback port. Default store: 17374; isolated stores: an available port.
                               Env: MOLTNET_AGENT_SERVER_PORT.
   --allowed-origins <csv>     Exact browser-controller origins allowed
                               local control.
                               Default: https://console.themolt.net.
                               Env: MOLTNET_AGENT_SERVER_ALLOWED_ORIGINS.
   --root <path>               Config root. Default: ~/.config/moltnet
-                              (or MOLTNET_AGENT_SERVER_ROOT).
+                              (or MOLTNET_HOME; legacy MOLTNET_AGENT_SERVER_ROOT).
   --api-url <url>             Default MoltNet API for new managed agents.
                               Default: https://api.themolt.net.
   --heartbeat-interval-ms <n> Child reporter heartbeat cadence. Default: 60000.
@@ -4208,8 +4220,8 @@ Usage:
     [--root <path>]
   moltnet-agent providers logout <id> [--yes] [--root <path>]
 
-The default root is ~/.config/moltnet. MOLTNET_AGENT_SERVER_ROOT remains the
-environment override. API keys are accepted only from redirected stdin; they
+The default root is ~/.config/moltnet. MOLTNET_HOME selects another store.
+MOLTNET_AGENT_SERVER_ROOT is a legacy alias; conflicting values fail. API keys are accepted only from redirected stdin; they
 are stored separately and providers.json contains only a secret reference.
 
 --model declares a text-only model. --model-input declares a model together
@@ -5655,20 +5667,9 @@ var AgentServerStoreError = class extends Error {
 		this.code = code;
 	}
 };
-/**
-* `MOLTNET_AGENT_SERVER_ROOT` override, else `~/.config/moltnet`.
-*
-* Deliberately does NOT consult `XDG_CONFIG_HOME`. The Go CLI's GetConfigDir
-* and @moltnet/agent-config's getConfigDir both resolve `~/.config/moltnet`,
-* so honouring XDG here gave one application two config roots: on a machine
-* with the variable set, the daemon wrote identities the CLI and SDK could not
-* read. `MOLTNET_AGENT_SERVER_ROOT` remains the explicit escape hatch for a
-* genuinely custom location.
-*/
+/** Explicit root, MOLTNET_HOME, legacy alias, then the unchanged default store. */
 function resolveAgentServerRoot(input) {
-	const override = input.root?.trim();
-	if (override) return override;
-	return getConfigDir();
+	return getConfigDir(input);
 }
 /**
 * Copy a model entry, dropping an empty `input` so it never reaches the wire.
@@ -6102,7 +6103,7 @@ async function resolvePiAgentDir(cfg, agentRoot, profiles, options = {}) {
 		};
 	}
 	const repoPiDir = join(agentRoot, ".pi");
-	const store = new AgentServerStore(resolveAgentServerRoot({ root: cfg.agentServerRoot }));
+	const store = new AgentServerStore(resolveAgentServerRoot({ root: cfg.agentServerRoot || void 0 }));
 	const providers = store.readProviders();
 	const storeHasAuth = existsSync(store.piAuthJsonPath);
 	if (Object.keys(providers).length === 0 && !storeHasAuth) {
@@ -6183,7 +6184,7 @@ function mergePiModels(store, repo) {
 //#endregion
 //#region src/lib/state-dir.ts
 function ensureDaemonStateDirs(mountPath) {
-	const rootDir = canonicalStatePath(join(mountPath, ".moltnet", "d"));
+	const rootDir = canonicalStoreRoot(join(mountPath, ".moltnet", "d"));
 	const piSessionsDir = join(rootDir, "pi-sessions");
 	mkdirSync(rootDir, {
 		recursive: true,
@@ -6198,17 +6199,6 @@ function ensureDaemonStateDirs(mountPath) {
 		piSessionsDir: realpathSync(piSessionsDir)
 	};
 }
-function canonicalStatePath(path) {
-	let parent = resolve(path);
-	const missing = [];
-	while (!existsSync(parent)) {
-		missing.unshift(basename(parent));
-		const next = dirname(parent);
-		if (next === parent) throw new Error(`Cannot resolve daemon state root ${path}`);
-		parent = next;
-	}
-	return join(realpathSync(parent), ...missing);
-}
 //#endregion
 //#region src/lib/prepare-runtime-profile.ts
 /** Validate and prepare a profile through the shared daemon execution path. */
@@ -8865,12 +8855,13 @@ function parseProviderArgs(command, args) {
 	}
 }
 async function createContext(rootFlag, dependencies, installInterruptHandler) {
-	const store = new AgentServerStore(resolveAgentServerRoot({ root: rootFlag ?? dependencies.envRoot ?? loadAgentServerEnvConfig().root })).ensure();
+	const root = resolveAgentServerRoot({ root: rootFlag ?? dependencies.envRoot ?? loadAgentServerEnvConfig().root });
+	const store = new AgentServerStore(root).ensure();
 	const secrets = new FileSecretProvider({
 		root: store.secretsDir,
 		writable: true
 	});
-	const secretProviders = createNodeSecretProviderRegistry().register(secrets);
+	const secretProviders = createNodeSecretProviderRegistry({ store: { root } }).register(secrets);
 	const stderr = dependencies.stderr ?? console.error;
 	const logger = createCliLogger(stderr);
 	const configuration = dependencies.configuration ?? new ProviderConfigurationService({
@@ -9358,11 +9349,67 @@ var ConnectionSettingsStore = class {
 };
 /** A custom service gets its own identities, keys and runtime configuration. */
 function connectionStateRoot(root, settings) {
-	const identity = [settings.apiUrl.replace(/\/$/u, ""), settings.issuer.replace(/\/$/u, "")];
+	const identity = [settings.apiUrl.replace(/\/+$/u, ""), settings.issuer.replace(/\/+$/u, "")];
 	if (identity[0] === RELEASE_CONNECTION.apiUrl && identity[1] === RELEASE_CONNECTION.issuer) return root;
 	return join(root, "environments", createHash("sha256").update(JSON.stringify(identity)).digest("hex"));
 }
 //#endregion
+//#region src/lib/agent-server/endpoint.ts
+function defaultAgentServerPort(root) {
+	return isDefaultStore({ root }) ? OPERATOR_OAUTH.serverPort : 0;
+}
+function endpointPath(root) {
+	return join(root, "agent-server-endpoint.json");
+}
+function validateUrl(value) {
+	const url = new URL(value);
+	if (url.protocol !== "http:" || url.hostname !== "127.0.0.1" || url.port === "0" || url.username || url.password || url.pathname !== "/" || url.search || url.hash || !/^http:\/\/127\.0\.0\.1(?::[1-9]\d{0,4})?$/.test(value)) throw new Error("Agent Server discovery requires a loopback HTTP origin");
+}
+function readAgentServerEndpoint(root) {
+	let raw;
+	try {
+		raw = readFileSync(endpointPath(root), "utf8");
+	} catch (cause) {
+		if (cause.code === "ENOENT") return null;
+		throw cause;
+	}
+	try {
+		const value = JSON.parse(raw);
+		if (value.version !== 1 || typeof value.instanceId !== "string" || value.instanceId.length !== 36 || !/^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$/iu.test(value.instanceId) || typeof value.url !== "string") throw new Error("Invalid Agent Server discovery metadata");
+		validateUrl(value.url);
+		if (value.pid !== void 0) {
+			if (!Number.isSafeInteger(value.pid) || value.pid <= 0 || value.pid > 2147483647) throw new Error("Invalid process ID");
+			try {
+				process.kill(value.pid, 0);
+			} catch (cause) {
+				if (cause.code === "ESRCH") return null;
+			}
+		}
+		return value;
+	} catch (cause) {
+		throw new Error(`Invalid Agent Server discovery at ${endpointPath(root)}: ${cause instanceof Error ? cause.message : String(cause)}`, { cause });
+	}
+}
+/** Publish and release only while holding the selected store's singleton lock. */
+function publishAgentServerEndpoint(root, url) {
+	validateUrl(url);
+	const endpoint = {
+		version: 1,
+		instanceId: randomUUID(),
+		pid: process.pid,
+		url
+	};
+	writeJsonAtomic(endpointPath(root), endpoint);
+	return {
+		record: endpoint,
+		release() {
+			try {
+				if (readAgentServerEndpoint(root)?.instanceId === endpoint.instanceId) rmSync(endpointPath(root), { force: true });
+			} catch {}
+		}
+	};
+}
+//#endregion
 //#region src/lib/agent-server/lock.ts
 var AgentServerLockError = class extends Error {
 	name = "AgentServerLockError";
@@ -9396,7 +9443,14 @@ async function acquireAgentServerLock(root, options = {}) {
 			}
 		});
 	} catch (cause) {
-		if (cause.code === "ELOCKED") throw new AgentServerLockError("held", `another moltnet-agent server process already owns ${path}`, { cause });
+		if (cause.code === "ELOCKED") {
+			let holder = "";
+			try {
+				const endpoint = readAgentServerEndpoint(root);
+				if (endpoint?.pid) holder = ` (PID ${endpoint.pid}, instance ${endpoint.instanceId})`;
+			} catch {}
+			throw new AgentServerLockError("held", `another moltnet-agent server process already owns ${path}${holder}; stop that process before retrying`, { cause });
+		}
 		throw new AgentServerLockError("failed", `could not acquire Agent Server lock ${path}: ${cause.message}`, { cause });
 	}
 	let released = false;
@@ -9411,11 +9465,15 @@ async function acquireAgentServerLock(root, options = {}) {
 }
 /** Always release after normal completion or startup/runtime failure. */
 async function withAgentServerLock(root, work, options) {
-	const held = await acquireAgentServerLock(root, options);
+	const held = [];
 	try {
+		held.push(await acquireAgentServerLock(root, options));
+		if (options?.stateRoot && options.stateRoot !== root) held.push(await acquireAgentServerLock(options.stateRoot, options));
 		return await work();
 	} finally {
-		await held.release();
+		for (const entry of held.reverse()) await entry.release().catch((error) => {
+			console.error(`Could not release Agent Server lock ${entry.path}: ${String(error)}`);
+		});
 	}
 }
 //#endregion
@@ -9450,6 +9508,10 @@ function applyNativeClientGrant(options) {
 	nativeGrant.grantNative(token);
 	return true;
 }
+//#endregion
+//#region src/lib/agent-server/native-grant-service.ts
+/** Process-only native grant. Browser authorization belongs to OperatorOAuth. */
+var NATIVE_CLIENT_ORIGIN = "moltnet-agent-desktop://native";
 var NativeGrantError = class extends Error {
 	code = "native_token_invalid";
 };
@@ -10585,6 +10647,8 @@ var RunManager = class {
 		const homeDir = join(dirname(piDir), "home");
 		const env = {
 			HOME: homeDir,
+			MOLTNET_DEFAULT_STORE_ROOT: defaultStoreRoot({ env: this.options.baseEnv }),
+			MOLTNET_HOME: getConfigDir({ root: this.options.storeRoot ?? this.store.root }),
 			PI_CODING_AGENT_DIR: piDir,
 			XDG_CACHE_HOME: join(homeDir, ".cache"),
 			XDG_CONFIG_HOME: join(homeDir, ".config"),
@@ -10628,7 +10692,7 @@ var RunManager = class {
 		env["MOLTNET_AGENT_KEY"] = requireCredentialSnapshot(agent).agentKey;
 		env["MOLTNET_API_URL"] = activation.apiUrl ?? (activation.source === "external" ? activation.configApiUrl : "");
 		if (activation.source === "managed") {
-			if (!config.keys.private_key_ref) throw new AgentServerRunError("invalid_spec", "The managed signing key reference is missing");
+			if (config.keys.private_key_ref?.provider !== "file") throw new AgentServerRunError("invalid_store", "The managed identity store is inconsistent: its signing key must be file-backed. Restore the identity store or use credential recovery.");
 			env["MOLTNET_PRIVATE_KEY_REF"] = formatSecretReferenceString(config.keys.private_key_ref);
 			env["MOLTNET_SECRET_ROOT"] = this.store.secretsDir;
 		} else try {
@@ -11231,6 +11295,20 @@ function writeRegistry(path, entries) {
 	renameSync(temp, path);
 }
 //#endregion
+//#region src/lib/agent-server/secret-providers.ts
+function createAgentServerSecretProviders(settings, store) {
+	const secrets = new FileSecretProvider({
+		root: store.secretsDir,
+		writable: true
+	});
+	const registry = () => createNodeSecretProviderRegistry({ store: { root: settings.root } });
+	return {
+		secrets,
+		secretProviders: registry().register(secrets),
+		externalSecretProviders: registry()
+	};
+}
+//#endregion
 //#region src/lib/agent-server/readiness.ts
 /**
 * Whether a runtime profile can execute on *this* machine.
@@ -11997,7 +12075,8 @@ function requestOperationSignal(request, shutdownSignal) {
 	else request.raw.once("aborted", () => disconnected.abort({ source: "request" }));
 	return shutdownSignal ? AbortSignal.any([disconnected.signal, shutdownSignal]) : disconnected.signal;
 }
-function buildAgentServer(options) {
+function buildAgentServer(input) {
+	const options = { ...input };
 	const { nativeGrant } = options;
 	const oauth = options.operatorOAuth;
 	let restartRequired = false;
@@ -12006,12 +12085,13 @@ function buildAgentServer(options) {
 		...fastifyOptions,
 		loggerInstance: options.logger
 	}) : Fastify(fastifyOptions);
+	app.addHook("onListen", async () => {
+		const address = app.server.address();
+		if (address && typeof address !== "string") options.selfOrigin = `http://127.0.0.1:${address.port}`;
+	});
 	options.registerOpenApi?.(app);
 	for (const schema of AGENT_SERVER_SCHEMAS) app.addSchema(schema);
-	const browserOrigins = new OriginAllowlist(options.allowedOrigins);
-	registerLoopbackSecurity(app, {
-		isOriginAllowed: (origin) => origin === "moltnet-agent-desktop://native" || browserOrigins.has(origin),
-		...options.selfOrigin ? { selfOrigins: [options.selfOrigin] } : {},
+	const securityOptions = {
 		allowedHeaders: [AGENT_SERVER_TOKEN_HEADER],
 		methods: [
 			"GET",
@@ -12020,7 +12100,18 @@ function buildAgentServer(options) {
 			"DELETE",
 			"OPTIONS"
 		]
+	};
+	if (options.nativeOnly) registerLoopbackSecurity(app, {
+		...securityOptions,
+		isOriginAllowed: (origin) => origin === NATIVE_CLIENT_ORIGIN
 	});
+	else {
+		const browserOrigins = new OriginAllowlist(options.allowedOrigins);
+		registerLoopbackSecurity(app, {
+			...securityOptions,
+			isOriginAllowed: (origin) => origin === "moltnet-agent-desktop://native" || origin === options.selfOrigin || browserOrigins.has(origin)
+		});
+	}
 	let verificationWindow = Date.now();
 	let verifications = 0;
 	const browserVerification = /* @__PURE__ */ new WeakMap();
@@ -12641,7 +12732,7 @@ function corsHeadersFor(request, options) {
 	return {};
 }
 function isConfiguredOrigin(origin, options) {
-	return typeof origin === "string" && (origin === "moltnet-agent-desktop://native" || options.allowedOrigins.includes(origin) || origin === options.selfOrigin);
+	return typeof origin === "string" && (origin === "moltnet-agent-desktop://native" || !options.nativeOnly && (options.allowedOrigins.includes(origin) || origin === options.selfOrigin));
 }
 function normalizeAgentServerError(error) {
 	if (error instanceof TeamCredentialError) return {
@@ -12670,7 +12761,7 @@ function normalizeAgentServerError(error) {
 		message: error.message
 	};
 	if (error instanceof AgentServerRunError) return {
-		statusCode: error.code === "run_not_found" ? 404 : 400,
+		statusCode: error.code === "run_not_found" ? 404 : error.code === "invalid_store" ? 409 : 400,
 		code: error.code,
 		message: error.message
 	};
@@ -12709,7 +12800,6 @@ function normalizeAgentServerError(error) {
 * waits for an authorized controller to configure agents/providers and
 * start or stop runs.
 */
-var DEFAULT_PORT = OPERATOR_OAUTH.serverPort;
 var DEFAULT_ALLOWED_ORIGINS = "https://console.themolt.net";
 var SHUTDOWN_TIMEOUT_MS = 15e3;
 var LOCK_HELD_EXIT_CODE = 75;
@@ -12734,7 +12824,6 @@ async function runAgentServer(argv) {
 		console.log(AGENT_SERVER_HELP);
 		return 0;
 	}
-	const envConfig = loadAgentServerEnvConfig();
 	const { values } = parseArgs({
 		args: argv,
 		options: {
@@ -12748,6 +12837,7 @@ async function runAgentServer(argv) {
 			"native-socket": { type: "string" }
 		}
 	});
+	const envConfig = loadAgentServerEnvConfig(values.root);
 	const nativeSocket = values["native-socket"];
 	const nativeSocketError = validateNativeSocketOptions(nativeSocketValidationOptions({
 		...nativeSocket ? { nativeSocket } : {},
@@ -12761,13 +12851,14 @@ async function runAgentServer(argv) {
 		console.error(nativeSocketError);
 		return 1;
 	}
-	const port = Number.parseInt(values.port ?? (envConfig.port || `${DEFAULT_PORT}`), 10);
-	if (!Number.isInteger(port) || port < 1 || port > 65535) {
+	const port = Number.parseInt(values.port ?? (envConfig.port || `${defaultAgentServerPort(envConfig.root)}`), 10);
+	if (!Number.isInteger(port) || port < 0 || port > 65535) {
 		console.error(`Invalid --port: ${String(values.port)}`);
 		return 1;
 	}
 	const allowedOrigins = parseAllowedOrigins(values["allowed-origins"] ?? (envConfig.allowedOrigins || DEFAULT_ALLOWED_ORIGINS));
-	const connectionSettings = new ConnectionSettingsStore(values.root ?? resolveAgentServerRoot({ root: envConfig.root }), {
+	const settingsRoot = envConfig.root;
+	const connectionSettings = new ConnectionSettingsStore(settingsRoot, {
 		...envConfig.operatorOAuth,
 		...values["api-url"] || envConfig.apiUrl ? { apiUrl: values["api-url"] || envConfig.apiUrl } : {}
 	});
@@ -12780,15 +12871,11 @@ async function runAgentServer(argv) {
 		name: "agent-daemon.server",
 		level: envConfig.logLevel || "info"
 	});
+	const shutdownDisposers = [];
 	try {
 		try {
-			return await withAgentServerLock(root, async () => {
-				const secrets = new FileSecretProvider({
-					root: store.secretsDir,
-					writable: true
-				});
-				const secretProviders = createNodeSecretProviderRegistry().register(secrets);
-				const externalSecretProviders = createNodeSecretProviderRegistry();
+			return await withAgentServerLock(settingsRoot, async () => {
+				const { secrets, secretProviders, externalSecretProviders } = createAgentServerSecretProviders(connectionSettings, store);
 				const nativeGrant = new NativeGrantService();
 				const nativeClient = applyNativeClientGrant({
 					nativeGrant,
@@ -12812,6 +12899,7 @@ async function runAgentServer(argv) {
 				const runtimeRegistry = new RuntimeRegistry(store.root);
 				const runs = new RunManager({
 					store,
+					storeRoot: settingsRoot,
 					secretProviders,
 					externalSecretProviders,
 					baseEnv: processEnvSnapshot(),
@@ -12852,28 +12940,39 @@ async function runAgentServer(argv) {
 					logger,
 					shutdownSignal: shutdownController.signal
 				});
+				let endpoint;
 				try {
 					const address = await app.listen(nativeSocket ? { path: nativeSocket } : {
 						host: "127.0.0.1",
 						port
 					});
 					if (nativeSocket) await chmod(nativeSocket, 384);
+					if (!nativeSocket) {
+						endpoint = publishAgentServerEndpoint(settingsRoot, address);
+						console.error(`discovery: ${join(settingsRoot, "agent-server-endpoint.json")}`);
+					}
 					console.error(`moltnet-agent server listening on ${address}`);
-					console.error(`config root: ${root}`);
+					console.error(`store root: ${settingsRoot} (${envConfig.rootSource})`);
+					console.error(`connection state: ${root}`);
 					if (nativeSocket) console.error(`native control socket: ${nativeSocket}`);
 					else console.error(`allowed origins: ${allowedOrigins.join(", ")}`);
 					if (nativeClient) console.error("native desktop client: authorized");
 					if (!nativeSocket) console.error("Connect from an allowed local-control client after operator authorization.");
-					return await waitForAgentServerShutdown(runs, app, shutdownController, Boolean(values.supervised));
+					return await waitForAgentServerShutdown(runs, app, shutdownController, Boolean(values.supervised), (dispose) => shutdownDisposers.push(dispose));
 				} catch (cause) {
 					await app.close().catch(() => void 0);
 					throw cause;
+				} finally {
+					endpoint?.release();
 				}
-			}, { onCompromised: (error) => {
-				console.error(error.message);
-				process.exitCode = 1;
-				process.kill(process.pid, "SIGTERM");
-			} });
+			}, {
+				stateRoot: root,
+				onCompromised: (error) => {
+					console.error(error.message);
+					process.exitCode = 1;
+					process.kill(process.pid, "SIGTERM");
+				}
+			});
 		} catch (cause) {
 			if (cause instanceof AgentServerLockError) {
 				console.error(cause.message);
@@ -12882,10 +12981,14 @@ async function runAgentServer(argv) {
 			throw cause;
 		}
 	} finally {
-		await shutdownLogger();
+		try {
+			await shutdownLogger();
+		} finally {
+			for (const dispose of shutdownDisposers) dispose();
+		}
 	}
 }
-function waitForAgentServerShutdown(runs, app, shutdownController, supervised) {
+function waitForAgentServerShutdown(runs, app, shutdownController, supervised, registerDisposer) {
 	return new Promise((resolvePromise) => {
 		let shuttingDown = false;
 		const shutdown = (source) => {
@@ -12916,8 +13019,6 @@ function waitForAgentServerShutdown(runs, app, shutdownController, supervised) {
 				if (forcedExitTimer) clearTimeout(forcedExitTimer);
 				const failures = results.filter((result) => result.status === "rejected");
 				for (const failure of failures) console.error(`shutdown cleanup failed: ${failure.reason.message}`);
-				handlers.dispose();
-				stdinGuard.dispose();
 				const exitCode = typeof process.exitCode === "number" ? process.exitCode : 0;
 				resolvePromise(failures.length > 0 ? 1 : exitCode);
 			})();
@@ -12930,6 +13031,10 @@ function waitForAgentServerShutdown(runs, app, shutdownController, supervised) {
 			enabled: supervised,
 			shutdown: () => shutdown("stdin")
 		});
+		registerDisposer(() => {
+			handlers.dispose();
+			stdinGuard.dispose();
+		});
 	});
 }
 /** Makes the supervising process's stdin pipe part of the server lifecycle. */
@@ -13278,6 +13383,7 @@ function compareVersions(a, b) {
 }
 function cachePath() {
 	const env = loadUpdateEnvConfig();
+	if (env.storeRoot) return join(env.storeRoot, "cache", "updates", "agent.json");
 	return join(env.xdgCacheHome || (platform() === "win32" ? env.localAppData || join(homedir(), "AppData", "Local") : join(homedir(), ".cache")), "moltnet", "updates", "agent.json");
 }
 async function readCache() {
@@ -13297,16 +13403,25 @@ async function writeCache(cache) {
 }
 //#endregion
 //#region src/version.ts
-var DAEMON_VERSION = "0.62.0";
+var DAEMON_VERSION = "0.63.1";
 //#endregion
 //#region src/cli.ts
 async function runAgentDaemonCli(options) {
 	const [subcommand, ...rest] = options.argv ?? process.argv.slice(2);
-	if ([
+	const help = subcommand === "--help" || subcommand === "-h" || [
 		"poll",
 		"drain",
-		"serve"
-	].includes(subcommand ?? "") && !isWorkspaceInvocation()) checkDaemonUpdate({ currentVersion: DAEMON_VERSION }).then((update) => {
+		"once",
+		"server",
+		"providers",
+		"sync-sessions"
+	].includes(subcommand ?? "") && isHelpFlag(rest);
+	const notice = legacyStoreNotice();
+	if (notice && !help) {
+		console.error(notice);
+		markLegacyStoreNoticeShown();
+	}
+	if (["poll", "drain"].includes(subcommand ?? "") && !isWorkspaceInvocation()) checkDaemonUpdate({ currentVersion: DAEMON_VERSION }).then((update) => {
 		if (update.updateAvailable) pino({ name: "moltnet.agent-daemon" }).info({
 			event: "agent-daemon.update_available",
 			update

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@themoltnet/agent-daemon",
-  "version": "0.62.0",
+  "version": "0.63.1",
   "license": "AGPL-3.0-only",
   "type": "module",
   "description": "Universal MoltNet agent daemon host with a built-in Pi/Gondolin runtime and support for trusted operator-owned runtime modules. CLI: moltnet-agent.",
@@ -84,10 +84,10 @@
     "pino-pretty": "^13.1.3",
     "proper-lockfile": "4.1.2",
     "typebox": "^1.2.8",
-    "@themoltnet/agent-runtime": "1.2.0",
-    "@themoltnet/pi-runtime": "0.18.2",
-    "@themoltnet/os-keyring": "0.3.0",
-    "@themoltnet/sdk": "0.144.0"
+    "@themoltnet/os-keyring": "0.4.0",
+    "@themoltnet/agent-runtime": "1.3.0",
+    "@themoltnet/pi-runtime": "0.18.3",
+    "@themoltnet/sdk": "0.145.0"
   },
   "devDependencies": {
     "@fastify/swagger": "^9.6.1",
@@ -97,16 +97,16 @@
     "vite": "^8.0.0",
     "vite-plugin-dts": "^4.5.4",
     "vitest": "^3.0.0",
-    "@moltnet/api-client": "0.1.0",
     "@moltnet/agent-eval": "0.1.0",
-    "@moltnet/bootstrap": "0.1.0",
     "@moltnet/crypto-service": "0.1.0",
     "@moltnet/execution-integrations": "0.1.0",
-    "@moltnet/models": "0.1.0",
-    "@moltnet/observability": "0.1.0",
     "@moltnet/loopback-companion": "0.1.0",
+    "@moltnet/bootstrap": "0.1.0",
+    "@moltnet/api-client": "0.1.0",
+    "@moltnet/models": "0.1.0",
     "@moltnet/execution-plan": "0.1.0",
     "@moltnet/runtime-profiles": "0.1.0",
+    "@moltnet/observability": "0.1.0",
     "@moltnet/tasks": "0.1.0"
   },
   "nx": {
@@ -137,6 +137,8 @@
         "inputs": [
           "default",
           "^production",
+          "{workspaceRoot}/test-fixtures/agent-server-endpoint.json",
+          "{workspaceRoot}/test-fixtures/connection-state-root.json",
           "{workspaceRoot}/docs/operate/*.md",
           "{workspaceRoot}/docs/.vitepress/config.ts"
         ]
@@ -145,7 +147,7 @@
   },
   "scripts": {
     "cli": "tsx src/main.ts",
-    "dev": "tsx watch src/main.ts",
+    "dev": "tsx ../../tools/src/desktop-development.ts tsx watch src/main.ts",
     "start": "node dist/main.js",
     "build": "vite build",
     "generate:openapi": "tsx scripts/generate-openapi.ts",