@app-vitals/agent-runtime 1.6.0 → 1.8.0

package/Dockerfile

@@ -216,6 +216,8 @@ COPY agent-types/ ./agent-types/
 # Composition root spawned by runtime/entrypoint.ts (../index.ts).
 COPY index.ts ./index.ts
 COPY scripts/ ./scripts/
+# Baked marketplace (plugins/.claude-plugin/marketplace.json + plugins/<name>/).
+COPY plugins/ ./plugins/
 
 # Module-resolution guard: bundle every runtime source file as its own entry
 # point so an unresolvable import fails the build itself, rather than only
@@ -259,6 +261,9 @@ COPY --from=build --chown=1000:1000 /app/agent-types ./agent-types
 COPY --from=build --chown=1000:1000 /app/index.ts ./index.ts
 COPY --from=build --chown=1000:1000 /app/scripts ./scripts
 COPY --from=build --chown=1000:1000 /app/package.json ./package.json
+# Baked marketplace: installPlugins() (runtime/setup.ts) registers every
+# /opt/shipwright/marketplaces/<name>/ that has .claude-plugin/marketplace.json.
+COPY --from=build --chown=1000:1000 /app/plugins /opt/shipwright/marketplaces/app-vitals-agent/
 
 RUN chmod +x /app/scripts/bin/git-credential-shipwright.sh \
     && chmod +x /app/scripts/bin/gh \

package/baked-marketplaces-reporter.ts

