happy2 0.0.11 → 0.0.12

package/packages/happy2-server/dist/modules/plugin/pluginInstall.js

@@ -10,6 +10,7 @@ import { PluginError, } from "./types.js";
 import { pluginInstallationSelection } from "./impl/installationSelection.js";
 import { asPluginInstallation } from "./impl/asInstallation.js";
 import { installedManifest } from "./impl/installedManifest.js";
+import { effectiveContainer } from "./impl/effectiveContainer.js";
 const MAX_VARIABLE_BYTES = 64 * 1024;
 /**
  * Ensures one catalog package has a durable system plugin, then creates an independent installation with its own encrypted variables and container choice.
@@ -59,8 +60,9 @@ export async function pluginInstall(executor, secretProtector, input) {
         }
         const definitions = manifest.variables;
         const mcp = manifest.mcp;
+        const localContainer = effectiveContainer(manifest);
         validateVariables(definitions, input.variables);
-        const selectionRequired = mcp?.type === "stdio" && !mcp.container;
+        const selectionRequired = Boolean(localContainer && !localContainer.dockerfile);
         if (selectionRequired && !input.containerImageId)
             throw new PluginError("broken_configuration", "containerImageId is required for this stdio MCP plugin");
         if (!selectionRequired && input.containerImageId)
@@ -75,20 +77,21 @@ export async function pluginInstall(executor, secretProtector, input) {
                 throw new PluginError("broken_configuration", "The selected container image does not exist or is not ready");
         }
         const id = input.installationId;
-        const status = mcp ? "preparing" : "ready";
+        const hasRuntime = Boolean(localContainer || mcp?.type === "remote");
+        const status = hasRuntime ? "preparing" : "ready";
         const [created] = await tx
             .insert(pluginInstallations)
             .values({
             id,
             pluginId,
             containerImageId: input.containerImageId,
-            containerName: mcp?.type === "stdio" ? `happy2-plugin-${id}` : null,
+            containerName: localContainer ? `happy2-plugin-${id}` : null,
             status,
-            statusDetail: mcp
+            statusDetail: hasRuntime
                 ? "Plugin runtime is queued for preparation."
                 : "Plugin skills are installed.",
             installedByUserId: input.actorUserId,
-            readyAt: mcp ? null : new Date().toISOString(),
+            readyAt: hasRuntime ? null : new Date().toISOString(),
         })
             .returning({ id: pluginInstallations.id });
         if (!created)
@@ -119,6 +122,8 @@ export async function pluginInstall(executor, secretProtector, input) {
                 shortName: manifest.shortName,
                 version: manifest.version,
                 mcpType: mcp?.type,
+                container: Boolean(localContainer),
+                containerPermissions: localContainer?.permissions ?? [],
                 variableKeys: definitions.map(({ key }) => key),
                 containerImageId: input.containerImageId,
             },

package/packages/happy2-server/dist/modules/plugin/pluginInstall.js.map

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

package/packages/happy2-server/dist/modules/plugin/pluginInstallationGetRuntimeConfiguration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pluginInstallationGetRuntimeConfiguration.d.ts","sourceRoot":"","sources":["../../../sources/modules/plugin/pluginInstallationGetRuntimeConfiguration.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAOrD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAe,KAAK,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAG1E;;;GAGG;AACH,wBAAsB,yCAAyC,CAC3D,QAAQ,EAAE,eAAe,EACzB,eAAe,EAAE,qBAAqB,EACtC,cAAc,EAAE,MAAM,GACvB,OAAO,CAAC,0BAA0B,CAAC,CA0HrC"}
+{"version":3,"file":"pluginInstallationGetRuntimeConfiguration.d.ts","sourceRoot":"","sources":["../../../sources/modules/plugin/pluginInstallationGetRuntimeConfiguration.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAOrD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAe,KAAK,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAI1E;;;GAGG;AACH,wBAAsB,yCAAyC,CAC3D,QAAQ,EAAE,eAAe,EACzB,eAAe,EAAE,qBAAqB,EACtC,cAAc,EAAE,MAAM,GACvB,OAAO,CAAC,0BAA0B,CAAC,CAoIrC"}

package/packages/happy2-server/dist/modules/plugin/pluginInstallationGetRuntimeConfiguration.js

@@ -2,6 +2,7 @@ import { eq } from "drizzle-orm";
 import { agentImages, pluginInstallations, pluginInstallationVariables, plugins, } from "../schema.js";
 import { PluginError } from "./types.js";
 import { installedManifest } from "./impl/installedManifest.js";
+import { effectiveContainer } from "./impl/effectiveContainer.js";
 /**
  * Resolves one installed manifest into its private runtime configuration, revealing encrypted values only for process environment or remote header materialization.
  * This read-only boundary does not mutate durable state and keeps secret recovery out of routes, catalog projections, and lifecycle orchestration.
@@ -16,6 +17,7 @@ export async function pluginInstallationGetRuntimeConfiguration(executor, secret
         packageDigest: plugins.packageDigest,
         packageDirectory: plugins.packageDirectory,
         containerName: pluginInstallations.containerName,
+        containerInstanceId: pluginInstallations.containerInstanceId,
         containerImageId: pluginInstallations.containerImageId,
         selectedImageTag: agentImages.dockerTag,
         selectedImageStatus: agentImages.status,
@@ -35,7 +37,7 @@ export async function pluginInstallationGetRuntimeConfiguration(executor, secret
         packageDirectory: row.packageDirectory,
         packageDigest: row.packageDigest,
     };
-    if (!manifest.mcp)
+    if (!manifest.container && !manifest.mcp)
         return { ...installedPackage, type: "skills_only" };
     const variableRows = await executor
         .select({
@@ -67,7 +69,7 @@ export async function pluginInstallationGetRuntimeConfiguration(executor, secret
             environment[definition.key] = variable.textValue;
         }
     }
-    if (manifest.mcp.type === "remote") {
+    if (manifest.mcp?.type === "remote") {
         const headers = Object.fromEntries(Object.entries(manifest.mcp.headers).map(([key, template]) => [
             key,
             template.replace(/\$\{([^}]+)\}/g, (_match, variable) => {
@@ -86,10 +88,13 @@ export async function pluginInstallationGetRuntimeConfiguration(executor, secret
             headers,
         };
     }
+    const localContainer = effectiveContainer(manifest);
+    if (!localContainer)
+        throw new PluginError("broken_configuration", "Plugin container definition is missing");
     if (!row.containerName)
         throw new PluginError("broken_configuration", "Plugin container name is missing");
     let imageTag;
-    if (manifest.mcp.container) {
+    if (localContainer.dockerfile) {
         imageTag = `happy2-plugin:${row.packageDigest.replace(/^sha256:/, "")}`;
     }
     else {
@@ -99,13 +104,19 @@ export async function pluginInstallationGetRuntimeConfiguration(executor, secret
     }
     return {
         ...installedPackage,
-        type: "stdio",
-        command: manifest.mcp.command,
-        args: manifest.mcp.args,
+        type: "local",
+        ...(localContainer.command
+            ? { command: { command: localContainer.command, args: localContainer.args } }
+            : {}),
+        ...(manifest.mcp?.type === "stdio"
+            ? { mcp: { command: manifest.mcp.command, args: manifest.mcp.args } }
+            : {}),
         environment,
         containerName: row.containerName,
+        containerInstanceId: row.containerInstanceId ?? undefined,
         imageTag,
-        ...(manifest.mcp.container ? { bundledDockerfile: manifest.mcp.container.dockerfile } : {}),
+        ...(localContainer.dockerfile ? { bundledDockerfile: localContainer.dockerfile } : {}),
+        permissions: localContainer.permissions,
     };
 }
 //# sourceMappingURL=pluginInstallationGetRuntimeConfiguration.js.map

package/packages/happy2-server/dist/modules/plugin/pluginInstallationGetRuntimeConfiguration.js.map

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

package/packages/happy2-server/dist/modules/plugin/pluginInstallationListForHost.d.ts

@@ -0,0 +1,14 @@
+import type { DrizzleExecutor } from "../drizzle.js";
+export interface PluginHostInstalledPlugin {
+    id: string;
+    pluginId: string;
+    shortName: string;
+    version: string;
+    status: string;
+}
+/**
+ * Lists the non-secret pluginInstallations identity and health projection for a capability-authorized plugin runtime.
+ * The caller authenticates the runtime grant before this read; this action deliberately exposes no variables, users, paths, or package internals.
+ */
+export declare function pluginInstallationListForHost(executor: DrizzleExecutor): Promise<PluginHostInstalledPlugin[]>;
+//# sourceMappingURL=pluginInstallationListForHost.d.ts.map

