happy2 0.0.14 → 0.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy2",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "Happy (2) desktop web app and server bundle",
   "repository": {
     "type": "git",

package/packages/happy2-server/PLUGINS.md

@@ -146,8 +146,13 @@ each configured process, not persisted in the image or container definition.
 `container.permissions` declares the exact host API capabilities a package may
 request. Permissions are grouped for presentation by API section:
 `channels:manage` is a mutating permission in `channels`, `chats:update` is a
-mutating permission in `chats`, while `plugins:list` is read-only and
-`plugins:install` and `plugins:uninstall` are mutating permissions in `plugins`.
+mutating permission in `chats`, `environments:read` is read-only and
+`environments:manage` creates and selects environments, and
+`environments:deactivate` separately deactivates unused custom environments.
+Deactivation retains the immutable manifest and Dockerfile, and creating the
+same definition later reactivates it and queues a fresh build. `plugins:list` is
+read-only and `plugins:install` and `plugins:uninstall` are mutating permissions
+in `plugins`.
 `plugins:request-install` and `plugins:request-uninstall` are also mutating
 permissions, but create chat-scoped human approvals instead of granting direct
 install or uninstall authority. Unknown and duplicate permissions are rejected
@@ -163,9 +168,10 @@ later with `POST /v0/admin/pluginInstallations/:installationId/updatePermissions
 Changing a grant invalidates the current runtime token and restarts the local
 container with a new token, so stale tokens cannot retain revoked access.
 
-The isolated plugin host listener provides `GET /plugins`, `POST /plugins/install`,
-`POST /plugins/uninstall`, `POST /channels/updateMembers`, and
-`POST /channels/createChannel`, alongside the chat-update route. Each route
+The isolated plugin host listener provides environment listing, Dockerfile reads,
+creation, default selection, and safe deactivation alongside `GET /plugins`,
+`POST /plugins/install`, `POST /plugins/uninstall`, `POST /channels/updateMembers`,
+`POST /channels/createChannel`, and the chat-update route. Each route
 requires its matching capability. Plugin-triggered installs must also choose a
 subset of the target package's declared permissions.
 

package/packages/happy2-server/dist/modules/agent/agentChatGetContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agentChatGetContext.d.ts","sourceRoot":"","sources":["../../../sources/modules/agent/agentChatGetContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,eAAe,CAAC;AAOrD;;;GAGG;AACH,wBAAsB,mBAAmB,CACrC,QAAQ,EAAE,eAAe,EACzB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,oBAAoB,CAAC,EAAE,MAAM,GAC9B,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAsGvC"}
+{"version":3,"file":"agentChatGetContext.d.ts","sourceRoot":"","sources":["../../../sources/modules/agent/agentChatGetContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,eAAe,CAAC;AAOrD;;;GAGG;AACH,wBAAsB,mBAAmB,CACrC,QAAQ,EAAE,eAAe,EACzB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,oBAAoB,CAAC,EAAE,MAAM,GAC9B,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAuGvC"}

package/packages/happy2-server/dist/modules/agent/agentChatGetContext.js

@@ -23,7 +23,7 @@ export async function agentChatGetContext(executor, actorUserId, chatId, request
         .from(chatMembers)
         .innerJoin(users, eq(users.id, chatMembers.userId))
         .innerJoin(agentImages, eq(agentImages.id, users.agentImageId))
-        .where(and(eq(chatMembers.chatId, chatId), isNull(chatMembers.leftAt), isNull(users.deletedAt), eq(users.kind, "agent"), requestedAgentUserId ? eq(users.id, requestedAgentUserId) : undefined))
+        .where(and(eq(chatMembers.chatId, chatId), isNull(chatMembers.leftAt), isNull(users.deletedAt), isNull(agentImages.deletedAt), eq(users.kind, "agent"), requestedAgentUserId ? eq(users.id, requestedAgentUserId) : undefined))
         .orderBy(users.id)
         .limit(1);
     if (!agent || agent.imageStatus !== "ready" || !agent.dockerImageId)

package/packages/happy2-server/dist/modules/agent/agentChatGetContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"agentChatGetContext.js","sourceRoot":"","sources":["../../../sources/modules/agent/agentChatGetContext.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agentChatGetContext.js","sourceRoot":"","sources":["../../../sources/modules/agent/agentChatGetContext.ts"],"names":[],"mappings":"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"}

package/packages/happy2-server/dist/modules/agent/agentConversationCreate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agentConversationCreate.d.ts","sourceRoot":"","sources":["../../../sources/modules/agent/agentConversationCreate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAsB,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EAAE,KAAK,eAAe,EAAmB,MAAM,eAAe,CAAC;AAUtE;;;GAGG;AACH,wBAAsB,uBAAuB,CACzC,QAAQ,EAAE,eAAe,EACzB,KAAK,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GACpD,OAAO,CAAC;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,IAAI,EAAE,YAAY,CAAA;CAAE,CAAC,CAqDpD"}
+{"version":3,"file":"agentConversationCreate.d.ts","sourceRoot":"","sources":["../../../sources/modules/agent/agentConversationCreate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAsB,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EAAE,KAAK,eAAe,EAAmB,MAAM,eAAe,CAAC;AAUtE;;;GAGG;AACH,wBAAsB,uBAAuB,CACzC,QAAQ,EAAE,eAAe,EACzB,KAAK,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GACpD,OAAO,CAAC;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,IAAI,EAAE,YAAY,CAAA;CAAE,CAAC,CAsDpD"}

package/packages/happy2-server/dist/modules/agent/agentConversationCreate.js

@@ -19,7 +19,7 @@ export async function agentConversationCreate(executor, input) {
             .select({ id: users.id })
             .from(users)
             .innerJoin(agentImages, eq(agentImages.id, users.agentImageId))
-            .where(and(eq(users.id, input.agentUserId), eq(users.kind, "agent"), isNull(users.deletedAt), eq(agentImages.status, "ready"), isNull(agentImages.lastError)))
+            .where(and(eq(users.id, input.agentUserId), eq(users.kind, "agent"), isNull(users.deletedAt), eq(agentImages.status, "ready"), isNull(agentImages.lastError), isNull(agentImages.deletedAt)))
             .limit(1);
         if (!agent)
             throw new CollaborationError("not_found", "Executable agent was not found");

package/packages/happy2-server/dist/modules/agent/agentConversationCreate.js.map

@@ -1 +1 @@
-{"version":3,"file":"agentConversationCreate.js","sourceRoot":"","sources":["../../../sources/modules/agent/agentConversationCreate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agentConversationCreate.js","sourceRoot":"","sources":["../../../sources/modules/agent/agentConversationCreate.ts"],"names":[],"mappings":"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"}

package/packages/happy2-server/dist/modules/agent/agentCreate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agentCreate.d.ts","sourceRoot":"","sources":["../../../sources/modules/agent/agentCreate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAsB,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE3F,OAAO,EAAE,KAAK,eAAe,EAAmB,MAAM,eAAe,CAAC;AAqBtE;;;GAGG;AACH,wBAAsB,WAAW,CAC7B,QAAQ,EAAE,eAAe,EACzB,KAAK,EAAE;IACH,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;CACf,GACF,OAAO,CAAC;IACP,IAAI,EAAE,WAAW,CAAC;IAClB,IAAI,EAAE,YAAY,CAAC;CACtB,CAAC,CAoFD"}
+{"version":3,"file":"agentCreate.d.ts","sourceRoot":"","sources":["../../../sources/modules/agent/agentCreate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAsB,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE3F,OAAO,EAAE,KAAK,eAAe,EAAmB,MAAM,eAAe,CAAC;AAqBtE;;;GAGG;AACH,wBAAsB,WAAW,CAC7B,QAAQ,EAAE,eAAe,EACzB,KAAK,EAAE;IACH,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;CACf,GACF,OAAO,CAAC;IACP,IAAI,EAAE,WAAW,CAAC;IAClB,IAAI,EAAE,YAAY,CAAC;CACtB,CAAC,CA0FD"}

package/packages/happy2-server/dist/modules/agent/agentCreate.js

@@ -1,7 +1,7 @@
 import { CollaborationError } from "../chat/types.js";
 import { withTransaction } from "../drizzle.js";
 import { agentImages, agentImageSettings, agentRigBindings, chatMembers, chats, users, } from "../schema.js";
-import { and, eq, sql } from "drizzle-orm";
+import { and, eq, isNull, sql } from "drizzle-orm";
 import { chatHint } from "../chat/chatHint.js";
 import { createId } from "@paralleldrive/cuid2";
 import { chatGetAccess } from "../chat/chatGetAccess.js";
@@ -32,7 +32,7 @@ export async function agentCreate(executor, input) {
         })
             .from(agentImageSettings)
             .innerJoin(agentImages, eq(agentImages.id, agentImageSettings.defaultImageId))
-            .where(and(eq(agentImageSettings.id, 1), eq(agentImages.id, input.imageId)))
+            .where(and(eq(agentImageSettings.id, 1), eq(agentImages.id, input.imageId), isNull(agentImages.deletedAt)))
             .limit(1);
         if (configuredImage?.status !== "ready" || !configuredImage.dockerImageId)
             throw new CollaborationError("conflict", "A ready default agent image must be configured before creating agents");

package/packages/happy2-server/dist/modules/agent/agentCreate.js.map

@@ -1 +1 @@
-{"version":3,"file":"agentCreate.js","sourceRoot":"","sources":["../../../sources/modules/agent/agentCreate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agentCreate.js","sourceRoot":"","sources":["../../../sources/modules/agent/agentCreate.ts"],"names":[],"mappings":"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"}

package/packages/happy2-server/dist/modules/agent/agentDefaultCreate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agentDefaultCreate.d.ts","sourceRoot":"","sources":["../../../sources/modules/agent/agentDefaultCreate.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,eAAe,EAAmB,MAAM,eAAe,CAAC;AAKtE;;;GAGG;AACH,wBAAsB,kBAAkB,CACpC,QAAQ,EAAE,eAAe,EACzB,KAAK,EAAE;IACH,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CACpB,GACF,OAAO,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAuE1E"}
+{"version":3,"file":"agentDefaultCreate.d.ts","sourceRoot":"","sources":["../../../sources/modules/agent/agentDefaultCreate.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,eAAe,EAAmB,MAAM,eAAe,CAAC;AAKtE;;;GAGG;AACH,wBAAsB,kBAAkB,CACpC,QAAQ,EAAE,eAAe,EACzB,KAAK,EAAE;IACH,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CACpB,GACF,OAAO,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAwE1E"}

package/packages/happy2-server/dist/modules/agent/agentDefaultCreate.js

@@ -21,7 +21,7 @@ export async function agentDefaultCreate(executor, input) {
                 .select({ id: agentImages.id })
                 .from(agentImageSettings)
                 .innerJoin(agentImages, eq(agentImages.id, agentImageSettings.defaultImageId))
-                .where(and(eq(agentImageSettings.id, 1), eq(agentImages.id, input.imageId), eq(agentImages.status, "ready"), sql `${agentImages.dockerImageId} IS NOT NULL`))
+                .where(and(eq(agentImageSettings.id, 1), eq(agentImages.id, input.imageId), eq(agentImages.status, "ready"), isNull(agentImages.deletedAt), sql `${agentImages.dockerImageId} IS NOT NULL`))
                 .limit(1),
             tx
                 .select({ id: users.id })

package/packages/happy2-server/dist/modules/agent/agentDefaultCreate.js.map

@@ -1 +1 @@
-{"version":3,"file":"agentDefaultCreate.js","sourceRoot":"","sources":["../../../sources/modules/agent/agentDefaultCreate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agentDefaultCreate.js","sourceRoot":"","sources":["../../../sources/modules/agent/agentDefaultCreate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAwB,eAAe,EAAE,MAAM,eAAe,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAC;AAEtF;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACpC,QAAyB,EACzB,KAKC;IAED,OAAO,eAAe,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;QAC1C,MAAM,CAAC,eAAe,EAAE,eAAe,EAAE,gBAAgB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC3E,EAAE;iBACG,MAAM,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;iBACxB,IAAI,CAAC,KAAK,CAAC;iBACX,KAAK,CACF,GAAG,CACC,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC,EAC9B,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,EACvB,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAC1B,CACJ;iBACA,KAAK,CAAC,CAAC,CAAC;YACb,EAAE;iBACG,MAAM,CAAC,EAAE,EAAE,EAAE,WAAW,CAAC,EAAE,EAAE,CAAC;iBAC9B,IAAI,CAAC,kBAAkB,CAAC;iBACxB,SAAS,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,kBAAkB,CAAC,cAAc,CAAC,CAAC;iBAC7E,KAAK,CACF,GAAG,CACC,EAAE,CAAC,kBAAkB,CAAC,EAAE,EAAE,CAAC,CAAC,EAC5B,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,EACjC,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAC7B,GAAG,CAAA,GAAG,WAAW,CAAC,aAAa,cAAc,CAChD,CACJ;iBACA,KAAK,CAAC,CAAC,CAAC;YACb,EAAE;iBACG,MAAM,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;iBACxB,IAAI,CAAC,KAAK,CAAC;iBACX,KAAK,CAAC,GAAG,CAAA,SAAS,KAAK,CAAC,QAAQ,aAAa,KAAK,CAAC,QAAQ,GAAG,CAAC;iBAC/D,KAAK,CAAC,CAAC,CAAC;SAChB,CAAC,CAAC;QACH,IAAI,eAAe,CAAC,CAAC,CAAC;YAClB,MAAM,IAAI,kBAAkB,CAAC,UAAU,EAAE,kCAAkC,CAAC,CAAC;QACjF,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;YACnB,MAAM,IAAI,kBAAkB,CACxB,UAAU,EACV,kFAAkF,CACrF,CAAC;QACN,IAAI,gBAAgB,CAAC,CAAC,CAAC;YACnB,MAAM,IAAI,kBAAkB,CAAC,UAAU,EAAE,6CAA6C,CAAC,CAAC;QAE5F,MAAM,EAAE,GAAG,QAAQ,EAAE,CAAC;QACtB,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,EAAE,CAAC,CAAC;QAC5C,MAAM,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;YAC1B,EAAE;YACF,SAAS,EAAE,IAAI;YACf,eAAe,EAAE,KAAK,CAAC,WAAW;YAClC,IAAI,EAAE,OAAO;YACb,YAAY,EAAE,KAAK,CAAC,OAAO;YAC3B,SAAS,EAAE,KAAK,CAAC,IAAI;YACrB,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,IAAI,EAAE,QAAQ;YACd,SAAS,EAAE,SAAS;YACpB,YAAY,EAAE,QAAQ;SACzB,CAAC,CAAC;QACH,MAAM,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC;YAC/B,QAAQ;YACR,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE,EAAE;YACZ,WAAW,EAAE,KAAK,CAAC,WAAW;SACjC,CAAC,CAAC;QACH,MAAM,4BAA4B,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC3C,OAAO;YACH,EAAE;YACF,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,OAAO,EAAE,KAAK,CAAC,OAAO;SACzB,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC"}

package/packages/happy2-server/dist/modules/agent/agentImageCommitChange.js

@@ -38,7 +38,7 @@ export async function agentImageCommitChange(executor, input) {
             dockerImageId: agentImages.dockerImageId,
         })
             .from(agentImages)
-            .where(eq(agentImages.id, input.imageId))
+            .where(and(eq(agentImages.id, input.imageId), isNull(agentImages.deletedAt)))
             .limit(1);
         if (!image)
             throw new CollaborationError("not_found", "Agent image was not found");

package/packages/happy2-server/dist/modules/agent/agentImageCommitChange.js.map

@@ -1 +1 @@
-{"version":3,"file":"agentImageCommitChange.js","sourceRoot":"","sources":["../../../sources/modules/agent/agentImageCommitChange.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agentImageCommitChange.js","sourceRoot":"","sources":["../../../sources/modules/agent/agentImageCommitChange.ts"],"names":[],"mappings":"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"}

package/packages/happy2-server/dist/modules/agent/agentImageCreate.d.ts

@@ -1,11 +1,12 @@
 import { type AgentImageSummary, type MutationHint } from "../chat/types.js";
 import { type DrizzleExecutor } from "../drizzle.js";
 /**
- * Creates a manageImages-authorized agentImages definition with validated build inputs and an initial lifecycle state.
- * Emitting its sync and audit records in the same transaction makes the new definition discoverable only as an authorized operation.
+ * Creates an agentImages definition, or reactivates the retained manifest for the same immutable definition, with validated build inputs and a fresh pending build while preserving its cumulative attempt count.
+ * Emitting installation provenance, sync evidence, and audit evidence in the same transaction makes either lifecycle transition attributable before the service queues its build.
  */
 export declare function agentImageCreate(executor: DrizzleExecutor, input: {
-    actorUserId: string;
+    actorInstallationId?: string;
+    actorUserId?: string;
     definitionHash: string;
     dockerTag: string;
     dockerfile: string;

package/packages/happy2-server/dist/modules/agent/agentImageCreate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agentImageCreate.d.ts","sourceRoot":"","sources":["../../../sources/modules/agent/agentImageCreate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAsB,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEjG,OAAO,EAAE,KAAK,eAAe,EAAmB,MAAM,eAAe,CAAC;AAetE;;;GAGG;AACH,wBAAsB,gBAAgB,CAClC,QAAQ,EAAE,eAAe,EACzB,KAAK,EAAE;IACH,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;CAChB,GACF,OAAO,CAAC;IACP,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,iBAAiB,CAAC;CAC5B,CAAC,CAiDD"}
+{"version":3,"file":"agentImageCreate.d.ts","sourceRoot":"","sources":["../../../sources/modules/agent/agentImageCreate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAsB,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEjG,OAAO,EAAE,KAAK,eAAe,EAAmB,MAAM,eAAe,CAAC;AAetE;;;GAGG;AACH,wBAAsB,gBAAgB,CAClC,QAAQ,EAAE,eAAe,EACzB,KAAK,EAAE;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;CAChB,GACF,OAAO,CAAC;IACP,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,iBAAiB,CAAC;CAC5B,CAAC,CA2GD"}

package/packages/happy2-server/dist/modules/agent/agentImageCreate.js

@@ -6,48 +6,98 @@ import { areaHint } from "../chat/areaHint.js";
 import { asAgentImage } from "./impl/asAgentImage.js";
 import { createId } from "@paralleldrive/cuid2";
 import { isUniqueConstraint } from "../chat/isUniqueConstraint.js";
-import { sql } from "drizzle-orm";
+import { and, eq, sql } from "drizzle-orm";
 import { text } from "../chat/text.js";
 import { chatAppendAudit } from "../chat/chatAppendAudit.js";
 import { syncEventInsert } from "../sync/syncEventInsert.js";
 import { syncSequenceNext } from "../sync/syncSequenceNext.js";
 import { userRequirePermission } from "../permission/userRequirePermission.js";
 /**
- * Creates a manageImages-authorized agentImages definition with validated build inputs and an initial lifecycle state.
- * Emitting its sync and audit records in the same transaction makes the new definition discoverable only as an authorized operation.
+ * Creates an agentImages definition, or reactivates the retained manifest for the same immutable definition, with validated build inputs and a fresh pending build while preserving its cumulative attempt count.
+ * Emitting installation provenance, sync evidence, and audit evidence in the same transaction makes either lifecycle transition attributable before the service queues its build.
  */
 export async function agentImageCreate(executor, input) {
     return withTransaction(executor, async (tx) => {
-        await userRequirePermission(tx, input.actorUserId, "manageImages");
-        let created;
-        try {
-            [created] = await tx
-                .insert(agentImages)
-                .values({
-                id: createId(),
+        if (input.actorUserId)
+            await userRequirePermission(tx, input.actorUserId, "manageImages");
+        else if (!input.actorInstallationId)
+            throw new CollaborationError("forbidden", "Agent image management authority is required");
+        const [existing] = await tx
+            .select({
+            id: agentImages.id,
+            name: agentImages.name,
+            builtinKey: agentImages.builtinKey,
+            deletedAt: agentImages.deletedAt,
+        })
+            .from(agentImages)
+            .where(eq(agentImages.definitionHash, input.definitionHash))
+            .limit(1);
+        let image;
+        const reactivated = Boolean(existing?.deletedAt);
+        if (existing) {
+            if (!existing.deletedAt || existing.builtinKey)
+                throw new CollaborationError("conflict", "An agent image with this immutable definition already exists");
+            [image] = await tx
+                .update(agentImages)
+                .set({
                 name: input.name,
                 dockerfile: input.dockerfile,
-                definitionHash: input.definitionHash,
                 dockerTag: input.dockerTag,
                 status: "pending",
+                buildProgress: 0,
+                buildLog: "",
+                buildLogTruncated: 0,
+                lastBuildLogLine: null,
+                buildLogUpdatedAt: null,
+                dockerImageId: null,
+                lastError: null,
                 buildRequestedAt: sql `CURRENT_TIMESTAMP`,
-                createdByUserId: input.actorUserId,
+                buildStartedAt: null,
+                readyAt: null,
+                workerId: null,
+                leaseExpiresAt: null,
+                deletedAt: null,
+                updatedAt: sql `CURRENT_TIMESTAMP`,
             })
+                .where(and(eq(agentImages.id, existing.id), eq(agentImages.deletedAt, existing.deletedAt)))
                 .returning(agentImageSelection);
+            if (!image)
+                throw new CollaborationError("conflict", "Agent environment changed concurrently");
         }
-        catch (error) {
-            if (isUniqueConstraint(error))
-                throw new CollaborationError("conflict", "An agent image with this immutable definition already exists");
-            throw error;
+        else {
+            try {
+                [image] = await tx
+                    .insert(agentImages)
+                    .values({
+                    id: createId(),
+                    name: input.name,
+                    dockerfile: input.dockerfile,
+                    definitionHash: input.definitionHash,
+                    dockerTag: input.dockerTag,
+                    status: "pending",
+                    buildRequestedAt: sql `CURRENT_TIMESTAMP`,
+                    createdByUserId: input.actorUserId,
+                })
+                    .returning(agentImageSelection);
+            }
+            catch (error) {
+                if (isUniqueConstraint(error))
+                    throw new CollaborationError("conflict", "An agent image with this immutable definition already exists");
+                throw error;
+            }
+            if (!image)
+                throw new Error("Agent image was not created");
         }
-        if (!created)
-            throw new Error("Agent image was not created");
+        if (!image)
+            throw new Error("Agent image lifecycle transition did not return a record");
         await chatAppendAudit(tx, {
             actorUserId: input.actorUserId,
-            action: "agent_image.created",
+            action: reactivated ? "agent_image.reactivated" : "agent_image.created",
             targetType: "agent_image",
-            targetId: text(created.id),
+            targetId: text(image.id),
+            ...(reactivated && existing ? { before: { name: existing.name } } : {}),
             after: {
+                actorInstallationId: input.actorInstallationId,
                 definitionHash: input.definitionHash,
                 name: input.name,
             },
@@ -55,13 +105,13 @@ export async function agentImageCreate(executor, input) {
         const sequence = await syncSequenceNext(tx);
         await syncEventInsert(tx, {
             sequence,
-            kind: "agentImage.created",
-            entityId: text(created.id),
+            kind: reactivated ? "agentImage.reactivated" : "agentImage.created",
+            entityId: text(image.id),
             actorUserId: input.actorUserId,
         });
         return {
             hint: areaHint(sequence, "agent-images"),
-            image: asAgentImage(created),
+            image: asAgentImage(image),
         };
     });
 }

package/packages/happy2-server/dist/modules/agent/agentImageCreate.js.map

@@ -1 +1 @@
-{"version":3,"file":"agentImageCreate.js","sourceRoot":"","sources":["../../../sources/modules/agent/agentImageCreate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agentImageCreate.js","sourceRoot":"","sources":["../../../sources/modules/agent/agentImageCreate.ts"],"names":[],"mappings":"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"}

package/packages/happy2-server/dist/modules/agent/agentImageDeactivate.d.ts

@@ -0,0 +1,15 @@
+import { type MutationHint } from "../chat/types.js";
+import { type DrizzleExecutor } from "../drizzle.js";
+/**
+ * Tombstones an unused custom agentImages definition after human or installation-scoped management authorization.
+ * One transaction rejects defaults, assignments, active builds, and plugin selections before retaining the immutable manifest with attributable audit and sync evidence.
+ */
+export declare function agentImageDeactivate(executor: DrizzleExecutor, input: {
+    actorInstallationId?: string;
+    actorUserId?: string;
+    imageId: string;
+}): Promise<{
+    hint: MutationHint;
+    imageId: string;
+}>;
+//# sourceMappingURL=agentImageDeactivate.d.ts.map

package/packages/happy2-server/dist/modules/agent/agentImageDeactivate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"agentImageDeactivate.d.ts","sourceRoot":"","sources":["../../../sources/modules/agent/agentImageDeactivate.ts"],"names":[],"mappings":"AAGA,OAAO,EAAsB,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,KAAK,eAAe,EAAmB,MAAM,eAAe,CAAC;AAYtE;;;GAGG;AACH,wBAAsB,oBAAoB,CACtC,QAAQ,EAAE,eAAe,EACzB,KAAK,EAAE;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;CACnB,GACF,OAAO,CAAC;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAuFlD"}

package/packages/happy2-server/dist/modules/agent/agentImageDeactivate.js

@@ -0,0 +1,92 @@
+import { and, eq, isNull, sql } from "drizzle-orm";
+import { areaHint } from "../chat/areaHint.js";
+import { chatAppendAudit } from "../chat/chatAppendAudit.js";
+import { CollaborationError } from "../chat/types.js";
+import { withTransaction } from "../drizzle.js";
+import { agentImages, agentImageSettings, agentRigBindings, pluginInstallations, users, } from "../schema.js";
+import { syncEventInsert } from "../sync/syncEventInsert.js";
+import { syncSequenceNext } from "../sync/syncSequenceNext.js";
+import { userRequirePermission } from "../permission/userRequirePermission.js";
+/**
+ * Tombstones an unused custom agentImages definition after human or installation-scoped management authorization.
+ * One transaction rejects defaults, assignments, active builds, and plugin selections before retaining the immutable manifest with attributable audit and sync evidence.
+ */
+export async function agentImageDeactivate(executor, input) {
+    return withTransaction(executor, async (tx) => {
+        if (input.actorUserId)
+            await userRequirePermission(tx, input.actorUserId, "manageImages");
+        else if (!input.actorInstallationId)
+            throw new CollaborationError("forbidden", "Agent image management authority is required");
+        const [image] = await tx
+            .select({
+            id: agentImages.id,
+            name: agentImages.name,
+            builtinKey: agentImages.builtinKey,
+            status: agentImages.status,
+            deletedAt: agentImages.deletedAt,
+        })
+            .from(agentImages)
+            .where(eq(agentImages.id, input.imageId))
+            .limit(1);
+        if (!image)
+            throw new CollaborationError("not_found", "Agent environment was not found");
+        if (image.deletedAt)
+            throw new CollaborationError("conflict", "Agent environment is already deactivated");
+        if (image.builtinKey)
+            throw new CollaborationError("conflict", "Built-in agent environments cannot be deactivated");
+        if (image.status === "pending" || image.status === "building")
+            throw new CollaborationError("conflict", "Agent environment cannot be deactivated while its image build is active or queued");
+        const [defaultUse, userUse, bindingUse, pluginUse] = await Promise.all([
+            tx
+                .select({ id: agentImageSettings.id })
+                .from(agentImageSettings)
+                .where(eq(agentImageSettings.defaultImageId, input.imageId))
+                .limit(1)
+                .then((rows) => rows[0]),
+            tx
+                .select({ id: users.id })
+                .from(users)
+                .where(eq(users.agentImageId, input.imageId))
+                .limit(1)
+                .then((rows) => rows[0]),
+            tx
+                .select({ id: agentRigBindings.userId })
+                .from(agentRigBindings)
+                .where(eq(agentRigBindings.imageId, input.imageId))
+                .limit(1)
+                .then((rows) => rows[0]),
+            tx
+                .select({ id: pluginInstallations.id })
+                .from(pluginInstallations)
+                .where(eq(pluginInstallations.containerImageId, input.imageId))
+                .limit(1)
+                .then((rows) => rows[0]),
+        ]);
+        if (defaultUse || userUse || bindingUse || pluginUse)
+            throw new CollaborationError("conflict", "Agent environment is in use and cannot be deactivated");
+        const deactivated = await tx
+            .update(agentImages)
+            .set({ deletedAt: sql `CURRENT_TIMESTAMP`, updatedAt: sql `CURRENT_TIMESTAMP` })
+            .where(and(eq(agentImages.id, input.imageId), isNull(agentImages.deletedAt)))
+            .returning({ id: agentImages.id });
+        if (deactivated.length !== 1)
+            throw new CollaborationError("conflict", "Agent environment changed concurrently");
+        await chatAppendAudit(tx, {
+            actorUserId: input.actorUserId,
+            action: "agent_image.deactivated",
+            targetType: "agent_image",
+            targetId: input.imageId,
+            before: { name: image.name },
+            after: { actorInstallationId: input.actorInstallationId },
+        });
+        const sequence = await syncSequenceNext(tx);
+        await syncEventInsert(tx, {
+            sequence,
+            kind: "agentImage.deactivated",
+            entityId: input.imageId,
+            actorUserId: input.actorUserId,
+        });
+        return { hint: areaHint(sequence, "agent-images"), imageId: input.imageId };
+    });
+}
+//# sourceMappingURL=agentImageDeactivate.js.map

package/packages/happy2-server/dist/modules/agent/agentImageDeactivate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"agentImageDeactivate.js","sourceRoot":"","sources":["../../../sources/modules/agent/agentImageDeactivate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAqB,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAwB,eAAe,EAAE,MAAM,eAAe,CAAC;AACtE,OAAO,EACH,WAAW,EACX,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,EACnB,KAAK,GACR,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAE/E;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACtC,QAAyB,EACzB,KAIC;IAED,OAAO,eAAe,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;QAC1C,IAAI,KAAK,CAAC,WAAW;YAAE,MAAM,qBAAqB,CAAC,EAAE,EAAE,KAAK,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;aACrF,IAAI,CAAC,KAAK,CAAC,mBAAmB;YAC/B,MAAM,IAAI,kBAAkB,CACxB,WAAW,EACX,8CAA8C,CACjD,CAAC;QACN,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,EAAE;aACnB,MAAM,CAAC;YACJ,EAAE,EAAE,WAAW,CAAC,EAAE;YAClB,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,UAAU,EAAE,WAAW,CAAC,UAAU;YAClC,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,SAAS,EAAE,WAAW,CAAC,SAAS;SACnC,CAAC;aACD,IAAI,CAAC,WAAW,CAAC;aACjB,KAAK,CAAC,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;aACxC,KAAK,CAAC,CAAC,CAAC,CAAC;QACd,IAAI,CAAC,KAAK;YAAE,MAAM,IAAI,kBAAkB,CAAC,WAAW,EAAE,iCAAiC,CAAC,CAAC;QACzF,IAAI,KAAK,CAAC,SAAS;YACf,MAAM,IAAI,kBAAkB,CAAC,UAAU,EAAE,0CAA0C,CAAC,CAAC;QACzF,IAAI,KAAK,CAAC,UAAU;YAChB,MAAM,IAAI,kBAAkB,CACxB,UAAU,EACV,mDAAmD,CACtD,CAAC;QACN,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,KAAK,UAAU;YACzD,MAAM,IAAI,kBAAkB,CACxB,UAAU,EACV,mFAAmF,CACtF,CAAC;QACN,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACnE,EAAE;iBACG,MAAM,CAAC,EAAE,EAAE,EAAE,kBAAkB,CAAC,EAAE,EAAE,CAAC;iBACrC,IAAI,CAAC,kBAAkB,CAAC;iBACxB,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAAC,cAAc,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;iBAC3D,KAAK,CAAC,CAAC,CAAC;iBACR,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC5B,EAAE;iBACG,MAAM,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;iBACxB,IAAI,CAAC,KAAK,CAAC;iBACX,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;iBAC5C,KAAK,CAAC,CAAC,CAAC;iBACR,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC5B,EAAE;iBACG,MAAM,CAAC,EAAE,EAAE,EAAE,gBAAgB,CAAC,MAAM,EAAE,CAAC;iBACvC,IAAI,CAAC,gBAAgB,CAAC;iBACtB,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;iBAClD,KAAK,CAAC,CAAC,CAAC;iBACR,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC5B,EAAE;iBACG,MAAM,CAAC,EAAE,EAAE,EAAE,mBAAmB,CAAC,EAAE,EAAE,CAAC;iBACtC,IAAI,CAAC,mBAAmB,CAAC;iBACzB,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;iBAC9D,KAAK,CAAC,CAAC,CAAC;iBACR,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAC/B,CAAC,CAAC;QACH,IAAI,UAAU,IAAI,OAAO,IAAI,UAAU,IAAI,SAAS;YAChD,MAAM,IAAI,kBAAkB,CACxB,UAAU,EACV,uDAAuD,CAC1D,CAAC;QACN,MAAM,WAAW,GAAG,MAAM,EAAE;aACvB,MAAM,CAAC,WAAW,CAAC;aACnB,GAAG,CAAC,EAAE,SAAS,EAAE,GAAG,CAAA,mBAAmB,EAAE,SAAS,EAAE,GAAG,CAAA,mBAAmB,EAAE,CAAC;aAC7E,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC;aAC5E,SAAS,CAAC,EAAE,EAAE,EAAE,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;QACvC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;YACxB,MAAM,IAAI,kBAAkB,CAAC,UAAU,EAAE,wCAAwC,CAAC,CAAC;QACvF,MAAM,eAAe,CAAC,EAAE,EAAE;YACtB,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,MAAM,EAAE,yBAAyB;YACjC,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,KAAK,CAAC,OAAO;YACvB,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE;YAC5B,KAAK,EAAE,EAAE,mBAAmB,EAAE,KAAK,CAAC,mBAAmB,EAAE;SAC5D,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,EAAE,CAAC,CAAC;QAC5C,MAAM,eAAe,CAAC,EAAE,EAAE;YACtB,QAAQ;YACR,IAAI,EAAE,wBAAwB;YAC9B,QAAQ,EAAE,KAAK,CAAC,OAAO;YACvB,WAAW,EAAE,KAAK,CAAC,WAAW;SACjC,CAAC,CAAC;QACH,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;IAChF,CAAC,CAAC,CAAC;AACP,CAAC"}

package/packages/happy2-server/dist/modules/agent/agentImageDockerfileGetForHost.d.ts

@@ -0,0 +1,12 @@
+import type { DrizzleExecutor } from "../drizzle.js";
+/**
+ * Reads one immutable agent environment Dockerfile after plugin-host capability authorization.
+ * This focused projection avoids exposing build logs, provider identifiers, or administrator-only image metadata.
+ */
+export declare function agentImageDockerfileGetForHost(executor: DrizzleExecutor, imageId: string): Promise<{
+    id: string;
+    name: string;
+    dockerfile: string;
+    active: boolean;
+}>;
+//# sourceMappingURL=agentImageDockerfileGetForHost.d.ts.map

package/packages/happy2-server/dist/modules/agent/agentImageDockerfileGetForHost.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"agentImageDockerfileGetForHost.d.ts","sourceRoot":"","sources":["../../../sources/modules/agent/agentImageDockerfileGetForHost.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAGrD;;;GAGG;AACH,wBAAsB,8BAA8B,CAChD,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,CAAC,CAkB5E"}

package/packages/happy2-server/dist/modules/agent/agentImageDockerfileGetForHost.js

@@ -0,0 +1,28 @@
+import { eq } from "drizzle-orm";
+import { CollaborationError } from "../chat/types.js";
+import { agentImages } from "../schema.js";
+/**
+ * Reads one immutable agent environment Dockerfile after plugin-host capability authorization.
+ * This focused projection avoids exposing build logs, provider identifiers, or administrator-only image metadata.
+ */
+export async function agentImageDockerfileGetForHost(executor, imageId) {
+    const [image] = await executor
+        .select({
+        id: agentImages.id,
+        name: agentImages.name,
+        dockerfile: agentImages.dockerfile,
+        deletedAt: agentImages.deletedAt,
+    })
+        .from(agentImages)
+        .where(eq(agentImages.id, imageId))
+        .limit(1);
+    if (!image)
+        throw new CollaborationError("not_found", "Agent environment was not found");
+    return {
+        id: image.id,
+        name: image.name,
+        dockerfile: image.dockerfile,
+        active: image.deletedAt === null,
+    };
+}
+//# sourceMappingURL=agentImageDockerfileGetForHost.js.map

package/packages/happy2-server/dist/modules/agent/agentImageDockerfileGetForHost.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"agentImageDockerfileGetForHost.js","sourceRoot":"","sources":["../../../sources/modules/agent/agentImageDockerfileGetForHost.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAChD,QAAyB,EACzB,OAAe;IAEf,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,QAAQ;SACzB,MAAM,CAAC;QACJ,EAAE,EAAE,WAAW,CAAC,EAAE;QAClB,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,UAAU,EAAE,WAAW,CAAC,UAAU;QAClC,SAAS,EAAE,WAAW,CAAC,SAAS;KACnC,CAAC;SACD,IAAI,CAAC,WAAW,CAAC;SACjB,KAAK,CAAC,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;SAClC,KAAK,CAAC,CAAC,CAAC,CAAC;IACd,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,kBAAkB,CAAC,WAAW,EAAE,iCAAiC,CAAC,CAAC;IACzF,OAAO;QACH,EAAE,EAAE,KAAK,CAAC,EAAE;QACZ,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,MAAM,EAAE,KAAK,CAAC,SAAS,KAAK,IAAI;KACnC,CAAC;AACN,CAAC"}

package/packages/happy2-server/dist/modules/agent/agentImageFindDefinition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agentImageFindDefinition.d.ts","sourceRoot":"","sources":["../../../sources/modules/agent/agentImageFindDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAMrD;;;GAGG;AACH,wBAAsB,wBAAwB,CAC1C,QAAQ,EAAE,eAAe,EACzB,QAAQ,EAAE;IAAE,UAAU,EAAE,cAAc,GAAG,iBAAiB,CAAA;CAAE,GAAG;IAAE,cAAc,EAAE,MAAM,CAAA;CAAE,GAC1F,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAaxC"}
+{"version":3,"file":"agentImageFindDefinition.d.ts","sourceRoot":"","sources":["../../../sources/modules/agent/agentImageFindDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAMrD;;;GAGG;AACH,wBAAsB,wBAAwB,CAC1C,QAAQ,EAAE,eAAe,EACzB,QAAQ,EAAE;IAAE,UAAU,EAAE,cAAc,GAAG,iBAAiB,CAAA;CAAE,GAAG;IAAE,cAAc,EAAE,MAAM,CAAA;CAAE,GAC1F,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAcxC"}

package/packages/happy2-server/dist/modules/agent/agentImageFindDefinition.js

@@ -1,5 +1,5 @@
 import { agentImages } from "../schema.js";
-import { and, eq } from "drizzle-orm";
+import { and, eq, isNull } from "drizzle-orm";
 import { asAgentImage } from "./impl/asAgentImage.js";
 import { agentImageSelection } from "./impl/agentImageSelection.js";
 /**
@@ -12,7 +12,7 @@ export async function agentImageFindDefinition(executor, selector) {
         .from(agentImages)
         .where(and("builtinKey" in selector
         ? eq(agentImages.builtinKey, selector.builtinKey)
-        : eq(agentImages.definitionHash, selector.definitionHash)))
+        : eq(agentImages.definitionHash, selector.definitionHash), isNull(agentImages.deletedAt)))
         .limit(1);
     return image ? asAgentImage(image) : undefined;
 }