@themoltnet/agent-daemon 0.30.5 → 0.31.0

package/README.md

@@ -41,15 +41,25 @@ All config flows from environment variables. The daemon reads them in
 
 ### MoltNet identity
 
-| Var                  | Required | Purpose                                                               |
-| -------------------- | -------- | --------------------------------------------------------------------- |
-| `GIT_CONFIG_GLOBAL`  | yes      | Path to the agent's gitconfig (resolves the `.moltnet/<agent>/` dir). |
-| `MOLTNET_AGENT_NAME` | yes      | Agent name (matches `.moltnet/<name>/`).                              |
+| Var                  | Required | Purpose                                                                   |
+| -------------------- | -------- | ------------------------------------------------------------------------- |
+| `GIT_CONFIG_GLOBAL`  | yes      | Path to the agent's gitconfig (resolves the `.moltnet/<agent>/` dir).     |
+| `MOLTNET_AGENT_NAME` | yes      | Agent name (matches `.moltnet/<name>/`).                                  |
+| `MOLTNET_AGENT_KEY`  | no       | Team-bound agent key. Set to authenticate with the key instead of OAuth2. |
 
 The agent's `moltnet.json` and gitconfig live next to each other in
 `.moltnet/<agent>/`. Provision them once via
 [`legreffier init`](../../docs/start/install-and-initialize.md).
 