package/packages/happy2-server/dist/modules/plugin/pluginInstallationListForHost.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pluginInstallationListForHost.d.ts","sourceRoot":"","sources":["../../../sources/modules/plugin/pluginInstallationListForHost.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAGrD,MAAM,WAAW,yBAAyB;IACtC,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAClB;AAED;;;GAGG;AACH,wBAAsB,6BAA6B,CAC/C,QAAQ,EAAE,eAAe,GAC1B,OAAO,CAAC,yBAAyB,EAAE,CAAC,CAYtC"}

package/packages/happy2-server/dist/modules/plugin/pluginInstallationListForHost.js

@@ -0,0 +1,20 @@
+import { eq } from "drizzle-orm";
+import { pluginInstallations, plugins } from "../schema.js";
+/**
+ * Lists the non-secret pluginInstallations identity and health projection for a capability-authorized plugin runtime.
+ * The caller authenticates the runtime grant before this read; this action deliberately exposes no variables, users, paths, or package internals.
+ */
+export async function pluginInstallationListForHost(executor) {
+    return executor
+        .select({
+        id: pluginInstallations.id,
+        pluginId: pluginInstallations.pluginId,
+        shortName: plugins.shortName,
+        version: plugins.sourceVersion,
+        status: pluginInstallations.status,
+    })
+        .from(pluginInstallations)
+        .innerJoin(plugins, eq(pluginInstallations.pluginId, plugins.id))
+        .orderBy(plugins.shortName, pluginInstallations.id);
+}
+//# sourceMappingURL=pluginInstallationListForHost.js.map

