@themoltnet/agent-daemon 0.14.6 → 0.16.0

package/dist/main.js

@@ -1,5 +1,12 @@
 #!/usr/bin/env node
 import { createRequire } from "node:module";
+import { registerInstrumentations } from "@opentelemetry/instrumentation";
+import { DnsInstrumentation } from "@opentelemetry/instrumentation-dns";
+import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
+import { NetInstrumentation } from "@opentelemetry/instrumentation-net";
+import { PgInstrumentation } from "@opentelemetry/instrumentation-pg";
+import { PinoInstrumentation } from "@opentelemetry/instrumentation-pino";
+import { UndiciInstrumentation } from "@opentelemetry/instrumentation-undici";
 import crypto$1, { createHash } from "crypto";
 import { createHash as createHash$1 } from "node:crypto";
 import path, { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
@@ -55,6 +62,84 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __hasOwnProp.call(mod, "module.exports") ? mod["module.exports"] : __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 //#endregion
+//#region ../../libs/observability/src/instrumentation.ts
+/**
+* Register OTel auto-instrumentation for common Node.js modules.
+*
+* MUST be called before any other imports that load pg, http, net, dns, or
+* pino. In ESM, place this in a dedicated side-effect module that is the
+* first import in the app entrypoint:
+*
+* ```ts
+* // instrumentation.ts (app-level)
+* import { initInstrumentation } from '@moltnet/observability';
+* initInstrumentation({ pg: true, httpIgnoreIncomingPaths: ['/health'] });
+* ```
+*
+* ```ts
+* // main.ts
+* import './instrumentation.js'; // ← MUST be first
+* import { bootstrap } from './bootstrap.js';
+* ```
+*
+* The registered instrumentations pick up the global TracerProvider once
+* it is set by `initObservability()`. Call this function first, then call
+* `initObservability()`.
+*
+* Returns the registered instrumentation instances so callers (and tests) can
+* introspect what was wired — e.g. assert that pino/undici correlation is
+* enabled. The return value is otherwise inert; callers may ignore it.
+*/
+function initInstrumentation(config) {
+	const { http = true, dns = true, net = true, pg = true, pino = true, httpIgnoreIncomingPaths = [] } = config;
+	const instrumentations = [];
+	if (http) instrumentations.push(new HttpInstrumentation({ ignoreIncomingRequestHook: httpIgnoreIncomingPaths.length > 0 ? (req) => {
+		const url = req.url ?? "";
+		return httpIgnoreIncomingPaths.some((path) => url.startsWith(path));
+	} : void 0 }), new UndiciInstrumentation());
+	if (dns) instrumentations.push(new DnsInstrumentation());
+	if (net) instrumentations.push(new NetInstrumentation());
+	if (pg) instrumentations.push(new PgInstrumentation());
+	if (pino) instrumentations.push(new PinoInstrumentation());
+	registerInstrumentations({ instrumentations });
+	return instrumentations;
+}
+//#endregion
+//#region src/instrumentation.ts
+/**
+* OTel auto-instrumentation registration for the agent daemon.
+*
+* This file MUST be imported first in main.ts — before any module that
+* transitively imports http, net, dns, undici (global fetch), or pino. In
+* ESM, imports execute in declaration order, so placing this first guarantees
+* the monkey-patches land before those modules load. In particular:
+*
+*   - UndiciInstrumentation patches `globalThis.fetch` so every outbound SDK
+*     call (@themoltnet/sdk uses global fetch — see libs/sdk/src/connect.ts)
+*     carries a W3C `traceparent` header. That is what links the daemon's
+*     trace to the rest-api server span: one distributed trace, end to end.
+*   - PinoInstrumentation injects `trace_id` / `span_id` into every pino log
+*     record, so logs correlate with the active span in Axiom. It patches
+*     pino at import time — hence the strict ordering requirement. It does
+*     NOT add a transport, so the logger's pino-pretty shutdown dance
+*     (lib/logger.ts, issue #1107) stays valid.
+*
+* The registered instrumentations bind to the global TracerProvider once it
+* is registered by `initWorkerOtel()` (lib/otel.ts, via provider.register()).
+* Registration order is fine: instrumentations created here pick up the
+* provider whenever it is set; spans only flow once it is registered.
+*
+* No `pg` instrumentation — the daemon has no direct database access. No
+* `runtime-node` — that is server-side process metrics, out of scope here.
+*/
+initInstrumentation({
+	http: true,
+	dns: true,
+	net: true,
+	pino: true,
+	pg: false
+});
+//#endregion
 //#region ../../node_modules/.pnpm/typebox@1.2.8/node_modules/typebox/build/format/date.mjs
 var DAYS = [
 	0,
@@ -4188,6 +4273,155 @@ var TaskContext = _Array_(_Object_({
 	maxItems: 5
 });
 //#endregion
+//#region ../../libs/tasks/src/daemon-profiles.ts
+var DaemonProfileName = String$1({
+	minLength: 1,
+	maxLength: 100,
+	pattern: "^[a-zA-Z0-9][a-zA-Z0-9_-]{0,99}$"
+});
+var DaemonProfileEnvName = String$1({
+	minLength: 1,
+	maxLength: 128,
+	pattern: "^[A-Z_][A-Z0-9_]*$"
+});
+var DaemonProfileToolName = String$1({
+	minLength: 1,
+	maxLength: 128,
+	pattern: "^[a-zA-Z0-9._/-]+$"
+});
+var SandboxResumeCommandWhenSchema = _Object_({ workspaceMode: Optional(_Array_(Union([
+	Literal("shared_mount"),
+	Literal("dedicated_worktree"),
+	Literal("scratch_mount")
+]), {
+	minItems: 1,
+	maxItems: 3
+})) }, { additionalProperties: false });
+var DaemonProfileSandboxResumeCommand = Union([String$1({
+	minLength: 1,
+	maxLength: 4096
+}), _Object_({
+	run: String$1({
+		minLength: 1,
+		maxLength: 4096
+	}),
+	when: Optional(SandboxResumeCommandWhenSchema),
+	retries: Optional(Integer({
+		minimum: 0,
+		maximum: 5
+	})),
+	retryBackoffMs: Optional(Integer({
+		minimum: 0,
+		maximum: 6e4
+	}))
+}, { additionalProperties: false })]);
+var DaemonProfileSandbox = _Object_({
+	snapshot: Optional(_Object_({
+		setupCommands: Optional(_Array_(String$1({
+			minLength: 1,
+			maxLength: 4096
+		}), { maxItems: 20 })),
+		allowedHosts: Optional(_Array_(String$1({
+			minLength: 1,
+			maxLength: 255
+		}), { maxItems: 50 })),
+		overlaySize: Optional(String$1({
+			minLength: 2,
+			maxLength: 16,
+			pattern: "^[0-9]+[KMGTP]?$"
+		}))
+	}, { additionalProperties: false })),
+	resumeCommands: Optional(_Array_(DaemonProfileSandboxResumeCommand, { maxItems: 30 })),
+	vfs: Optional(_Object_({
+		shadow: Optional(_Array_(String$1({
+			minLength: 1,
+			maxLength: 255
+		}), { maxItems: 100 })),
+		shadowMode: Optional(Union([Literal("deny"), Literal("tmpfs")]))
+	}, { additionalProperties: false })),
+	env: Optional(Record(DaemonProfileEnvName, String$1({ maxLength: 4096 }))),
+	hostExec: Optional(_Object_({ autoApprove: Optional(Literal(false)) }, { additionalProperties: false })),
+	resources: Optional(_Object_({
+		memory: Optional(String$1({
+			minLength: 2,
+			maxLength: 16,
+			pattern: "^[0-9]+[KMG]?$"
+		})),
+		cpus: Optional(Integer({
+			minimum: 1,
+			maximum: 32
+		}))
+	}, { additionalProperties: false }))
+}, {
+	$id: "DaemonProfileSandbox",
+	additionalProperties: false
+});
+var DaemonProfileContext = _Object_({
+	slug: String$1({
+		minLength: 1,
+		maxLength: 64,
+		pattern: "^[a-zA-Z0-9_-]+$"
+	}),
+	binding: Union([
+		Literal("skill"),
+		Literal("context_inline"),
+		Literal("prompt_prefix"),
+		Literal("user_inline")
+	]),
+	content: String$1({
+		minLength: 1,
+		maxLength: 65536
+	})
+}, {
+	$id: "DaemonProfileContext",
+	additionalProperties: false
+});
+var DaemonProfileRef = _Object_({ profileId: String$1({ format: "uuid" }) }, {
+	$id: "DaemonProfileRef",
+	additionalProperties: false
+});
+_Object_({
+	id: String$1({ format: "uuid" }),
+	teamId: String$1({ format: "uuid" }),
+	name: DaemonProfileName,
+	description: Union([String$1({ maxLength: 4096 }), Null()]),
+	provider: String$1({
+		minLength: 1,
+		maxLength: 100
+	}),
+	model: String$1({
+		minLength: 1,
+		maxLength: 200
+	}),
+	runtimeKind: Literal("gondolin_pi"),
+	sandbox: DaemonProfileSandbox,
+	sessionStorageMode: Literal("local"),
+	workspaceStorageMode: Literal("local"),
+	sessionTtlSec: Integer({
+		minimum: 1,
+		maximum: 86400
+	}),
+	workspaceTtlSec: Integer({
+		minimum: 1,
+		maximum: 86400
+	}),
+	requiredEnv: _Array_(DaemonProfileEnvName, { maxItems: 100 }),
+	requiredTools: _Array_(DaemonProfileToolName, { maxItems: 100 }),
+	context: _Array_(DaemonProfileContext, { maxItems: 5 }),
+	revision: Integer({ minimum: 1 }),
+	definitionCid: String$1({
+		minLength: 1,
+		maxLength: 100
+	}),
+	createdByAgentId: Union([String$1({ format: "uuid" }), Null()]),
+	createdByHumanId: Union([String$1({ format: "uuid" }), Null()]),
+	createdAt: String$1({ format: "date-time" }),
+	updatedAt: String$1({ format: "date-time" })
+}, {
+	$id: "DaemonProfile",
+	additionalProperties: false
+});
+//#endregion
 //#region ../../libs/tasks/src/rubric.ts
 /**
 * Rubric — structured acceptance criteria used by judgment tasks.
@@ -8890,14 +9124,6 @@ var ExecutorTrustLevel = Union([
 	Literal("releaseVerifiedTool"),
 	Literal("sandboxAttested")
 ], { $id: "ExecutorTrustLevel" });
-/** Identifies a (provider, model) daemon pair allowed to claim a task. */
-var ExecutorRef = _Object_({
-	provider: String$1({ minLength: 1 }),
-	model: String$1({ minLength: 1 })
-}, {
-	$id: "ExecutorRef",
-	additionalProperties: false
-});
 var OutputKind = Union([Literal("artifact"), Literal("judgment")], { $id: "OutputKind" });
 var TaskMessageKind = Union([
 	Literal("text_delta"),
@@ -9042,7 +9268,7 @@ _Object_({
 	acceptedAttemptN: Union([Number$1(), Null()]),
 	claimCondition: Union([Unsafe(Ref$2("ClaimCondition")), Null()]),
 	requiredExecutorTrustLevel: ExecutorTrustLevel,
-	allowedExecutors: _Array_(ExecutorRef, { maxItems: 16 }),
+	allowedProfiles: _Array_(DaemonProfileRef, { maxItems: 16 }),
 	status: TaskStatus,
 	queuedAt: IsoTimestamp,
 	completedAt: Union([IsoTimestamp, Null()]),
@@ -30823,7 +31049,6 @@ var PollingApiTaskSource = class {
 		this.minBackoffMs = opts.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
 		this.maxBackoffMs = opts.maxPollIntervalMs ?? DEFAULT_MAX_POLL_INTERVAL_MS;
 		if (this.maxBackoffMs < this.minBackoffMs) throw new Error(`PollingApiTaskSource: maxPollIntervalMs (${this.maxBackoffMs}) must be >= pollIntervalMs (${this.minBackoffMs})`);
-		if (Boolean(opts.provider) !== Boolean(opts.model)) throw new Error("PollingApiTaskSource: provider and model must be set together");
 		this.listLimit = opts.listLimit ?? DEFAULT_LIST_LIMIT;
 		this.currentBackoffMs = this.minBackoffMs;
 		this.logger = (opts.logger ?? pino({ name: "polling-api-source" })).child({ teamId: opts.teamId });
@@ -30866,10 +31091,7 @@ var PollingApiTaskSource = class {
 				teamId: this.opts.teamId,
 				status: "queued",
 				...taskTypes ? { taskTypes } : {},
-				...this.opts.provider && this.opts.model ? {
-					provider: this.opts.provider,
-					model: this.opts.model
-				} : {},
+				...this.opts.profileId ? { profileId: this.opts.profileId } : {},
 				...cursor ? { cursor } : {},
 				limit: this.listLimit
 			});
@@ -30884,9 +31106,9 @@ var PollingApiTaskSource = class {
 				if (this.opts.taskTypes && this.opts.taskTypes.length > 0 && !this.opts.taskTypes.includes(item.taskType)) continue;
 				if (this.opts.diaryIds && this.opts.diaryIds.length > 0 && (item.diaryId === null || !this.opts.diaryIds.includes(item.diaryId))) continue;
 				if (this.opts.slotRegistry && !await isContinuationClaimableByThisDaemon(item, this.opts.slotRegistry)) continue;
-				if (this.opts.provider && this.opts.model) {
-					const allowed = item.allowedExecutors ?? [];
-					if (allowed.length > 0 && !allowed.some((e) => e.provider === this.opts.provider && e.model === this.opts.model)) continue;
+				if (this.opts.profileId) {
+					const allowed = item.allowedProfiles ?? [];
+					if (allowed.length > 0 && !allowed.some((p) => p.profileId === this.opts.profileId)) continue;
 				}
 				if (item.status !== "queued") continue;
 				seen.add(item.id);
@@ -30909,7 +31131,10 @@ var PollingApiTaskSource = class {
 		for (const task of candidates) {
 			if (this.aborted()) return null;
 			try {
-				const result = await this.opts.agent.tasks.claim(task.id, { leaseTtlSec: this.opts.leaseTtlSec });
+				const result = await this.opts.agent.tasks.claim(task.id, {
+					leaseTtlSec: this.opts.leaseTtlSec,
+					...this.opts.profileId ? { profileId: this.opts.profileId } : {}
+				});
 				if (this.opts.debug) this.logger.debug({
 					taskId: result.task.id,
 					taskType: result.task.taskType,
@@ -34938,8 +35163,6 @@ async function runPolling(opts) {
 				agent: ctx.agent,
 				teamId,
 				taskTypes: taskTypes.length > 0 ? taskTypes : void 0,
-				provider: common.provider.toLowerCase(),
-				model: common.model.toLowerCase(),
 				diaryIds: diaryIds.length > 0 ? diaryIds : void 0,
 				leaseTtlSec: common.leaseTtlSec,
 				listLimit,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@themoltnet/agent-daemon",
-  "version": "0.14.6",
+  "version": "0.16.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.",
@@ -32,6 +32,12 @@
     "@earendil-works/pi-coding-agent": "^0.74.0",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/exporter-trace-otlp-proto": "^0.212.0",
+    "@opentelemetry/instrumentation": "^0.212.0",
+    "@opentelemetry/instrumentation-dns": "^0.55.0",
+    "@opentelemetry/instrumentation-http": "^0.212.0",
+    "@opentelemetry/instrumentation-net": "^0.56.0",
+    "@opentelemetry/instrumentation-pino": "^0.58.0",
+    "@opentelemetry/instrumentation-undici": "^0.22.0",
     "@opentelemetry/resources": "^2.5.1",
     "@opentelemetry/sdk-trace-base": "^2.5.1",
     "@opentelemetry/sdk-trace-node": "^2.5.1",
@@ -39,18 +45,20 @@
     "pino": "^10.3.1",
     "pino-pretty": "^13.1.3",
     "@themoltnet/agent-daemon-state": "0.2.0",
-    "@themoltnet/agent-runtime": "0.22.4",
-    "@themoltnet/pi-extension": "0.22.5",
-    "@themoltnet/sdk": "0.106.0"
+    "@themoltnet/pi-extension": "0.23.0",
+    "@themoltnet/sdk": "0.107.0",
+    "@themoltnet/agent-runtime": "0.23.0"
   },
   "devDependencies": {
     "tsx": "^4.7.0",
     "typescript": "~5.9.2",
     "vite": "^8.0.0",
     "vitest": "^3.0.0",
+    "@moltnet/api-client": "0.1.0",
+    "@moltnet/crypto-service": "0.1.0",
+    "@moltnet/observability": "0.1.0",
     "@moltnet/tasks": "0.1.0",
-    "@moltnet/bootstrap": "0.1.0",
-    "@moltnet/crypto-service": "0.1.0"
+    "@moltnet/bootstrap": "0.1.0"
   },
   "nx": {
     "tags": [