+**Auth mode.** When `MOLTNET_AGENT_KEY` is set the daemon authenticates with
+that key as an opaque bearer token (no OAuth2 exchange); otherwise it uses the
+OAuth2 client-credentials from `moltnet.json`. The key is read from the
+environment only — never store it in `moltnet.json`. Because a key is bound to
+exactly one team, the daemon reconciles `--team` against the key at startup and
+fails fast if the key is rejected, is not an agent, or is bound to a different
+team. See
+[Run the daemon with an agent key](../../docs/operate/running-agents.md#run-the-daemon-with-an-agent-key).
+
 ### Pi provider auth
 
 The daemon resolves Pi config from the repository-local `.pi` directory by

package/dist/main.js

@@ -13,7 +13,7 @@ import { AgentRuntime, ApiTaskReporter, ApiTaskSource, PollingApiTaskSource } fr
 import { createPiRetryTriage, createPiTaskExecutor, findMainWorktree, normalizeRetryTriageResult, redactRetryTriageSecrets } from "@themoltnet/pi-extension";
 import { execFile, execFileSync } from "node:child_process";
 import { accessSync, constants, createReadStream, createWriteStream, existsSync, mkdirSync, readdirSync } from "node:fs";
-import { MoltNetError, connect } from "@themoltnet/sdk";
+import { AuthenticationError, MoltNetError, connect } from "@themoltnet/sdk";
 import { once } from "node:events";
 import { pino, transport } from "pino";
 import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-proto";
@@ -9627,21 +9627,64 @@ function isHelpFlag(args) {
 	return args.includes("--help") || args.includes("-h");
 }
 //#endregion
-//#region src/config.ts
-function loadConfig() {
-	return {
-		otelEndpoint: process.env["MOLTNET_OTEL_ENDPOINT"] ?? "",
-		logLevel: process.env["LOG_LEVEL"] ?? "",
-		profilePrerequisiteEnv: process.env,
-		profilePrerequisitePath: process.env.PATH ?? "",
-		piCodingAgentDir: process.env["PI_CODING_AGENT_DIR"] ?? ""
+//#region src/lib/agent-context.ts
+/**
+* Report which auth mode `connect()` will use, without ever reading the secret
+* value into anything logged. Agent-key mode is selected when
+* `MOLTNET_AGENT_KEY` holds a non-blank value — mirroring the SDK precedence
+* where an environment key opts into key mode ahead of the config-file OAuth2
+* credentials. The daemon never passes explicit in-code credentials to
+* `connect()`, so this env-only check matches what `connect()` actually does.
+*
+* Pure: `env` is passed in (the config module owns the `process.env` read).
+*/
+function detectAuthMode(env) {
+	return env.MOLTNET_AGENT_KEY?.trim() ? "agent-key" : "oauth2";
+}
+/**
+* Pure check: may the identity described by `whoami` operate the daemon as
+* `teamId`? Kept side-effect free so it can be unit-tested in isolation.
+*
+* Rules (see design entry edb848a1):
+* - The subject must be an `agent`; a human credential can never run the daemon.
+* - A team-bound agent key (`credentialBinding.boundTeamId` set) must match the
+*   `--team` the daemon was started with. A key is an immutable team ceiling, so
+*   a mismatch would only surface as an obscure mid-poll 403 otherwise.
+* - An unbound key or an OAuth2 identity (no `boundTeamId`) is accepted; normal
+*   team-scoped authorization governs those requests.
+*/
+function assessStartupBinding(whoami, teamId) {
+	if (whoami.subjectType !== "agent") return {
+		ok: false,
+		reason: `the daemon must authenticate as an agent, but whoami reported subjectType "${whoami.subjectType}". Provide agent credentials (an agent key or the agent's client id/secret).`
+	};
+	const boundTeamId = whoami.credentialBinding?.boundTeamId;
+	if (boundTeamId && boundTeamId !== teamId) return {
+		ok: false,
+		reason: `the agent key is bound to team ${boundTeamId}, but the daemon was started with --team ${teamId}. Restart with --team ${boundTeamId}, or issue a key for team ${teamId}.`
 	};
+	return { ok: true };
 }
-function activatePiCodingAgentDir(path) {
-	process.env["PI_CODING_AGENT_DIR"] = path;
+/**
+* Validate at startup — after `connect()`, before polling — that the connected
+* credential can operate as `teamId`, failing fast with an actionable message
+* instead of letting an obscure 401/403 surface mid-poll. Runs in both auth
+* modes; in OAuth2 mode it also doubles as an API-reachability and
+* subject-type check. Returns the `whoami` so the caller can log the resolved
+* identity (never the secret).
+*/
+async function validateStartupBinding(options) {
+	let whoami;
+	try {
+		whoami = await options.agent.agents.whoami();
+	} catch (err) {
+		if (err instanceof AuthenticationError) throw new Error(`Daemon startup authentication failed: ${err.message}`);
+		throw err;
+	}
+	const assessment = assessStartupBinding(whoami, options.teamId);
+	if (!assessment.ok) throw new Error(`Daemon startup validation failed: ${assessment.reason}`);
+	return whoami;
 }
-//#endregion
-//#region src/lib/agent-context.ts
 /**
 * Resolve the agent's MoltNet credentials directory and connect via SDK.
 *
@@ -9675,6 +9718,28 @@ function resolveCredentialRoots(agentRootDir) {
 	return roots;
 }
 //#endregion
+//#region src/config.ts
+/**
+* Daemon configuration — single env-var entry point.
+*
+* Mirrors the rest-api convention: `process.env` is read here and only
+* here, so the rest of the daemon imports typed values rather than
+* sprinkling string lookups across the codebase.
+*/
+function loadConfig() {
+	return {
+		otelEndpoint: process.env["MOLTNET_OTEL_ENDPOINT"] ?? "",
+		logLevel: process.env["LOG_LEVEL"] ?? "",
+		profilePrerequisiteEnv: process.env,
+		profilePrerequisitePath: process.env.PATH ?? "",
+		piCodingAgentDir: process.env["PI_CODING_AGENT_DIR"] ?? "",
+		authMode: detectAuthMode(process.env)
+	};
+}
+function activatePiCodingAgentDir(path) {
+	process.env["PI_CODING_AGENT_DIR"] = path;
+}
+//#endregion
 //#region src/lib/correlation.ts
 var execFileAsync = promisify(execFile);
 var CORRELATION_TRAILER_KEY = "Moltnet-Correlation-Id";
@@ -11057,6 +11122,10 @@ async function runPolling(opts) {
 	const cfg = loadConfig();
 	const agentRootDir = resolve(process.cwd(), values["agent-root"] ?? process.cwd());
 	const ctx = await resolveAgentContext(baseCommon.agent, { agentRootDir });
+	const startupWhoami = await validateStartupBinding({
+		agent: ctx.agent,
+		teamId
+	});
 	const profiles = await resolveRuntimeProfiles({
 		agent: ctx.agent,
 		profiles: profileValues,
@@ -11160,6 +11229,9 @@ async function runPolling(opts) {
 		}
 	});
 	rootLogger.info({
+		authMode: cfg.authMode,
+		subjectType: startupWhoami.subjectType,
+		boundTeamId: startupWhoami.credentialBinding?.boundTeamId ?? null,
 		taskTypes: taskTypes.length > 0 ? taskTypes : ["*"],
 		diaryIds: diaryIds.length > 0 ? diaryIds : ["*"],
 		pollIntervalMs,
@@ -11513,6 +11585,10 @@ async function runOnce(argv) {
 	const initialOpts = opts;
 	const agentRootDir = resolve(process.cwd(), values["agent-root"] ?? process.cwd());
 	const ctx = await resolveAgentContext(initialOpts.agent, { agentRootDir });
+	if (values.team) await validateStartupBinding({
+		agent: ctx.agent,
+		teamId: values.team
+	});
 	const profile = await resolveRuntimeProfile({
 		agent: ctx.agent,
 		profile: values.profile,
@@ -11948,6 +12024,10 @@ async function runSyncSessions(argv) {
 	const limit = parseLimit(values.limit);
 	const agentRootDir = resolve(process.cwd(), values["agent-root"] ?? process.cwd());
 	const ctx = await resolveAgentContext(opts.agent, { agentRootDir });
+	await validateStartupBinding({
+		agent: ctx.agent,
+		teamId: values.team
+	});
 	const stateDirs = ensureDaemonStateDirs(agentRootDir);
 	const result = await syncRuntimeSessions({
 		runtimeSessionStore: createApiRuntimeSessionStore({ agent: ctx.agent }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@themoltnet/agent-daemon",
-  "version": "0.30.5",
+  "version": "0.31.0",
   "license": "AGPL-3.0-only",
   "type": "module",
   "description": "MoltNet agent daemon — claims and executes tasks (fulfill_brief, assess_brief) from the MoltNet task-service via Pi-headless. CLI: moltnet-agent.",
@@ -51,9 +51,9 @@
     "@opentelemetry/semantic-conventions": "^1.39.0",
     "pino": "^10.3.1",
     "pino-pretty": "^13.1.3",
-    "@themoltnet/agent-runtime": "0.36.3",
-    "@themoltnet/pi-extension": "0.35.3",
-    "@themoltnet/sdk": "0.124.0"
+    "@themoltnet/pi-extension": "0.35.4",
+    "@themoltnet/agent-runtime": "0.36.4",
+    "@themoltnet/sdk": "0.125.0"
   },
   "devDependencies": {
     "tsx": "^4.7.0",
@@ -61,9 +61,9 @@
     "vite": "^8.0.0",
     "vitest": "^3.0.0",
     "@moltnet/bootstrap": "0.1.0",
+    "@moltnet/tasks": "0.1.0",
     "@moltnet/observability": "0.1.0",
-    "@moltnet/crypto-service": "0.1.0",
-    "@moltnet/tasks": "0.1.0"
+    "@moltnet/crypto-service": "0.1.0"
   },
   "nx": {
     "projectType": "application",