package/packages/happy2-server/dist/modules/plugin/pluginInstallationListForHost.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pluginInstallationListForHost.js","sourceRoot":"","sources":["../../../sources/modules/plugin/pluginInstallationListForHost.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAEjC,OAAO,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAU5D;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAC/C,QAAyB;IAEzB,OAAO,QAAQ;SACV,MAAM,CAAC;QACJ,EAAE,EAAE,mBAAmB,CAAC,EAAE;QAC1B,QAAQ,EAAE,mBAAmB,CAAC,QAAQ;QACtC,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,OAAO,EAAE,OAAO,CAAC,aAAa;QAC9B,MAAM,EAAE,mBAAmB,CAAC,MAAM;KACrC,CAAC;SACD,IAAI,CAAC,mBAAmB,CAAC;SACzB,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC,mBAAmB,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;SAChE,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,mBAAmB,CAAC,EAAE,CAAC,CAAC;AAC5D,CAAC"}

package/packages/happy2-server/dist/modules/plugin/pluginInstallationUpdateStatus.d.ts

@@ -11,5 +11,6 @@ export declare function pluginInstallationUpdateStatus(executor: DrizzleExecutor
     detail: string;
     error?: string;
     runtimeImageTag?: string;
+    containerInstanceId?: string | null;
 }): Promise<MutationHint>;
 //# sourceMappingURL=pluginInstallationUpdateStatus.d.ts.map