@@ -0,0 +1,51 @@
+/**
+ * Baked marketplace reporter — at boot, lists the marketplace directories
+ * baked into the image (BAKED_MARKETPLACES_ROOT) and reports their names to
+ * admin: PUT /agents/:agentId/baked-marketplaces (overwrite). Read-only
+ * visibility: admin stores the list so the UI can show what the image ships.
+ *
+ * Fire-and-forget: never throws; non-2xx and thrown errors are swallowed with
+ * console.warn. The payload is the directory basenames only.
+ */
+
+import { basename } from "node:path";
+import { BAKED_MARKETPLACES_ROOT, discoverBakedMarketplaces } from "./setup.ts";
+
+const REQUEST_TIMEOUT_MS = 10_000;
+
+interface ReportBakedMarketplacesOptions {
+  apiUrl: string;
+  agentId: string;
+  apiKey: string;
+  root?: string;
+  fetchFn?: typeof fetch;
+}
+
+export async function reportBakedMarketplaces(
+  opts: ReportBakedMarketplacesOptions,
+): Promise<void> {
+  const url = `${opts.apiUrl}/agents/${opts.agentId}/baked-marketplaces`;
+  try {
+    const names = discoverBakedMarketplaces(
+      opts.root ?? BAKED_MARKETPLACES_ROOT,
+    ).map((dir) => basename(dir));
+    const res = await (opts.fetchFn ?? fetch)(url, {
+      method: "PUT",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${opts.apiKey}`,
+      },
+      body: JSON.stringify({ names }),
+      signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
+    });
+    if (!res.ok) {
+      console.warn(
+        `[baked-marketplaces-reporter] PUT ${url} returned ${res.status} — swallowing`,
+      );
+    }
+  } catch (err) {
+    console.warn(
+      `[baked-marketplaces-reporter] PUT ${url} failed: ${String(err)} — swallowing`,
+    );
+  }
+}

package/baked-marketplaces-reporter.unit.test.ts

@@ -0,0 +1,77 @@
+/**
+ * Unit tests for reportBakedMarketplaces: reads the baked marketplace dirs,
+ * PUTs the names once, and never throws.
+ */
+
+import { afterEach, describe, expect, test } from "bun:test";
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { reportBakedMarketplaces } from "./baked-marketplaces-reporter.ts";
+
+const roots: string[] = [];
+afterEach(() => {
+  for (const r of roots.splice(0)) rmSync(r, { recursive: true, force: true });
+});
+
+function bakedRoot(names: string[]): string {
+  const root = mkdtempSync(join(tmpdir(), "baked-"));
+  roots.push(root);
+  for (const n of names) {
+    mkdirSync(join(root, n, ".claude-plugin"), { recursive: true });
+    writeFileSync(join(root, n, ".claude-plugin", "marketplace.json"), "{}");
+  }
+  return root;
+}
+
+function harness(response: Response | Error = new Response("{}")) {
+  const calls: { url: string; init: RequestInit | undefined }[] = [];
+  const fetchFn = (async (url: string | URL | Request, init?: RequestInit) => {
+    calls.push({ url: String(url), init });
+    if (response instanceof Error) throw response;
+    return response;
+  }) as typeof fetch;
+  return { calls, fetchFn };
+}
+
+const base = { apiUrl: "http://admin", agentId: "a1", apiKey: "k" };
+
+describe("reportBakedMarketplaces", () => {
+  test("PUTs the basenames once with the agent key", async () => {
+    const root = bakedRoot(["vitals-os", "shipwright"]);
+    const { calls, fetchFn } = harness();
+    await reportBakedMarketplaces({ ...base, root, fetchFn });
+    expect(calls).toHaveLength(1);
+    expect(calls[0].url).toBe("http://admin/agents/a1/baked-marketplaces");
+    expect(calls[0].init?.method).toBe("PUT");
+    expect(new Headers(calls[0].init?.headers).get("authorization")).toBe(
+      "Bearer k",
+    );
+    const body = JSON.parse(calls[0].init?.body as string);
+    expect([...body.names].sort()).toEqual(["shipwright", "vitals-os"]);
+  });
+
+  test("reports an empty list when the root is missing", async () => {
+    const { calls, fetchFn } = harness();
+    await reportBakedMarketplaces({
+      ...base,
+      root: "/nonexistent-baked-root",
+      fetchFn,
+    });
+    expect(JSON.parse(calls[0].init?.body as string)).toEqual({ names: [] });
+  });
+
+  test("swallows a non-2xx response", async () => {
+    const { fetchFn } = harness(new Response("no", { status: 500 }));
+    await expect(
+      reportBakedMarketplaces({ ...base, root: bakedRoot(["x"]), fetchFn }),
+    ).resolves.toBeUndefined();
+  });
+
+  test("swallows a thrown fetch error", async () => {
+    const { fetchFn } = harness(new Error("boom"));
+    await expect(
+      reportBakedMarketplaces({ ...base, root: bakedRoot(["x"]), fetchFn }),
+    ).resolves.toBeUndefined();
+  });
+});

package/base-image-contract.smoke.test.ts

@@ -113,6 +113,27 @@ describe.skipIf(!BASE_IMAGE)("agent base-image contract", () => {
     expect(adds).toContain(`${CONVENTION_ROOT}/${MARKETPLACE_NAME}`);
   }, 60_000);
 
+  test("image bakes the app-vitals-agent marketplace and agent-platform plugin manifests", () => {
+    const base = `${CONVENTION_ROOT}/app-vitals-agent`;
+    const run = docker([
+      "run",
+      "--rm",
+      "--entrypoint",
+      "bash",
+      DERIVED_TAG,
+      "-c",
+      `cat ${base}/.claude-plugin/marketplace.json && echo ::SPLIT:: && cat ${base}/agent-platform/.claude-plugin/plugin.json && test -f ${base}/agent-platform/scripts/slack-say.ts && test -f ${base}/agent-platform/skills/slack-say/SKILL.md`,
+    ]);
+    expect(run.exitCode, run.stderr).toBe(0);
+    const [marketplaceJson, pluginJson] = run.stdout.split("::SPLIT::");
+    const marketplace = JSON.parse(marketplaceJson as string);
+    const plugin = JSON.parse(pluginJson as string);
+    expect(marketplace.name).toBe("app-vitals-agent");
+    expect(marketplace.plugins.map((p: { name: string }) => p.name)).toContain(
+      plugin.name,
+    );
+  }, 60_000);
+
   test("entrypoint-main.ts exists and runs under `bun run`", () => {
     // No agent id/url/key: runEntrypoint() reports the missing vars and exits 1.
     // A missing file or broken import graph fails differently ("Module not
@@ -170,10 +191,7 @@ describe.skipIf(!BASE_IMAGE)("agent base-image contract", () => {
 // Static guard (no Docker needed): the runtime stage must take node_modules
 // from the production-only stage, never the build stage's full install.
 describe("runtime Dockerfile", () => {
-  const dockerfile = readFileSync(
-    join(import.meta.dir, "Dockerfile"),
-    "utf8",
-  );
+  const dockerfile = readFileSync(join(import.meta.dir, "Dockerfile"), "utf8");
 
   test("copies node_modules from the production-only stage", () => {
     expect(dockerfile).toMatch(

package/boot.ts

@@ -39,6 +39,7 @@ import {
 } from "./agent-slack-membership-ref.ts";
 import { agentTrialExpiryRef } from "./agent-trial-expiry-ref.ts";
 import { applyEnvToProcess } from "./anthropic-federation-guard.ts";
+import { reportBakedMarketplaces } from "./baked-marketplaces-reporter.ts";
 import { createChatPoller } from "./chat-poller.ts";
 import {
   HttpChatTokenReporter,
@@ -259,6 +260,20 @@ export async function startAgent(
         })
       : new NoopGitHubInstallationsReporter();
 
+  // PMK-1.4: report the image's baked marketplace names to admin once at boot
+  // (overwrite, read-only visibility). Never throws; skipped when not wired.
+  if (
+    config.shipwright.apiUrl &&
+    config.shipwright.apiKey &&
+    config.shipwright.agentId
+  ) {
+    void reportBakedMarketplaces({
+      apiUrl: config.shipwright.apiUrl,
+      agentId: config.shipwright.agentId,
+      apiKey: config.shipwright.apiKey,
+    });
+  }
+
   // Always-loaded-context stamp (context-stamp.ts): fingerprints the workspace
   // CLAUDE.md + its imports + no-`paths` rules + the plugin version, read once
   // per run so cron-run rows can be grouped by what the model was given. The

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@app-vitals/agent-runtime",
-  "version": "1.6.0",
+  "version": "1.8.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/app-vitals/agent.git",
@@ -40,8 +40,8 @@
     "./workspace-paths": "./workspace-paths.ts"
   },
   "dependencies": {
-    "@app-vitals/agent-admin": "1.6.0",
-    "@app-vitals/agent-lib": "1.6.0",
+    "@app-vitals/agent-admin": "1.8.0",
+    "@app-vitals/agent-lib": "1.8.0",
     "@octokit/auth-app": "^8.2.0",
     "@sentry/bun": "^10.63.0",
     "@slack/bolt": "^5.0.0",