@almadar/integrations 2.42.0 → 2.43.0

package/dist/{BaseIntegration-D_iNTesu.d.ts → BaseIntegration-Dgwn1ZR6.d.ts}

@@ -147,6 +147,8 @@ interface IntegrationCallContext {
 declare class IntegrationFactory {
     private instances;
     private configs;
+    /** Names whose app-wide instance was registered directly (mock infrastructure). */
+    private registered;
     /**
      * Configure an integration (doesn't instantiate yet). A `principal` scopes
      * the config to that principal; the app-wide config (no principal) is the

package/dist/index.d.ts

@@ -1,9 +1,9 @@
-import { e as IntegrationLogger, c as IntegrationErrorCode, a as IntegrationConfig, B as BaseIntegration, d as IntegrationFactory, g as IntegrationParams, h as IntegrationResult, I as IntegrationCallContext } from './BaseIntegration-D_iNTesu.js';
-export { b as IntegrationError, f as IntegrationParamValue, U as UnknownActionError, V as ValidationError, i as ValidationResult, j as getIntegrationFactory, r as resetIntegrationFactory, v as validateParams } from './BaseIntegration-D_iNTesu.js';
-import { e as CredentialStore, d as CredentialPersistence, H as HookDeclaration } from './store-DcennSSh.js';
-export { A as ArxivActions, C as CLIActions, a as CREDENTIAL_ENTITY_TYPE, b as CREDENTIAL_MASTER_KEY_ENV, c as CredentialEntry, D as DatabaseActions, f as DatabaseDriver, g as DatabaseQueryParamValue, h as DatabaseQueryParams, i as DatabaseQueryResult, j as DatabaseRow, k as DeepAgentActions, l as DockerActions, E as EmailActions, G as GitHubActions, I as IconifyActions, m as IntegrationActionName, n as IntegrationContracts, o as IntegrationName, L as LLMIntegrationActions, M as MLActions, O as OAuthActions, p as OtelActions, Q as QueueActions, R as RedisActions, S as StorageActions, q as StripeActions, T as TwilioActions, W as WebhookActions, r as WikimediaActions, Y as YouTubeActions, s as allCredentialEnvVars, t as declaredCredentialEnvVars, u as serviceHooks } from './store-DcennSSh.js';
+import { e as IntegrationLogger, c as IntegrationErrorCode, a as IntegrationConfig, B as BaseIntegration, d as IntegrationFactory, g as IntegrationParams, h as IntegrationResult, I as IntegrationCallContext } from './BaseIntegration-Dgwn1ZR6.js';
+export { b as IntegrationError, f as IntegrationParamValue, U as UnknownActionError, V as ValidationError, i as ValidationResult, j as getIntegrationFactory, r as resetIntegrationFactory, v as validateParams } from './BaseIntegration-Dgwn1ZR6.js';
+import { e as CredentialStore, d as CredentialPersistence, H as HookDeclaration } from './store-DP3gfEfJ.js';
+export { A as ArxivActions, C as CLIActions, a as CREDENTIAL_ENTITY_TYPE, b as CREDENTIAL_MASTER_KEY_ENV, c as CredentialEntry, D as DatabaseActions, f as DatabaseDriver, g as DatabaseQueryParamValue, h as DatabaseQueryParams, i as DatabaseQueryResult, j as DatabaseRow, k as DeepAgentActions, l as DockerActions, E as EmailActions, G as GitHubActions, I as IconifyActions, m as IntegrationActionName, n as IntegrationContracts, o as IntegrationName, L as LLMIntegrationActions, M as MLActions, O as OAuthActions, p as OtelActions, Q as QueueActions, R as RedisActions, S as StorageActions, q as StripeActions, T as TwilioActions, W as WebhookActions, r as WikimediaActions, Y as YouTubeActions, s as allCredentialEnvVars, t as declaredCredentialEnvVars, u as serviceHooks } from './store-DP3gfEfJ.js';
 import { LogMeta, EntityRow, EventPayload, ServiceHostPorts } from '@almadar/core';
-import { AgentChatMessage, AgentTool, AgentStep, ToolCallingClient } from '@almadar/llm';
+import { AgentChatMessage, AgentTool, AgentActivity, ToolCallingClient } from '@almadar/llm';
 export { GitHubIntegration } from './integrations/github/index.js';
 
 /**
@@ -662,9 +662,14 @@ interface ToolLoopRequest {
     instructions?: string;
     maxSteps?: number;
 }
+/** Which model answered, for each `llm_response` step. */
+interface ToolLoopModel {
+    provider: string;
+    model: string;
+}
 interface ToolLoopResult {
     reply: string;
-    steps: AgentStep[];
+    steps: AgentActivity[];
     usage: {
         promptTokens: number;
         completionTokens: number;
@@ -672,7 +677,7 @@ interface ToolLoopResult {
         modelCalls: number;
     };
 }
-declare function runToolLoop(client: ToolCallingClient, host: ServiceHostPorts, request: ToolLoopRequest): Promise<ToolLoopResult>;
+declare function runToolLoop(client: ToolCallingClient, host: ServiceHostPorts, request: ToolLoopRequest, model: ToolLoopModel, now?: () => number): Promise<ToolLoopResult>;
 
 declare class MLIntegration extends BaseIntegration {
     private readonly eventsUrl;

package/dist/index.js

@@ -13,7 +13,7 @@ import webpush from 'web-push';
 import { Readable } from 'stream';
 import { getAvailableProvider, LLMClient, EmbeddingClient } from '@almadar/llm';
 import { z } from 'zod';
-import { findInputByAddress, payloadSchemaToJsonSchema, EventPayloadSchema } from '@almadar/core';
+import { traceActivityPayload, findInputByAddress, payloadSchemaToJsonSchema, EventPayloadSchema } from '@almadar/core';
 import { execSync, spawn } from 'child_process';
 import { tmpdir } from 'os';
 import * as oidc from 'openid-client';
@@ -422,6 +422,8 @@ var IntegrationFactory = class {
   constructor() {
     this.instances = /* @__PURE__ */ new Map();
     this.configs = /* @__PURE__ */ new Map();
+    /** Names whose app-wide instance was registered directly (mock infrastructure). */
+    this.registered = /* @__PURE__ */ new Set();
   }
   /**
    * Configure an integration (doesn't instantiate yet). A `principal` scopes
@@ -436,7 +438,8 @@ var IntegrationFactory = class {
    * back to the app-wide config when no per-principal config exists.
    */
   get(name, principal) {
-    const key = instanceKey(name, principal);
+    const registered = this.registered.has(name) && !this.configs.has(instanceKey(name, principal));
+    const key = registered ? name : instanceKey(name, principal);
     const cached = this.instances.get(key);
     if (cached) {
       return cached;
@@ -480,6 +483,7 @@ var IntegrationFactory = class {
    * Register an integration instance directly (used by mock infrastructure)
    */
   registerInstance(name, instance, principal) {
+    if (principal === void 0) this.registered.add(name);
     this.instances.set(instanceKey(name, principal), instance);
   }
   /**
@@ -490,8 +494,10 @@ var IntegrationFactory = class {
   invalidate(name) {
     if (name === void 0) {
       this.instances.clear();
+      this.registered.clear();
       return;
     }
+    this.registered.delete(name);
     for (const key of this.instances.keys()) {
       if (key === name || key.startsWith(`${name}\0`)) {
         this.instances.delete(key);
@@ -503,6 +509,7 @@ var IntegrationFactory = class {
    */
   clear() {
     this.instances.clear();
+    this.registered.clear();
   }
   /**
    * Clear all instances and configs
@@ -510,6 +517,7 @@ var IntegrationFactory = class {
   reset() {
     this.instances.clear();
     this.configs.clear();
+    this.registered.clear();
   }
 };
 var _factory = null;
@@ -2513,7 +2521,7 @@ function parseArgs(args) {
   }
   return EventPayloadSchema.safeParse(value);
 }
-async function runToolLoop(client, host, request) {
+async function runToolLoop(client, host, request, model, now = Date.now) {
   const tools = buildTools(host, request.tools);
   const defs = [...tools.values()].map((t) => t.def);
   const maxSteps = request.maxSteps ?? DEFAULT_MAX_STEPS;
@@ -2521,10 +2529,17 @@ async function runToolLoop(client, host, request) {
     ...request.instructions !== void 0 ? [{ role: "system", content: request.instructions }] : [],
     ...request.messages.map((m) => ({ role: m.role, content: m.content }))
   ];
+  const userPrompt = [...request.messages].reverse().find((m) => m.role === "user")?.content ?? "";
   const steps = [];
+  const record = (activity) => {
+    steps.push(activity);
+    host.message(traceActivityPayload(activity));
+  };
   const usage = { promptTokens: 0, completionTokens: 0, totalTokens: 0, modelCalls: 0 };
   while (usage.modelCalls < maxSteps) {
+    const started = now();
     const turn = await client.callWithTools({ messages: conversation, tools: defs });
+    const ended = now();
     usage.modelCalls += 1;
     if (turn.usage) {
       usage.promptTokens += turn.usage.promptTokens;
@@ -2533,23 +2548,41 @@ async function runToolLoop(client, host, request) {
     }
     conversation.push(turn.message);
     const calls = turn.message.tool_calls ?? [];
+    record({
+      type: "llm_response",
+      content: turn.message.content ?? "",
+      llm: {
+        service: "llm",
+        provider: model.provider,
+        model: model.model,
+        systemPrompt: request.instructions ?? "",
+        userPrompt,
+        ...calls.length > 0 ? { toolCallsJson: JSON.stringify(calls) } : {},
+        durationMs: ended - started,
+        ...turn.usage ? { promptTokens: turn.usage.promptTokens, completionTokens: turn.usage.completionTokens } : {}
+      },
+      timestamp: ended
+    });
     if (calls.length === 0) return { reply: turn.message.content ?? "", steps, usage };
     for (const call of calls) {
       const args = call.function.arguments;
       const tool = tools.get(call.function.name);
+      const kind = tool === void 0 ? "invalid" : tool.target.kind;
+      const label = tool === void 0 ? call.function.name : tool.target.kind === "input" ? tool.target.address : tool.target.entity;
+      record({ type: "tool_call", tool: label, kind, argsText: args, timestamp: now() });
       let content;
       if (!tool) {
-        steps.push({ kind: "invalid", target: call.function.name, args, ok: false, detail: "not an allowed tool" });
         content = JSON.stringify({ error: `'${call.function.name}' is not one of your tools` });
+        record({ type: "tool_result", tool: label, kind, success: false, detail: "not an allowed tool", resultText: content, timestamp: now() });
       } else if (tool.target.kind === "read") {
         const rows = await host.read(tool.target.entity);
-        steps.push({ kind: "read", target: tool.target.entity, args, ok: true });
         content = JSON.stringify({ rows });
+        record({ type: "tool_result", tool: label, kind, success: true, rows: rows.length, resultText: content, timestamp: now() });
       } else {
         const parsed = parseArgs(args);
         if (!parsed.success) {
-          steps.push({ kind: "input", target: tool.target.address, args, ok: false, detail: "arguments are not a JSON object" });
           content = JSON.stringify({ error: "arguments must be a JSON object" });
+          record({ type: "tool_result", tool: label, kind, success: false, detail: "arguments are not a JSON object", resultText: content, timestamp: now() });
         } else {
           const { input } = tool.target;
           const response = await host.dispatchInput(input.orbital, {
@@ -2558,8 +2591,8 @@ async function runToolLoop(client, host, request) {
             payload: parsed.data
           });
           const detail = dispatchFailure(response);
-          steps.push({ kind: "input", target: tool.target.address, args, ok: detail === void 0, ...detail !== void 0 ? { detail } : {} });
           content = JSON.stringify(response);
+          record({ type: "tool_result", tool: label, kind, success: detail === void 0, ...detail !== void 0 ? { detail } : {}, resultText: content, timestamp: now() });
         }
       }
       conversation.push({ role: "tool", content, tool_call_id: call.id });
@@ -2738,7 +2771,7 @@ Return ONLY valid JSON matching the schema.`,
     }
     const request = CallToolsParamsSchema.parse(params);
     const client = request.model !== void 0 ? new LLMClient({ provider: this.provider, model: request.model }) : this.getClient();
-    return runToolLoop(client, context.host, request);
+    return runToolLoop(client, context.host, request, { provider: client.getProvider(), model: client.getModelName() });
   }
   async embed(params) {
     const { texts } = params;