package/packages/happy2-server/dist/modules/plugin/pluginInstallationUpdateStatus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pluginInstallationUpdateStatus.d.ts","sourceRoot":"","sources":["../../../sources/modules/plugin/pluginInstallationUpdateStatus.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAMrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAE3D;;;GAGG;AACH,wBAAsB,8BAA8B,CAChD,QAAQ,EAAE,eAAe,EACzB,KAAK,EAAE;IACH,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,wBAAwB,CAAC;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B,GACF,OAAO,CAAC,YAAY,CAAC,CAwBvB"}
+{"version":3,"file":"pluginInstallationUpdateStatus.d.ts","sourceRoot":"","sources":["../../../sources/modules/plugin/pluginInstallationUpdateStatus.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAMrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAE3D;;;GAGG;AACH,wBAAsB,8BAA8B,CAChD,QAAQ,EAAE,eAAe,EACzB,KAAK,EAAE;IACH,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,wBAAwB,CAAC;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvC,GACF,OAAO,CAAC,YAAY,CAAC,CAyBvB"}

package/packages/happy2-server/dist/modules/plugin/pluginInstallationUpdateStatus.js

@@ -18,6 +18,7 @@ export async function pluginInstallationUpdateStatus(executor, input) {
             statusDetail: input.detail,
             lastError: input.error ?? null,
             runtimeImageTag: input.runtimeImageTag,
+            containerInstanceId: input.containerInstanceId,
             syncSequence: sequence,
             updatedAt: sql `CURRENT_TIMESTAMP`,
             readyAt: input.status === "ready" ? sql `CURRENT_TIMESTAMP` : null,

package/packages/happy2-server/dist/modules/plugin/pluginInstallationUpdateStatus.js.map

@@ -1 +1 @@
-{"version":3,"file":"pluginInstallationUpdateStatus.js","sourceRoot":"","sources":["../../../sources/modules/plugin/pluginInstallationUpdateStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAI/C;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAChD,QAAyB,EACzB,KAMC;IAED,OAAO,eAAe,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;QAC1C,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,EAAE,CAAC,CAAC;QAC5C,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,EAAE;aACrB,MAAM,CAAC,mBAAmB,CAAC;aAC3B,GAAG,CAAC;YACD,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,YAAY,EAAE,KAAK,CAAC,MAAM;YAC1B,SAAS,EAAE,KAAK,CAAC,KAAK,IAAI,IAAI;YAC9B,eAAe,EAAE,KAAK,CAAC,eAAe;YACtC,YAAY,EAAE,QAAQ;YACtB,SAAS,EAAE,GAAG,CAAA,mBAAmB;YACjC,OAAO,EAAE,KAAK,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAA,mBAAmB,CAAC,CAAC,CAAC,IAAI;SACpE,CAAC;aACD,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAAC,EAAE,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;aACvD,SAAS,CAAC,EAAE,EAAE,EAAE,mBAAmB,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/C,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;QACtF,MAAM,eAAe,CAAC,EAAE,EAAE;YACtB,QAAQ;YACR,IAAI,EAAE,UAAU,KAAK,CAAC,MAAM,EAAE;YAC9B,QAAQ,EAAE,KAAK,CAAC,cAAc;SACjC,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"pluginInstallationUpdateStatus.js","sourceRoot":"","sources":["../../../sources/modules/plugin/pluginInstallationUpdateStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAI/C;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAChD,QAAyB,EACzB,KAOC;IAED,OAAO,eAAe,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;QAC1C,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,EAAE,CAAC,CAAC;QAC5C,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,EAAE;aACrB,MAAM,CAAC,mBAAmB,CAAC;aAC3B,GAAG,CAAC;YACD,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,YAAY,EAAE,KAAK,CAAC,MAAM;YAC1B,SAAS,EAAE,KAAK,CAAC,KAAK,IAAI,IAAI;YAC9B,eAAe,EAAE,KAAK,CAAC,eAAe;YACtC,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;YAC9C,YAAY,EAAE,QAAQ;YACtB,SAAS,EAAE,GAAG,CAAA,mBAAmB;YACjC,OAAO,EAAE,KAAK,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAA,mBAAmB,CAAC,CAAC,CAAC,IAAI;SACpE,CAAC;aACD,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAAC,EAAE,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;aACvD,SAAS,CAAC,EAAE,EAAE,EAAE,mBAAmB,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/C,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;QACtF,MAAM,eAAe,CAAC,EAAE,EAAE;YACtB,QAAQ;YACR,IAAI,EAAE,UAAU,KAAK,CAAC,MAAM,EAAE;YAC9B,QAAQ,EAAE,KAAK,CAAC,cAAc;SACjC,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;AACP,CAAC"}

package/packages/happy2-server/dist/modules/plugin/pluginMcpToolsList.d.ts

@@ -0,0 +1,11 @@
+import type { DrizzleExecutor } from "../drizzle.js";
+import { type PluginMcpToolSummary } from "./types.js";
+/**
+ * Lists the last successfully discovered MCP tools for one installation from durable storage for a server administrator.
+ * This boundary never contacts the plugin runtime, so ordinary tool discovery remains available while the runtime is busy or restarting.
+ */
+export declare function pluginMcpToolsList(executor: DrizzleExecutor, actorUserId: string, installationId: string): Promise<{
+    syncedAt?: string;
+    tools: PluginMcpToolSummary[];
+}>;
+//# sourceMappingURL=pluginMcpToolsList.d.ts.map

package/packages/happy2-server/dist/modules/plugin/pluginMcpToolsList.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pluginMcpToolsList.d.ts","sourceRoot":"","sources":["../../../sources/modules/plugin/pluginMcpToolsList.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAGrD,OAAO,EAAe,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAEpE;;;GAGG;AACH,wBAAsB,kBAAkB,CACpC,QAAQ,EAAE,eAAe,EACzB,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,GACvB,OAAO,CAAC;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,oBAAoB,EAAE,CAAA;CAAE,CAAC,CA0B/D"}

package/packages/happy2-server/dist/modules/plugin/pluginMcpToolsList.js

@@ -0,0 +1,43 @@
+import { eq } from "drizzle-orm";
+import { userRequireServerAdmin } from "../chat/userRequireServerAdmin.js";
+import { pluginInstallations, pluginMcpTools } from "../schema.js";
+import { PluginError } from "./types.js";
+/**
+ * Lists the last successfully discovered MCP tools for one installation from durable storage for a server administrator.
+ * This boundary never contacts the plugin runtime, so ordinary tool discovery remains available while the runtime is busy or restarting.
+ */
+export async function pluginMcpToolsList(executor, actorUserId, installationId) {
+    await userRequireServerAdmin(executor, actorUserId);
+    const [installation] = await executor
+        .select({ id: pluginInstallations.id, syncedAt: pluginInstallations.mcpToolsSyncedAt })
+        .from(pluginInstallations)
+        .where(eq(pluginInstallations.id, installationId))
+        .limit(1);
+    if (!installation)
+        throw new PluginError("not_found", "Plugin installation was not found");
+    const rows = await executor
+        .select()
+        .from(pluginMcpTools)
+        .where(eq(pluginMcpTools.installationId, installationId))
+        .orderBy(pluginMcpTools.name);
+    return {
+        ...(installation.syncedAt ? { syncedAt: installation.syncedAt } : {}),
+        tools: rows.map((row) => ({
+            installationId: row.installationId,
+            name: row.name,
+            ...(row.title ? { title: row.title } : {}),
+            ...(row.description ? { description: row.description } : {}),
+            inputSchema: jsonObject(row.inputSchemaJson),
+            ...(row.outputSchemaJson ? { outputSchema: jsonObject(row.outputSchemaJson) } : {}),
+            ...(row.annotationsJson ? { annotations: jsonObject(row.annotationsJson) } : {}),
+            syncedAt: row.syncedAt,
+        })),
+    };
+}
+function jsonObject(source) {
+    const value = JSON.parse(source);
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        throw new Error("Persisted plugin MCP tool schema is invalid");
+    return value;
+}
+//# sourceMappingURL=pluginMcpToolsList.js.map

package/packages/happy2-server/dist/modules/plugin/pluginMcpToolsList.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pluginMcpToolsList.js","sourceRoot":"","sources":["../../../sources/modules/plugin/pluginMcpToolsList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAEjC,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnE,OAAO,EAAE,WAAW,EAA6B,MAAM,YAAY,CAAC;AAEpE;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACpC,QAAyB,EACzB,WAAmB,EACnB,cAAsB;IAEtB,MAAM,sBAAsB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IACpD,MAAM,CAAC,YAAY,CAAC,GAAG,MAAM,QAAQ;SAChC,MAAM,CAAC,EAAE,EAAE,EAAE,mBAAmB,CAAC,EAAE,EAAE,QAAQ,EAAE,mBAAmB,CAAC,gBAAgB,EAAE,CAAC;SACtF,IAAI,CAAC,mBAAmB,CAAC;SACzB,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC;SACjD,KAAK,CAAC,CAAC,CAAC,CAAC;IACd,IAAI,CAAC,YAAY;QAAE,MAAM,IAAI,WAAW,CAAC,WAAW,EAAE,mCAAmC,CAAC,CAAC;IAC3F,MAAM,IAAI,GAAG,MAAM,QAAQ;SACtB,MAAM,EAAE;SACR,IAAI,CAAC,cAAc,CAAC;SACpB,KAAK,CAAC,EAAE,CAAC,cAAc,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;SACxD,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAClC,OAAO;QACH,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrE,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACtB,cAAc,EAAE,GAAG,CAAC,cAAc;YAClC,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1C,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5D,WAAW,EAAE,UAAU,CAAC,GAAG,CAAC,eAAe,CAAC;YAC5C,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,UAAU,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACnF,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,UAAU,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChF,QAAQ,EAAE,GAAG,CAAC,QAAQ;SACzB,CAAC,CAAC;KACN,CAAC;AACN,CAAC;AAED,SAAS,UAAU,CAAC,MAAc;IAC9B,MAAM,KAAK,GAAY,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1C,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAC3D,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;IACnE,OAAO,KAAgC,CAAC;AAC5C,CAAC"}

package/packages/happy2-server/dist/modules/plugin/pluginMcpToolsListReady.d.ts

@@ -0,0 +1,15 @@
+import type { DrizzleExecutor } from "../drizzle.js";
+export interface ReadyPluginMcpTool {
+    installationId: string;
+    shortName: string;
+    name: string;
+    title?: string;
+    description?: string;
+    inputSchema: Record<string, unknown>;
+}
+/**
+ * Lists pluginMcpTools cached for ready MCP-backed pluginInstallations so Rig discovery and execution resolve function identities without contacting MCP servers.
+ * The stable installation and plugin ordering makes the durable cache the single function-catalog source for each agent submission.
+ */
+export declare function pluginMcpToolsListReady(executor: DrizzleExecutor): Promise<ReadyPluginMcpTool[]>;
+//# sourceMappingURL=pluginMcpToolsListReady.d.ts.map

package/packages/happy2-server/dist/modules/plugin/pluginMcpToolsListReady.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pluginMcpToolsListReady.d.ts","sourceRoot":"","sources":["../../../sources/modules/plugin/pluginMcpToolsListReady.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAGrD,MAAM,WAAW,kBAAkB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACxC;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CACzC,QAAQ,EAAE,eAAe,GAC1B,OAAO,CAAC,kBAAkB,EAAE,CAAC,CA4B/B"}

package/packages/happy2-server/dist/modules/plugin/pluginMcpToolsListReady.js

@@ -0,0 +1,37 @@
+import { and, eq, sql } from "drizzle-orm";
+import { pluginInstallations, pluginMcpTools, plugins } from "../schema.js";
+/**
+ * Lists pluginMcpTools cached for ready MCP-backed pluginInstallations so Rig discovery and execution resolve function identities without contacting MCP servers.
+ * The stable installation and plugin ordering makes the durable cache the single function-catalog source for each agent submission.
+ */
+export async function pluginMcpToolsListReady(executor) {
+    const rows = await executor
+        .select({
+        installationId: pluginMcpTools.installationId,
+        shortName: plugins.shortName,
+        name: pluginMcpTools.name,
+        title: pluginMcpTools.title,
+        description: pluginMcpTools.description,
+        inputSchemaJson: pluginMcpTools.inputSchemaJson,
+    })
+        .from(pluginMcpTools)
+        .innerJoin(pluginInstallations, eq(pluginInstallations.id, pluginMcpTools.installationId))
+        .innerJoin(plugins, eq(plugins.id, pluginInstallations.pluginId))
+        .where(and(eq(pluginInstallations.status, "ready"), sql `json_type(${plugins.manifestJson}, '$.mcp') IS NOT NULL`))
+        .orderBy(pluginInstallations.installedAt, pluginInstallations.id, pluginMcpTools.name);
+    return rows.map((row) => ({
+        installationId: row.installationId,
+        shortName: row.shortName,
+        name: row.name,
+        ...(row.title ? { title: row.title } : {}),
+        ...(row.description ? { description: row.description } : {}),
+        inputSchema: jsonObject(row.inputSchemaJson),
+    }));
+}
+function jsonObject(source) {
+    const value = JSON.parse(source);
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        throw new Error("Persisted plugin MCP tool input schema is invalid");
+    return value;
+}
+//# sourceMappingURL=pluginMcpToolsListReady.js.map

package/packages/happy2-server/dist/modules/plugin/pluginMcpToolsListReady.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pluginMcpToolsListReady.js","sourceRoot":"","sources":["../../../sources/modules/plugin/pluginMcpToolsListReady.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAW5E;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CACzC,QAAyB;IAEzB,MAAM,IAAI,GAAG,MAAM,QAAQ;SACtB,MAAM,CAAC;QACJ,cAAc,EAAE,cAAc,CAAC,cAAc;QAC7C,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,IAAI,EAAE,cAAc,CAAC,IAAI;QACzB,KAAK,EAAE,cAAc,CAAC,KAAK;QAC3B,WAAW,EAAE,cAAc,CAAC,WAAW;QACvC,eAAe,EAAE,cAAc,CAAC,eAAe;KAClD,CAAC;SACD,IAAI,CAAC,cAAc,CAAC;SACpB,SAAS,CAAC,mBAAmB,EAAE,EAAE,CAAC,mBAAmB,CAAC,EAAE,EAAE,cAAc,CAAC,cAAc,CAAC,CAAC;SACzF,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC;SAChE,KAAK,CACF,GAAG,CACC,EAAE,CAAC,mBAAmB,CAAC,MAAM,EAAE,OAAO,CAAC,EACvC,GAAG,CAAA,aAAa,OAAO,CAAC,YAAY,wBAAwB,CAC/D,CACJ;SACA,OAAO,CAAC,mBAAmB,CAAC,WAAW,EAAE,mBAAmB,CAAC,EAAE,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC;IAC3F,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACtB,cAAc,EAAE,GAAG,CAAC,cAAc;QAClC,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1C,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5D,WAAW,EAAE,UAAU,CAAC,GAAG,CAAC,eAAe,CAAC;KAC/C,CAAC,CAAC,CAAC;AACR,CAAC;AAED,SAAS,UAAU,CAAC,MAAc;IAC9B,MAAM,KAAK,GAAY,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1C,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAC3D,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACzE,OAAO,KAAgC,CAAC;AAC5C,CAAC"}

package/packages/happy2-server/dist/modules/plugin/pluginMcpToolsReplace.d.ts

@@ -0,0 +1,16 @@
+import type { DrizzleExecutor } from "../drizzle.js";
+import type { MutationHint } from "../chat/types.js";
+export interface PluginMcpToolInput {
+    name: string;
+    title?: string;
+    description?: string;
+    inputSchema: Record<string, unknown>;
+    outputSchema?: Record<string, unknown>;
+    annotations?: Record<string, unknown>;
+}
+/**
+ * Atomically replaces one installation's pluginMcpTools rows and pluginInstallations sync timestamp after a successful runtime discovery.
+ * The complete replacement and matching plugin sync event share one transaction so readers never observe a partial tool set.
+ */
+export declare function pluginMcpToolsReplace(executor: DrizzleExecutor, installationId: string, tools: readonly PluginMcpToolInput[]): Promise<MutationHint>;
+//# sourceMappingURL=pluginMcpToolsReplace.d.ts.map

package/packages/happy2-server/dist/modules/plugin/pluginMcpToolsReplace.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pluginMcpToolsReplace.d.ts","sourceRoot":"","sources":["../../../sources/modules/plugin/pluginMcpToolsReplace.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAGrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAMrD,MAAM,WAAW,kBAAkB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACzC;AAID;;;GAGG;AACH,wBAAsB,qBAAqB,CACvC,QAAQ,EAAE,eAAe,EACzB,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,SAAS,kBAAkB,EAAE,GACrC,OAAO,CAAC,YAAY,CAAC,CA8CvB"}

package/packages/happy2-server/dist/modules/plugin/pluginMcpToolsReplace.js

@@ -0,0 +1,71 @@
+import { eq } from "drizzle-orm";
+import { withTransaction } from "../drizzle.js";
+import { areaHint } from "../chat/areaHint.js";
+import { pluginInstallations, pluginMcpTools } from "../schema.js";
+import { syncEventInsert } from "../sync/syncEventInsert.js";
+import { syncSequenceNext } from "../sync/syncSequenceNext.js";
+import { MAX_PLUGIN_MCP_TOOLS, PluginError } from "./types.js";
+const MAX_TOOL_JSON_BYTES = 1024 * 1024;
+/**
+ * Atomically replaces one installation's pluginMcpTools rows and pluginInstallations sync timestamp after a successful runtime discovery.
+ * The complete replacement and matching plugin sync event share one transaction so readers never observe a partial tool set.
+ */
+export async function pluginMcpToolsReplace(executor, installationId, tools) {
+    if (tools.length > MAX_PLUGIN_MCP_TOOLS)
+        throw new PluginError("broken_configuration", "Plugin MCP exposes too many tools");
+    const names = new Set();
+    const rows = tools.map((tool) => {
+        if (!tool.name || tool.name.length > 256 || names.has(tool.name))
+            throw new PluginError("broken_configuration", `Plugin MCP tool name is invalid or duplicated: ${tool.name}`);
+        names.add(tool.name);
+        return {
+            installationId,
+            name: tool.name,
+            title: boundedOptional(tool.title, "title", 512),
+            description: boundedOptional(tool.description, "description", 16_384),
+            inputSchemaJson: boundedJson(tool.inputSchema, "input schema"),
+            outputSchemaJson: tool.outputSchema
+                ? boundedJson(tool.outputSchema, "output schema")
+                : null,
+            annotationsJson: tool.annotations ? boundedJson(tool.annotations, "annotations") : null,
+        };
+    });
+    return withTransaction(executor, async (tx) => {
+        const [installation] = await tx
+            .select({ id: pluginInstallations.id })
+            .from(pluginInstallations)
+            .where(eq(pluginInstallations.id, installationId))
+            .limit(1);
+        if (!installation)
+            throw new PluginError("not_found", "Plugin installation was not found");
+        const syncedAt = new Date().toISOString();
+        await tx.delete(pluginMcpTools).where(eq(pluginMcpTools.installationId, installationId));
+        if (rows.length)
+            await tx.insert(pluginMcpTools).values(rows.map((row) => ({ ...row, syncedAt })));
+        const sequence = await syncSequenceNext(tx);
+        await tx
+            .update(pluginInstallations)
+            .set({ mcpToolsSyncedAt: syncedAt, syncSequence: sequence, updatedAt: syncedAt })
+            .where(eq(pluginInstallations.id, installationId));
+        await syncEventInsert(tx, {
+            sequence,
+            kind: "plugin.mcp_tools_synced",
+            entityId: installationId,
+        });
+        return areaHint(sequence, "plugins");
+    });
+}
+function boundedOptional(value, name, maximum) {
+    if (value === undefined)
+        return null;
+    if (value.length > maximum || value.includes("\u0000"))
+        throw new PluginError("broken_configuration", `Plugin MCP tool ${name} is too large`);
+    return value;
+}
+function boundedJson(value, name) {
+    const json = JSON.stringify(value);
+    if (Buffer.byteLength(json, "utf8") > MAX_TOOL_JSON_BYTES)
+        throw new PluginError("broken_configuration", `Plugin MCP tool ${name} is too large`);
+    return json;
+}
+//# sourceMappingURL=pluginMcpToolsReplace.js.map

package/packages/happy2-server/dist/modules/plugin/pluginMcpToolsReplace.js.map

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

package/packages/happy2-server/dist/modules/plugin/runtime.d.ts

@@ -9,6 +9,8 @@ export interface PluginLocalPrepareInput {
     containerName: string;
     imageTag: string;
     installationId: string;
+    containerInstanceId: string;
+    existingContainerInstanceId?: string;
 }
 export interface PluginLocalOpenInput {
     args: readonly string[];
@@ -16,11 +18,23 @@ export interface PluginLocalOpenInput {
     containerName: string;
     environment: Readonly<Record<string, string>>;
 }
+export interface PluginLocalCommandHandle {
+    wait: Promise<{
+        exitCode: number | null;
+        signal: NodeJS.Signals | null;
+    }>;
+    close(): void;
+}
 export interface PluginMcpRuntime {
     prepareLocal(input: PluginLocalPrepareInput, signal?: AbortSignal): Promise<{
+        containerInstanceId: string;
         imageTag: string;
+        reused: boolean;
     }>;
+    startLocalCommand(input: PluginLocalOpenInput, signal?: AbortSignal): Promise<PluginLocalCommandHandle>;
+    monitorLocalCommand(containerName: string, signal?: AbortSignal): Promise<PluginLocalCommandHandle>;
     openLocal(input: PluginLocalOpenInput, signal?: AbortSignal): Promise<Transport>;
+    isLocalRunning?(containerName: string, installationId: string, containerInstanceId: string): Promise<boolean>;
     removeLocal(containerName: string): Promise<void>;
 }
 /** Runs stdio MCP packages in dedicated containers owned by the selected local sandbox provider. */
@@ -28,10 +42,15 @@ export declare class SandboxPluginMcpRuntime implements PluginMcpRuntime {
     private readonly provider;
     constructor(provider: AgentSandboxRuntimeResolver);
     prepareLocal(input: PluginLocalPrepareInput, signal?: AbortSignal): Promise<{
+        containerInstanceId: string;
         imageTag: string;
+        reused: boolean;
     }>;
     openLocal(input: PluginLocalOpenInput, signal?: AbortSignal): Promise<Transport>;
+    startLocalCommand(input: PluginLocalOpenInput, signal?: AbortSignal): Promise<PluginLocalCommandHandle>;
+    monitorLocalCommand(containerName: string, signal?: AbortSignal): Promise<PluginLocalCommandHandle>;
     removeLocal(containerName: string): Promise<void>;
+    isLocalRunning(containerName: string, installationId: string, containerInstanceId: string): Promise<boolean>;
     private localProvider;
 }
 //# sourceMappingURL=runtime.d.ts.map

package/packages/happy2-server/dist/modules/plugin/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../sources/modules/plugin/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC/E,OAAO,KAAK,EACR,2BAA2B,EAG9B,MAAM,qBAAqB,CAAC;AAI7B,MAAM,WAAW,uBAAuB;IACpC,KAAK,CAAC,EAAE;QAAE,gBAAgB,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IACtE,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,oBAAoB;IACjC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACjD;AAED,MAAM,WAAW,gBAAgB;IAC7B,YAAY,CACR,KAAK,EAAE,uBAAuB,EAC9B,MAAM,CAAC,EAAE,WAAW,GACrB,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACjC,SAAS,CAAC,KAAK,EAAE,oBAAoB,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IACjF,WAAW,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrD;AAED,oGAAoG;AACpG,qBAAa,uBAAwB,YAAW,gBAAgB;IAChD,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAArC,YAA6B,QAAQ,EAAE,2BAA2B,EAAI;IAEhE,YAAY,CACd,KAAK,EAAE,uBAAuB,EAC9B,MAAM,CAAC,EAAE,WAAW,GACrB,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CA4B/B;IAEK,SAAS,CAAC,KAAK,EAAE,oBAAoB,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,CAmBrF;IAEK,WAAW,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEtD;YAEa,aAAa;CAmB9B"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../sources/modules/plugin/runtime.ts"],"names":[],"mappings":"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"}