memeloop 0.2.3 → 0.2.5

package/dist/index.js

@@ -1,3 +1,6 @@
+import {
+  mergeAgentToolsIntoFrameworkConfig
+} from "./chunk-4OITUYFC.js";
 import {
   AgentCreationController,
   AgentDefinitionEditorController,
@@ -24,7 +27,7 @@ import {
   unloadAllPlugins,
   unloadPlugin,
   validatePluginManifest
-} from "./chunk-KV6TC5UJ.js";
+} from "./chunk-XIEXGFPY.js";
 import {
   AGENT_AGENT_LOOP_ID,
   AGENT_TOOL_LOOP_ID,
@@ -116,7 +119,7 @@ import {
   toolSchemaToJsonSchema,
   validateScript,
   waitForCondition
-} from "./chunk-5VYZV33O.js";
+} from "./chunk-KTZDDC7M.js";
 import {
   ALL_CATEGORIES,
   getCategoryConfig,
@@ -126,7 +129,7 @@ import {
 import {
   MemoryDeviceNetworkService,
   syncCloudDevices
-} from "./chunk-EPHRIRAL.js";
+} from "./chunk-6OLAL5CW.js";
 import {
   ChatSyncEngine,
   DEVICE_BINDING_SIGNATURE_DOMAIN,
@@ -165,7 +168,7 @@ import {
   isLibp2pSyncRequest,
   isLibp2pSyncResponse,
   parseDevicePairingInvite
-} from "./chunk-KXVZQLJL.js";
+} from "./chunk-645GZGNM.js";
 import {
   DEFAULT_DESTINATION_POLICIES,
   DRIVER_REQUEST_API_VERSION,
@@ -228,13 +231,14 @@ import {
   detectMimeConfusion,
   featuresRequiredByClass,
   inspectAndRecordArtifact,
+  modelClassNameForSpec,
   restoreArtifactManagementState,
   sanitizeMarkup,
   sanitizeTerminalText,
   scanForPromptInjection,
   snapshotArtifactManagementState,
   validateArchiveManifest
-} from "./chunk-GYIOMQMY.js";
+} from "./chunk-UB77WKAU.js";
 import {
   REMOTE_ORCHESTRATION_PROTOCOL,
   createFetchOrchestrationTransport,
@@ -250,11 +254,11 @@ import {
 import {
   resolveAgentToolLoopTerminalState,
   runAgentToolLoopTurn
-} from "./chunk-K5KZJNDP.js";
+} from "./chunk-ROPAEJIM.js";
 import {
   createFetchLLMProvider,
   resolveFetchLLMCallSettings
-} from "./chunk-HY3U3GLE.js";
+} from "./chunk-5EUJNLVW.js";
 import {
   HookRegistry,
   MEMELOOP_STRUCTURED_TOOL_KEY,
@@ -308,7 +312,7 @@ import {
   shouldCompact,
   truncateToolSummary,
   unregisterHook
-} from "./chunk-LGUGYRR4.js";
+} from "./chunk-HVLCOJWI.js";
 import {
   buildLegacyChatMessageParts,
   buildToolResultSummary,
@@ -779,12 +783,13 @@ function createFleetRolloutController(_store, options) {
   const now = options.now ?? (() => /* @__PURE__ */ new Date());
   async function reconcileRollout(request) {
     const rollout = request.resource;
-    const status = rollout.status ?? {};
+    const previousStatus = rollout.status;
+    const status = previousStatus?.observedGeneration !== void 0 && previousStatus.observedGeneration !== rollout.metadata.generation ? void 0 : previousStatus;
     const spec = rollout.spec;
-    if (status.phase === "Completed" || status.phase === "Failed" || status.phase === "RolledBack") {
-      return { ready: true };
+    if (status?.phase === "Completed" || status?.phase === "Failed" || status?.phase === "RolledBack") {
+      return status.observedGeneration === rollout.metadata.generation ? { ready: true } : { status, ready: true };
     }
-    if (!status.phase) {
+    if (!status || status.phase === "Pending") {
       return {
         status: {
           ...status,
@@ -1119,6 +1124,7 @@ function createFleetRolloutController(_store, options) {
       if (result.status) {
         result.status = {
           ...result.status,
+          observedGeneration: request.resource.metadata.generation,
           consumedBudget: sumEvidenceUsage(result.status.evidence)
         };
       }
@@ -3225,7 +3231,7 @@ async function describeLocalModelEndpoints(driver, options) {
   const modelClasses = [];
   const endpoints = [];
   for (const model of models) {
-    const baseName = sanitizeModelName(`${model.provider}-${model.model}`);
+    const baseName = modelClassNameForSpec(model);
     modelClasses.push(createModelClassManifest(baseName, model));
     endpoints.push(createModelEndpointManifest(`${baseName}-${sanitizeModelName(options.nodeId)}`, {
       modelClassRef: { apiVersion: MODEL_CLASS_API_VERSION, kind: MODEL_CLASS_KIND, name: baseName },
@@ -5312,9 +5318,13 @@ function createGatewayMediatedLLMProvider(options) {
       const messages = Array.isArray(record.messages) ? record.messages : [];
       const runReference = options.runRefForRequest?.(request) ?? options.runRef;
       return (async function* () {
-        const handle = await options.broker.issueModelAccessHandle({
+        const selectedModel = options.resolveModelForRequest?.(request) ?? {
           modelClassRef: options.modelClassRef,
-          ...options.modelDigest !== void 0 ? { modelDigest: options.modelDigest } : {},
+          ...options.modelDigest !== void 0 ? { modelDigest: options.modelDigest } : {}
+        };
+        const handle = await options.broker.issueModelAccessHandle({
+          modelClassRef: selectedModel.modelClassRef,
+          ...selectedModel.modelDigest !== void 0 ? { modelDigest: selectedModel.modelDigest } : {},
           ...options.policyDigest !== void 0 ? { policyDigest: options.policyDigest } : {},
           ...runReference ? { runRef: runReference } : {},
           ...runReference && options.attempt !== void 0 ? { attempt: options.attempt } : {},
@@ -5325,12 +5335,18 @@ function createGatewayMediatedLLMProvider(options) {
         try {
           for await (const chunk of options.gateway.generate({
             callId,
-            modelClassRef: options.modelClassRef,
-            ...options.modelDigest !== void 0 ? { modelDigest: options.modelDigest } : {},
+            modelClassRef: selectedModel.modelClassRef,
+            ...selectedModel.modelDigest !== void 0 ? { modelDigest: selectedModel.modelDigest } : {},
             messages,
+            ...typeof record.maxOutputTokens === "number" ? { maxOutputTokens: record.maxOutputTokens } : typeof record.max_tokens === "number" ? { maxOutputTokens: record.max_tokens } : {},
+            ...typeof record.temperature === "number" ? { temperature: record.temperature } : {},
+            ...typeof record.topP === "number" ? { topP: record.topP } : {},
+            ...record.providerOptions !== null && typeof record.providerOptions === "object" ? {
+              providerOptions: record.providerOptions
+            } : {},
             accessHandle: handle.token,
             ...options.workerKey !== void 0 ? { workerKey: options.workerKey } : {},
-            ...record.signal !== void 0 ? { signal: record.signal } : {}
+            ...record.abortSignal ?? record.signal ? { signal: record.abortSignal ?? record.signal } : {}
           })) {
             if (chunk.type === "delta" && chunk.delta !== void 0) {
               yield chunk.delta;
@@ -6019,7 +6035,7 @@ function createInProcessLoopRuntimeDriver(context, options = {}) {
           });
         }
       }
-      const { createAgentLoopRunner: createAgentLoopRunner2, createAgentLoopScriptRunner: createAgentLoopScriptRunner2 } = await import("./runtime-6EELHWVB.js");
+      const { createAgentLoopRunner: createAgentLoopRunner2, createAgentLoopScriptRunner: createAgentLoopScriptRunner2 } = await import("./runtime-SASMRN4I.js");
       let runner = null;
       if (workload.spec.scriptReference) {
         if (!request.scriptSource) {
@@ -7768,6 +7784,16 @@ function createWorkerProtocolGateway(options) {
   const rateLimit = options.maxRequestsPerMinute ?? DEFAULT_RATE_PER_MINUTE2;
   const maxResponseBytes = options.maxResponseBytes ?? DEFAULT_MAX_RESPONSE_BYTES;
   const requestLog = /* @__PURE__ */ new Map();
+  let nextRequestLogSweepAt = 0;
+  function pruneInactiveRequestLogs(windowStart, receivedAtMs) {
+    if (receivedAtMs < nextRequestLogSweepAt) return;
+    for (const [sessionName, timestamps] of requestLog) {
+      if (timestamps.length === 0 || timestamps[timestamps.length - 1] < windowStart) {
+        requestLog.delete(sessionName);
+      }
+    }
+    nextRequestLogSweepAt = receivedAtMs + 6e4;
+  }
   async function audit(request, accepted, receivedAt, code) {
     try {
       await options.onAudit?.({
@@ -7826,6 +7852,7 @@ function createWorkerProtocolGateway(options) {
           throw protocolError("CONFLICT", "worker request sequence or nonce was already consumed");
         }
         const windowStart = received.getTime() - 6e4;
+        pruneInactiveRequestLogs(windowStart, received.getTime());
         const log = (requestLog.get(session.name) ?? []).filter((time) => time >= windowStart);
         if (log.length >= rateLimit) {
           throw new OrchestrationError({
@@ -11656,39 +11683,6 @@ function defineTool(definition) {
   };
 }
 
-// src/tools/hostAgentTools.ts
-function isPluginConfig(value) {
-  return typeof value === "object" && value !== null;
-}
-function mergeAgentToolsIntoFrameworkConfig(frameworkConfig, agentTools) {
-  const baseConfig = { ...frameworkConfig ?? {} };
-  const rawPlugins = Array.isArray(baseConfig.plugins) ? baseConfig.plugins : [];
-  const pluginByToolId = /* @__PURE__ */ new Map();
-  const pluginWithoutToolId = [];
-  for (const plugin of rawPlugins) {
-    if (isPluginConfig(plugin) && typeof plugin.toolId === "string" && plugin.toolId.length > 0) {
-      pluginByToolId.set(plugin.toolId, plugin);
-    } else {
-      pluginWithoutToolId.push(plugin);
-    }
-  }
-  for (const tool of agentTools ?? []) {
-    if (!tool.toolId) continue;
-    pluginByToolId.set(tool.toolId, {
-      id: `${tool.toolId}-agent-tool`,
-      toolId: tool.toolId,
-      enabled: tool.enabled ?? true,
-      ...tool.parameters ?? {}
-    });
-  }
-  return {
-    ...baseConfig,
-    prompts: Array.isArray(baseConfig.prompts) ? baseConfig.prompts : [],
-    response: Array.isArray(baseConfig.response) ? baseConfig.response : void 0,
-    plugins: [...pluginWithoutToolId, ...pluginByToolId.values()]
-  };
-}
-
 // src/tools/toolRegistry.ts
 var ToolDefinitionRegistry = class {
   registry = /* @__PURE__ */ new Map();
@@ -12168,6 +12162,7 @@ export {
   mcpForwardImpl,
   mergeAgentToolsIntoFrameworkConfig,
   mergePermissionSets,
+  modelClassNameForSpec,
   negotiateCapabilities,
   normalizeScript,
   onApprovalRequest,