@opengeni/api-router 2.11.0-canary.0 → 2.11.2-canary.0

package/src/mcp/remember.ts

@@ -59,7 +59,7 @@ const laneFields = {
 /**
  * Explicit user-directed remember. Content becomes exact task-note evidence,
  * promotion runs through the frozen workspace learning policy, and activation
- * is either automatic (Skill or instruction under Automatic mode) or requires exactly one
+ * is either automatic (instruction under Automatic mode) or requires exactly one
  * bound human confirmation through the built-in `request_human_input` tool.
  * Tool input cannot select scope beyond the workspace, active authority, or
  * another learning-policy source.
@@ -70,9 +70,9 @@ export function registerRememberTools(input: RegisterRememberToolsInput): void {
     "remember",
     {
       description:
-        "Create governed durable knowledge, a Skill, or a mandatory workspace instruction. When the agent-only memory_save tool is available, use it instead for ordinary durable facts, decisions, incidents, bug fixes, and confirmed outcomes; those Memory writes are autonomous and independent of Learning mode. Use lane=knowledge only when memory_save is unavailable and the user explicitly requests reviewed workspace knowledge; lane=preference creates a Skill for reusable conditional how-to guidance; lane=instruction_policy is only for a universal always/never rule that should apply to nearly every task. " +
-        `Write the instruction lane as the shortest complete rule, at most ${AGENT_AUTHORED_INSTRUCTION_POLICY_CONTENT_MAX_CHARS} characters and normally 1-3 imperative sentences, with no numbered steps, examples, rationale, or restated defaults. Keep a Skill under ${AGENT_AUTHORED_PREFERENCE_CONTENT_MAX_CHARS} characters with one clear trigger and outcome, only the necessary steps, checks, and exceptions, and a one-sentence descriptor. Do not copy one item into multiple lanes. ` +
-        "Under Autonomous learning, an eligible Skill or workspace instruction may activate immediately through its governed lifecycle. Under Require approval, it remains inactive and the receipt returns status=confirmation_required with the exact `humanInput` payload: call `request_human_input` with it verbatim, then call `remember_confirm` with the returned requestId. Off creates no governed change. Reviewed Knowledge always needs confirmation. Do not use lane=knowledge for facts you merely inferred; use memory_save when available, otherwise knowledge_propose or task notes. Confirmed lane=knowledge content keeps its reviewed claim provenance and materializes its exact approved text into Memory for later `memory_search` retrieval.",
+        "Create governed durable knowledge or a mandatory workspace instruction. Skills now use skill_save; the legacy preference lane returns a redirect without writing. When memory_save is available, use it for ordinary durable facts, decisions, incidents, bug fixes, and confirmed outcomes; Memory writes are autonomous and independent of Learning mode. Use lane=knowledge only when memory_save is unavailable and the user explicitly requests reviewed workspace knowledge; lane=instruction_policy is only for a universal always/never rule that should apply to nearly every task. " +
+        `Write the instruction lane as the shortest complete rule, at most ${AGENT_AUTHORED_INSTRUCTION_POLICY_CONTENT_MAX_CHARS} characters and normally 1-3 imperative sentences, with no numbered steps, examples, rationale, or restated defaults. Do not copy one item into multiple lanes. ` +
+        "Under Autonomous learning, an eligible workspace instruction may activate immediately through its governed lifecycle. Under Require approval, it remains inactive and the receipt returns status=confirmation_required with the exact `humanInput` payload: call `request_human_input` with it verbatim, then call `remember_confirm` with the returned requestId. Off creates no governed change. Reviewed Knowledge always needs confirmation. Do not use lane=knowledge for facts you merely inferred; use memory_save when available, otherwise knowledge_propose or task notes. Confirmed lane=knowledge content keeps its reviewed claim provenance and materializes its exact approved text into Memory for later `memory_search` retrieval.",
       inputSchema: {
         lane: z.enum(["preference", "instruction_policy", "knowledge"]),
         ...laneFields,
@@ -97,6 +97,13 @@ export function registerRememberTools(input: RegisterRememberToolsInput): void {
     async (request) => {
       await input.authorize();
       const { lane, operationId, content, reason } = request;
+      if (lane === "preference")
+        return input.json({
+          status: "not_remembered",
+          code: "use_skill_save",
+          message:
+            "Skills use the shared file lifecycle. Read opengeni-skills with skill_read, then discover skill_save. No Knowledge evidence or confirmation question is needed for Skill edits.",
+        });
       if (lane !== "knowledge" && content.length > laneContentMaxChars[lane]) {
         return input.json({
           status: "not_remembered",
@@ -109,17 +116,9 @@ export function registerRememberTools(input: RegisterRememberToolsInput): void {
       }
       const base = { operationId, content, reason, scope: "workspace" as const };
       const rememberRequest =
-        lane === "preference"
-          ? {
-              ...base,
-              lane,
-              stableKey: request.stableKey ?? `remember.${operationId.replaceAll("-", "")}`,
-              title: request.title ?? content.slice(0, 80),
-              description: request.description ?? content.slice(0, 200),
-            }
-          : lane === "instruction_policy"
-            ? { ...base, lane, target: request.target }
-            : { ...base, lane, subject: request.subject ?? content.slice(0, 80) };
+        lane === "instruction_policy"
+          ? { ...base, lane, target: request.target }
+          : { ...base, lane, subject: request.subject ?? content.slice(0, 80) };
       try {
         return input.json(
           await router.remember({ attempt: input.attempt, request: rememberRequest }),

package/src/mcp/server.ts

@@ -2587,7 +2587,9 @@ function registerGoalTools(
       description:
         "End the current turn and wait out of turn for relevant session input. This is self-only and does not require a goal. After success, the production runtime ends the turn at the tool-batch boundary without another model step or final message. Use it for long or uncertain waits instead of sleeping or repeatedly calling session_wait/command_wait. timeoutSeconds is a relative safety-wake duration; OpenGeni persists the first absolute deadline for the turn, and repeated calls do not extend it. Timeout never cancels a background command. A human/API prompt, agent message or Steer, child terminal result, scheduled input, terminal background-command result, or the deadline wakes the session. Use goal_pause instead when the active goal itself should stop pending a human decision.",
       inputSchema: {
-        reason: inputWaitReasonSchema,
+        reason: inputWaitReasonSchema.describe(
+          "Shown directly to the user. Write one short, natural sentence explaining what you are waiting for, with normal spacing. Exclude internal IDs, cursors, commit hashes, paths, and continuation instructions. Example: Waiting for the build and database checks to finish.",
+        ),
         timeoutSeconds: z4
           .number()
           .int()
@@ -4665,7 +4667,7 @@ function registerWorkspaceOrchestrationTools(
       "session_get",
       {
         description:
-          "Get an authorized session. Omit sessionId to read only the authenticated current agent session (a child reads itself, never its parent or root); sessionless/operator callers must provide an explicit ID. Both forms retain live-attempt and target authorization checks. Default detail=compact returns status, goal (including completion evidence or pause rationale), latest recorded goal progress, meaningful pause/wait state, queue counts, active turn and snapshot lastSequence. Goal completion is not a terminal child result: join with session_wait waitFor=completion from the last consumed event cursor (0 if none), not this snapshot lastSequence, which may already include an unread completion. For an already-settled child, retrieve its result-bearing completion with session_events or join from the last consumed cursor. Use detail=full for the legacy bounded configuration including resources, persisted tool refs, effectiveToolPolicy and variableSet ids (never variable values). Full mode is configuration, not a substitute for compact goal/progress facts. Self reads inspect session state, not conversation history, which is supplied directly. Text loss is explicit; REST/UI defaults are unchanged.",
+          "Get an authorized session. Omit sessionId to read only the authenticated current agent session (a child reads itself, never its parent or root); sessionless/operator callers must provide an explicit ID. Both forms retain live-attempt and target authorization checks. Default detail=compact returns status, goal (including completion evidence or pause rationale), latest recorded goal progress, meaningful pause/wait state, queue counts, active turn and snapshot lastSequence. Queued status and updatedAt are not proof of execution; inspect the active turn and durable results. Goal completion is not a terminal child result: join with session_wait waitFor=completion from the last consumed event cursor (0 if none), not this snapshot lastSequence, which may already include an unread completion. For an already-settled child, retrieve its result-bearing completion with session_events or join from the last consumed cursor. Use detail=full for the legacy bounded configuration including resources, persisted tool refs, effectiveToolPolicy and variableSet ids (never variable values). Full mode is configuration, not a substitute for compact goal/progress facts. Self reads inspect session state, not conversation history, which is supplied directly. Text loss is explicit; REST/UI defaults are unchanged.",
         inputSchema: {
           sessionId: z4
             .string()
@@ -5241,7 +5243,7 @@ function registerWorkspaceOrchestrationTools(
       "session_send_message",
       {
         description:
-          "Send information to another session. From an OpenGeni worker this becomes a canonical coalescible machine input: it appears in the target's compact incoming queue group, is durably added to model history when claimed, and remains visible in the timeline. A sessionless operator call appends one human/API prompt.",
+          "Acceptance is not execution. Keep resource.id: for agent messages, match that ID in payload.updateIds from session_events view=debug, includeTypes=[system.update.delivered], payloadMode=full; retain the event turnId and read its relevant result. An unrelated in-flight turn completing does not prove delivery. Do not resend an unconsumed message; inspect blockers. Worker messages are coalescible machine input, added to history when claimed. Sessionless operator calls append a human/API prompt and resource.id is its turn ID. Use your last consumed event sequence. Report stalled delivery if it cannot safely progress.",
         inputSchema: {
           sessionId: z4.string().uuid(),
           text: z4.string().min(1),
@@ -5343,7 +5345,8 @@ function registerWorkspaceOrchestrationTools(
     server.registerTool(
       "session_pause",
       {
-        description: "Pause this session. Waiting prompts stay saved and inert until Resume.",
+        description:
+          "Pause the selected session workstream, including descendants. From an agent, pausing an ancestor also stops this caller; it cannot then issue its own Resume. Do not use ancestor Pause merely to prevent concurrent edits. Waiting prompts stay saved and inert until Resume.",
         inputSchema: {
           sessionId: z4.string().uuid(),
           idempotencyKey: z4.string().uuid(),

package/src/routes/automations.ts

@@ -10,6 +10,9 @@ import {
   UpdateAutomationSourceRequest,
   UpdateAutomationTriggerRequest,
   stableJson,
+  resolveBundledSkillSelection,
+  type AccessGrant,
+  type BundledSkillId,
 } from "@opengeni/contracts";
 import {
   AutomationDeliveryConflictError,
@@ -21,6 +24,7 @@ import {
   encryptVariableSetValue,
   getAutomationSourceSecret,
   getAutomationTriggerRevisions,
+  getSession,
   listActiveAutomationTriggersForSource,
   listAutomationRuns,
   listAutomationSources,
@@ -38,6 +42,7 @@ import {
   assertWorkspaceModelPolicyAllows,
   buildAutomationAcceptedExecution,
   canonicalConfiguredModel,
+  creationInitiatorForGrant,
   workspaceCustomModelReference,
   lockActiveCustomModelForAdmission,
   requireAccessGrant,
@@ -49,6 +54,26 @@ import {
 import type { Hono } from "hono";
 import { HTTPException } from "hono/http-exception";
 
+async function callerBundleSelection(
+  deps: ApiRouteDeps,
+  grant: AccessGrant,
+  requested: BundledSkillId[] | undefined,
+) {
+  const actor = creationInitiatorForGrant(grant).actor;
+  const parent = actor ? await getSession(deps.db, grant.workspaceId, actor.sessionId) : null;
+  if (actor && (!parent || parent.accountId !== grant.accountId))
+    throw new HTTPException(403, {
+      message: "Automation Skill selection requires the creating agent's session",
+    });
+  try {
+    return resolveBundledSkillSelection(requested, parent?.bundledSkillIds);
+  } catch (error) {
+    throw new HTTPException(422, {
+      message: error instanceof Error ? error.message : "Invalid bundled Skill selection",
+    });
+  }
+}
+
 export function registerAutomationRoutes(app: Hono, deps: ApiRouteDeps): void {
   app.get("/v1/workspaces/:workspaceId/automations/sources", async (c) => {
     const workspaceId = c.req.param("workspaceId");
@@ -146,6 +171,11 @@ export function registerAutomationRoutes(app: Hono, deps: ApiRouteDeps): void {
     const workspaceId = c.req.param("workspaceId");
     const grant = await requireAccessGrant(c, deps, workspaceId, "workspace:admin");
     const request = CreateAutomationTriggerRequest.parse(await c.req.json());
+    request.sessionTemplate.bundledSkillIds = await callerBundleSelection(
+      deps,
+      grant,
+      request.sessionTemplate.bundledSkillIds,
+    );
     if (request.packInstallationId || request.packTemplateId) {
       throw new HTTPException(409, {
         message: "Pack-owned automation triggers must be created through their Pack setup API",
@@ -220,6 +250,11 @@ export function registerAutomationRoutes(app: Hono, deps: ApiRouteDeps): void {
       requireAutomationAdapter(existing.adapterId).validateTriggerParameters(request.parameters);
     }
     if (request.sessionTemplate) {
+      request.sessionTemplate.bundledSkillIds = await callerBundleSelection(
+        deps,
+        grant,
+        request.sessionTemplate.bundledSkillIds,
+      );
       for (const permission of request.sessionTemplate.firstPartyMcpPermissions) {
         requirePermission(grant, permission);
       }

package/src/routes/packs.ts

@@ -29,6 +29,7 @@ import {
   getWorkspacePack,
   getSocialConnection,
   installPortableSkill,
+  SkillSourceRemovalAuthorityError,
   listPackInstallations,
   listSocialConnections,
   PackManifestChangedError,
@@ -50,7 +51,8 @@ import {
 import { getDocumentBase } from "@opengeni/documents";
 import type { Hono } from "hono";
 import { HTTPException } from "hono/http-exception";
-import { requireAccessGrant } from "@opengeni/core";
+import { requireAccessGrant, requireAccessGrantAuthorization } from "@opengeni/core";
+import { skillInstallerActor, skillRemovalActor } from "./skill-install-authority";
 import { requireLimit } from "@opengeni/core";
 import type { ApiRouteDeps } from "@opengeni/core";
 import { validateVariableSetAttachment } from "@opengeni/core";
@@ -172,8 +174,15 @@ export function registerPackRoutes(app: Hono, deps: ApiRouteDeps): void {
 
   app.post("/v1/workspaces/:workspaceId/packs/:packId/install", async (c) => {
     const workspaceId = c.req.param("workspaceId");
-    const grant = await requireAccessGrant(c, deps, workspaceId, "capabilities:manage");
+    const access = await requireAccessGrantAuthorization(
+      c,
+      deps,
+      workspaceId,
+      "capabilities:manage",
+    );
+    const { grant } = access;
     const pack = await requirePack(db, workspaceId, c.req.param("packId"));
+    const skillActor = pack.skills.length ? skillInstallerActor(access) : undefined;
     const payload = InstallPackRequest.parse(await c.req.json());
     const preview = PackInstallationPreview.parse(
       await previewCapabilityPackInstallation(db, grant, pack, {
@@ -245,10 +254,22 @@ export function registerPackRoutes(app: Hono, deps: ApiRouteDeps): void {
           message: "The completed Pack operation lost its installation record",
         });
       }
-      return c.json(PackInstallation.parse(replayed), 200);
+      return c.json(
+        PackInstallation.parse({
+          ...replayed,
+          ...(Array.isArray(prepared.replayResult.skillWrites)
+            ? { skillWrites: prepared.replayResult.skillWrites }
+            : {}),
+          ...(Array.isArray(prepared.replayResult.skillReleases)
+            ? { skillReleases: prepared.replayResult.skillReleases }
+            : {}),
+        }),
+        200,
+      );
     }
 
     const retainedComponentKeys: string[] = [];
+    const skillWrites: import("@opengeni/contracts").SkillWriteReceipt[] = [];
     const retainedFacetInstallationIds: string[] = [];
     const retainedBindingIds: string[] = [];
     let activeComponentKey = "manifest";
@@ -261,10 +282,13 @@ export function registerPackRoutes(app: Hono, deps: ApiRouteDeps): void {
       });
     try {
       for (const skill of pack.skills) {
+        if (!skillActor)
+          throw new HTTPException(403, { message: "Skill installer authority is missing" });
         await heartbeat();
         const inline = inlinePackSkillInstall(pack, skill);
         activeComponentKey = inline.componentKey;
         const installed = await installPortableSkill(db, {
+          skillActor,
           accountId: grant.accountId,
           workspaceId,
           subjectId: grant.subjectId,
@@ -287,6 +311,7 @@ export function registerPackRoutes(app: Hono, deps: ApiRouteDeps): void {
             removable: true,
           },
         });
+        skillWrites.push(installed.skillReceipt);
         await heartbeat();
         await recordPackInlineSkillComponent(db, {
           accountId: grant.accountId,
@@ -316,7 +341,9 @@ export function registerPackRoutes(app: Hono, deps: ApiRouteDeps): void {
 
       activeComponentKey = "ownership-finalize";
       await heartbeat();
-      await finalizePackComponentOwnership(db, {
+      const removalActor = skillRemovalActor(access);
+      const { skillReleases } = await finalizePackComponentOwnership(db, {
+        ...(removalActor ? { skillActor: removalActor } : {}),
         accountId: grant.accountId,
         workspaceId,
         packInstallationId: prepared.installation.id,
@@ -334,13 +361,19 @@ export function registerPackRoutes(app: Hono, deps: ApiRouteDeps): void {
         packId: pack.id,
         result: {
           status: "installed",
+          ...(skillWrites.length ? { skillWrites } : {}),
           packId: pack.id,
           manifestDigest: preview.manifestDigest,
           componentCount: retainedComponentKeys.length,
+          ...(skillReleases.length ? { skillReleases } : {}),
         },
       });
       return c.json(
-        PackInstallation.parse(finalized),
+        PackInstallation.parse({
+          ...finalized,
+          ...(skillWrites.length ? { skillWrites } : {}),
+          ...(skillReleases.length ? { skillReleases } : {}),
+        }),
         preview.installationVersion === null ? 201 : 200,
       );
     } catch (error) {
@@ -363,7 +396,10 @@ export function registerPackRoutes(app: Hono, deps: ApiRouteDeps): void {
           message: `Pack component ${activeComponentKey} is pinned by another installed owner. Resolve that version conflict and retry with the same idempotency key.`,
         });
       }
-      if (error instanceof PackOperationClaimLostError) {
+      if (
+        error instanceof PackOperationClaimLostError ||
+        error instanceof SkillSourceRemovalAuthorityError
+      ) {
         throw packMutationHttpError(error);
       }
       if (error instanceof HTTPException) throw error;
@@ -394,7 +430,14 @@ export function registerPackRoutes(app: Hono, deps: ApiRouteDeps): void {
 
   app.delete("/v1/workspaces/:workspaceId/packs/:packId/installation", async (c) => {
     const workspaceId = c.req.param("workspaceId");
-    const grant = await requireAccessGrant(c, deps, workspaceId, "capabilities:manage");
+    const access = await requireAccessGrantAuthorization(
+      c,
+      deps,
+      workspaceId,
+      "capabilities:manage",
+    );
+    const { grant } = access;
+    const skillActor = skillRemovalActor(access);
     const pack = await requirePack(db, workspaceId, c.req.param("packId"));
     const payload = UninstallPackRequest.parse(await c.req.json());
     const requestDigest = sha256(
@@ -426,6 +469,9 @@ export function registerPackRoutes(app: Hono, deps: ApiRouteDeps): void {
           retainedComponents: Array.isArray(prepared.replayResult.retainedComponents)
             ? prepared.replayResult.retainedComponents
             : [],
+          ...(Array.isArray(prepared.replayResult.skillReleases)
+            ? { skillReleases: prepared.replayResult.skillReleases }
+            : {}),
         }),
       );
     }
@@ -437,6 +483,7 @@ export function registerPackRoutes(app: Hono, deps: ApiRouteDeps): void {
         operationVersion: prepared.operationVersion,
       });
       const released = await releasePackComponents(db, {
+        ...(skillActor ? { skillActor } : {}),
         accountId: grant.accountId,
         workspaceId,
         packInstallationId: prepared.installation.id,
@@ -451,6 +498,7 @@ export function registerPackRoutes(app: Hono, deps: ApiRouteDeps): void {
         packId: pack.id,
         status: "uninstalled",
         retainedComponents: [...new Set(released.retainedComponents)],
+        ...(released.skillReleases?.length ? { skillReleases: released.skillReleases } : {}),
       });
       await finalizePackUninstallOperation(db, {
         accountId: grant.accountId,
@@ -472,7 +520,10 @@ export function registerPackRoutes(app: Hono, deps: ApiRouteDeps): void {
         phase: "uninstall_failed",
         errorCode: packFailureCode(error),
       }).catch(() => undefined);
-      if (error instanceof PackOperationClaimLostError) {
+      if (
+        error instanceof PackOperationClaimLostError ||
+        error instanceof SkillSourceRemovalAuthorityError
+      ) {
         throw packMutationHttpError(error);
       }
       if (error instanceof HTTPException) throw error;
@@ -628,6 +679,8 @@ export function registerPackRoutes(app: Hono, deps: ApiRouteDeps): void {
 }
 
 function packMutationHttpError(error: unknown): HTTPException {
+  if (error instanceof SkillSourceRemovalAuthorityError)
+    return new HTTPException(403, { message: error.message });
   if (error instanceof PackManifestChangedError) {
     return new HTTPException(409, {
       message: "The Pack manifest changed after preview. Review the updated installation plan.",

package/src/routes/plugins.ts

@@ -18,15 +18,18 @@ import {
   UninstallPluginResult,
   stableJson,
   type PluginComponentPreview,
+  type SkillActor,
 } from "@opengeni/contracts";
 import {
   portableSkillCapabilityId,
   portableSkillPluginKey,
   requireAccessGrant,
+  requireAccessGrantAuthorization,
   resolveSkillImport,
   type ApiRouteDeps,
   type GitHubSkillSourceClient,
 } from "@opengeni/core";
+import { skillInstallerActor, skillRemovalActor } from "./skill-install-authority";
 import {
   buildConnectionTokenResolver,
   CapabilityComponentVersionConflictError,
@@ -40,6 +43,7 @@ import {
   installApiIntegration,
   installPluginMcpReference,
   installPortableSkill,
+  SkillSourceRemovalAuthorityError,
   listInstalledPluginPackages,
   PluginInstallationVersionConflictError,
   PluginInstallationVersionRequiredError,
@@ -71,6 +75,7 @@ type ResolvedPluginComponent = {
   install(ownerPluginInstallationId: string): Promise<{
     facetInstallationIds: string[];
     bindingIds?: string[];
+    skillReceipt?: import("@opengeni/contracts").SkillWriteReceipt;
   }>;
 };
 
@@ -120,9 +125,16 @@ export function registerPluginRoutes(
 
   app.post("/v1/workspaces/:workspaceId/plugins/install", async (c) => {
     const workspaceId = c.req.param("workspaceId");
-    const grant = await requireAccessGrant(c, deps, workspaceId, "capabilities:manage");
+    const access = await requireAccessGrantAuthorization(
+      c,
+      deps,
+      workspaceId,
+      "capabilities:manage",
+    );
+    const { grant } = access;
     const payload = InstallPluginRequest.parse(await c.req.json());
     const resolved = await resolvePluginPackage({
+      skillActor: () => skillInstallerActor(access),
       deps,
       github,
       transport,
@@ -188,11 +200,13 @@ export function registerPluginRoutes(
     const retainedFacetInstallationIds: string[] = [];
     const retainedBindingIds: string[] = [];
     const completedKeys: string[] = [];
+    const skillWrites: import("@opengeni/contracts").SkillWriteReceipt[] = [];
     let activeComponentKey = "none";
     try {
       for (const component of resolved.components) {
         activeComponentKey = component.preview.key;
         const installed = await component.install(prepared.pluginInstallationId);
+        if (installed.skillReceipt) skillWrites.push(installed.skillReceipt);
         retainedFacetInstallationIds.push(...installed.facetInstallationIds);
         retainedBindingIds.push(...(installed.bindingIds ?? []));
         completedKeys.push(component.preview.key);
@@ -204,6 +218,7 @@ export function registerPluginRoutes(
         });
       }
       const result = InstalledPlugin.parse({
+        ...(skillWrites.length ? { skillWrites } : {}),
         pluginKey: prepared.pluginKey,
         version: prepared.version,
         pluginId: prepared.pluginId,
@@ -213,7 +228,9 @@ export function registerPluginRoutes(
         componentCount: resolved.components.length,
         status: "installed",
       });
-      await finalizePluginPackageInstall(deps.db, {
+      const removalActor = skillRemovalActor(access);
+      const { skillReleases, skillPublications } = await finalizePluginPackageInstall(deps.db, {
+        ...(removalActor ? { skillActor: removalActor } : {}),
         accountId: grant.accountId,
         workspaceId,
         subjectId: grant.subjectId,
@@ -223,7 +240,14 @@ export function registerPluginRoutes(
         retainedBindingIds,
         result,
       });
-      return c.json(result, resolved.preview.installed ? 200 : 201);
+      return c.json(
+        {
+          ...result,
+          ...(skillReleases.length ? { skillReleases } : {}),
+          ...(skillPublications.length ? { skillPublications } : {}),
+        },
+        resolved.preview.installed ? 200 : 201,
+      );
     } catch (error) {
       await deferPluginPackageOperation(deps.db, {
         workspaceId,
@@ -231,6 +255,8 @@ export function registerPluginRoutes(
         phase: `component_failed:${activeComponentKey}`,
         errorCode: pluginFailureCode(error),
       }).catch(() => undefined);
+      if (error instanceof SkillSourceRemovalAuthorityError)
+        throw new HTTPException(403, { message: error.message });
       if (error instanceof HTTPException) throw error;
       if (error instanceof CapabilityComponentVersionConflictError) {
         throw new HTTPException(409, {
@@ -253,7 +279,14 @@ export function registerPluginRoutes(
 
   app.delete("/v1/workspaces/:workspaceId/plugins/:pluginKey", async (c) => {
     const workspaceId = c.req.param("workspaceId");
-    const grant = await requireAccessGrant(c, deps, workspaceId, "capabilities:manage");
+    const access = await requireAccessGrantAuthorization(
+      c,
+      deps,
+      workspaceId,
+      "capabilities:manage",
+    );
+    const { grant } = access;
+    const skillActor = skillRemovalActor(access);
     const pluginKey = decodeURIComponent(c.req.param("pluginKey"));
     const payload = UninstallPluginRequest.parse(await c.req.json());
     try {
@@ -261,6 +294,7 @@ export function registerPluginRoutes(
         UninstallPluginResult.parse({
           pluginKey,
           ...(await uninstallPluginPackage(deps.db, {
+            ...(skillActor ? { skillActor } : {}),
             accountId: grant.accountId,
             workspaceId,
             subjectId: grant.subjectId,
@@ -283,6 +317,7 @@ async function resolvePluginPackage(input: {
   accountId: string;
   workspaceId: string;
   subjectId: string;
+  skillActor?: () => SkillActor;
   url: string;
   bindings: Record<
     string,
@@ -342,10 +377,13 @@ async function resolvePluginPackage(input: {
           },
         },
         install: async (ownerPluginInstallationId) => {
+          if (!input.skillActor)
+            throw new HTTPException(403, { message: "Skill installer authority is missing" });
           const summaries = new Map(
             resolved.preview.files.map((file) => [file.path, file] as const),
           );
           const installed = await installPortableSkill(input.deps.db, {
+            skillActor: input.skillActor(),
             accountId: input.accountId,
             workspaceId: input.workspaceId,
             subjectId: input.subjectId,
@@ -366,7 +404,10 @@ async function resolvePluginPackage(input: {
             }),
             owner: { kind: "plugin", id: ownerPluginInstallationId, removable: true },
           });
-          return { facetInstallationIds: [installed.facetInstallationId] };
+          return {
+            facetInstallationIds: [installed.facetInstallationId],
+            skillReceipt: installed.skillReceipt,
+          };
         },
       });
       continue;
@@ -725,6 +766,8 @@ function pluginDiff(
 }
 
 function pluginMutationHttpError(error: unknown): HTTPException {
+  if (error instanceof SkillSourceRemovalAuthorityError)
+    return new HTTPException(403, { message: error.message });
   if (error instanceof PluginOperationIdempotencyError) {
     return new HTTPException(409, { message: "Plugin idempotency key was already used" });
   }