@adminforth/agent 2.8.2 → 2.9.1

package/README.md

@@ -115,7 +115,7 @@ sequenceDiagram
         M-->>LLM: reasoning and text deltas
         LLM-->>UI: reasoning-delta and text-delta frames
         M-->>LLM: tool call
-        alt tool has agent.isDangerous
+        alt tool has agent.requiresHumanApproval
             LLM-->>UI: data-interrupt, generation pauses
             U->>UI: approve or reject
             UI->>EP: POST /agent/approval
@@ -152,7 +152,7 @@ flowchart LR
     C -- yes --> E["fetch_skill returns the SKILL.md<br/>for the matching skill"]
     E --> F["fetch_tool_schema loads one<br/>API tool schema by name"]
     F --> G["ApiBasedToolsMiddleware sees the<br/>status 200 tool message and adds that<br/>tool to the next model call"]
-    G --> H{"agent.isDangerous?"}
+    G --> H{"agent.requiresHumanApproval?"}
     H -- yes --> I["humanInTheLoopMiddleware interrupt,<br/>approve or reject in the UI"]
     H -- no --> J["Execute through the AdminForth API layer"]
     I -- approved --> J
@@ -419,7 +419,7 @@ directories are also discovered.
 
 ## Human-in-the-loop approvals
 
-Tools whose definition marks them dangerous (`agent.isDangerous === true`) trigger an
+Tools whose endpoint sets `agent.requiresHumanApproval` (or the older `agent.isDangerous`) trigger an
 approval interrupt: generation pauses and the UI shows an approve/reject prompt. The client
 resolves it via `POST /agent/approval`, and the run resumes (or, on reject, the model is
 told the action was declined).

package/dist/custom/conversation_area/ConversationArea.vue

@@ -8,7 +8,7 @@
     class="absolute bg-black/10 backdrop-blur-md z-10 h-full w-full"
   >
   </div>
-  <div ref="chatContainerRef" class="relative flex-1 min-h-0 overflow-hidden" @click="recalculateScroll()">
+  <div class="relative flex-1 min-h-0 overflow-hidden [container-type:size]" @click="recalculateScroll()">
     <CustomAutoScrollContainer
       v-if="showScrollContainer"
       class="relative h-full flex flex-col overflow-y-auto translate-x-[-50%] left-1/2"
@@ -26,6 +26,7 @@
       }"
       :style="{ 
         maxWidth: agentStore.isFullScreen ? agentStore.MAX_WIDTH+'rem' : '100%',
+        paddingBottom: showBottomSpacer ? `max(0px, 100cqh - ${lastTurnHeight}px)` : undefined,
         transition: `
           max-width ${agentTransitions.TRANSITION_DURATION}ms ease-in-out,
           transform ${agentTransitions.TRANSITION_DURATION}ms ease-in-out
@@ -41,17 +42,14 @@
       >
         <MessageRenderer :message="message" :isLastMessageInChat="index === props.messages.length - 1"/>
       </div>
-      <div 
+      <!-- absolute, so it doesn't resize the scroll content when the container resizes (see the spacer comment) -->
+      <div
         v-if="props.messages.length === 0"
-        class="flex-1 flex flex-col items-center justify-center text-gray-400 tracking-widest text-xl font-medium h-max"
-        :style="{
-          height: chatContainerRef ? chatContainerRef.clientHeight + 'px' : '100%',
-        }"
+        class="absolute inset-0 flex flex-col items-center justify-center text-gray-400 tracking-widest text-xl font-medium"
       >
         <p>{{ $t('Start the conversation') }}</p>
         <p class="tracking-normal text-base text">{{ $t('Give any input to begin') }}</p>
       </div>
-      <div v-if="showBottomSpacer" class="w-full" :style="{ height: spacerHeight + 'px' }"></div>
     </CustomAutoScrollContainer>
     <Transition
       enter-active-class="transition-all duration-250 ease-out"
@@ -113,7 +111,6 @@ const innerScrollContainerRef = ref<HTMLElement | null>(null);
 const agentStore = useAgentStore();
 const agentTransitions = useAgentTransitions();
 const showScrollContainer = ref(true);
-const chatContainerRef = ref<HTMLElement | null>(null);
 const messagesRefs = ref<Array<HTMLElement | null>>([]);
 /*
 * Whenever user sends a message, it adds a bottom spacer, that takes the remaining height
@@ -121,11 +118,17 @@ const messagesRefs = ref<Array<HTMLElement | null>>([]);
 * 
 * On send message, happens the following logic: 
 * 1) showBottomSpacer is set to true
-* 2) updateSpacerHeight is called, which calculates the height for spacer based on scroll container height and messages height
-* 3) Spacer moves text up  
+* 2) updateSpacerHeight is called, which measures the last turn (last user + last agent message)
+* 3) Spacer moves text up
+*
+* The spacer is the scroll element's padding-bottom, resolved in CSS (100cqh minus the last turn), so
+* it follows the container height in the same layout pass, e.g. when the prompt textarea grows.
+* It is padding rather than a child element on purpose: custom-vue-scrollbar measures the viewport and
+* the content with separate debounced observers, and when both resize together it briefly computes a
+* wrong scroll range and flashes the scrollbar thumb. Padding keeps the content size unchanged.
 */
 const showBottomSpacer = ref(false);
-const spacerHeight = ref(0);
+const lastTurnHeight = ref(0);
 const MASK_HEIGHT = 20;
 const EMPTY_MESSAGE_HEIGHT = 18;
 const THRESHOLD_TO_SHOW_BUTTON = 10;
@@ -195,7 +198,7 @@ watch(scrollContainer, async () => {
 
 function resetSpacer() {
   showBottomSpacer.value = false;
-  spacerHeight.value = 0;
+  lastTurnHeight.value = 0;
 }
 
 function getLastMessageElement(role: 'user' | 'assistant') {
@@ -230,15 +233,7 @@ async function updateSpacerHeight() {
     return;
   }
 
-  const clientHeight = getScrollClientHeight();
-  if (!clientHeight) {
-    return;
-  }
-
-  const lastUserMessageHeight = getHeightOfLastUserMessage();
-  const lastAgentMessageHeight = getHeightOfLastAgentMessage();
-  const newSpacerHeight = Math.max(0, clientHeight - (lastUserMessageHeight + MASK_HEIGHT + lastAgentMessageHeight));
-  spacerHeight.value = newSpacerHeight;
+  lastTurnHeight.value = getHeightOfLastUserMessage() + MASK_HEIGHT + getHeightOfLastAgentMessage();
 }
 
 function scheduleSpacerHeightUpdate() {
@@ -328,7 +323,8 @@ async function handleSendMessage() {
 
 function recalculateScroll() {
   if (scrollContainer.value) {
-    scrollContainer.value.handleScroll(false,spacerHeight.value + THRESHOLD_TO_SHOW_BUTTON);
+    const spacerHeight = parseFloat(getComputedStyle(scrollContainer.value.container.scrollEl).paddingBottom);
+    scrollContainer.value.handleScroll(false, spacerHeight + THRESHOLD_TO_SHOW_BUTTON);
     const isScrolledUp = scrollContainer.value.isUserScrolledUp();
     showScrollToBottomButton.value = !!isScrolledUp;
   }

package/dist/llm/agentRuntime.js

@@ -17,7 +17,7 @@ import { createLegacySystemMessagesMiddleware } from "./middleware/legacySystemM
 import { buildDynamicSystemPrompt } from "../domain/systemPrompt.js";
 function createHumanInTheLoopInterrupts(apiBasedTools) {
     return Object.fromEntries(Object.entries(apiBasedTools)
-        .filter(([, apiBasedTool]) => { var _a; return ((_a = apiBasedTool.agent) === null || _a === void 0 ? void 0 : _a.isDangerous) === true; })
+        .filter(([, { agent }]) => (agent === null || agent === void 0 ? void 0 : agent.requiresHumanApproval) || (agent === null || agent === void 0 ? void 0 : agent.isDangerous))
         .map(([toolName]) => [
         toolName,
         {

package/dist/tools/apiBasedTools.d.ts

@@ -1,6 +1,9 @@
 import { type AdminUser, type IAdminForth } from 'adminforth';
 type AgentToolMeta = {
+    requiresHumanApproval?: boolean;
+    /** @deprecated Older name of `requiresHumanApproval`, still set by endpoints built for earlier AdminForth versions. */
     isDangerous?: boolean;
+    hiddenFromAgents?: boolean;
 };
 export type ApiBasedToolCallParams = {
     adminUser?: AdminUser;

package/dist/tools/apiBasedTools.js

@@ -438,13 +438,14 @@ function attachDurationMs(output, durationMs) {
     return { result: output, durationMs };
 }
 export function prepareApiBasedTools(adminforth, hiddenResourceIds = []) {
+    var _a;
     const apiBasedTools = {};
     const openApiSchemas = adminforth.openApi.registeredSchemas;
     const openApiSchemasByToolName = new Map();
     const hiddenResourceIdSet = new Set(hiddenResourceIds);
     for (const schema of openApiSchemas) {
         const toolName = openApiSchemaPathToToolName(schema.path, adminforth);
-        if (hasRegisteredApiToolHandler(schema)) {
+        if (hasRegisteredApiToolHandler(schema) && !((_a = schema.agent) === null || _a === void 0 ? void 0 : _a.hiddenFromAgents)) {
             openApiSchemasByToolName.set(toolName, schema);
         }
     }

package/dist/transport/http/chatSurfaceEndpoints.js

@@ -33,6 +33,9 @@ export function setupChatSurfaceEndpoints(ctx, server) {
             method: "POST",
             noAuth: true,
             path: `/agent/surface/${adapter.name}/webhook`,
+            agent: {
+                hiddenFromAgents: true,
+            },
             handler: (endpointInput) => __awaiter(this, void 0, void 0, function* () {
                 var _a;
                 const surfaceContext = {

package/dist/transport/http/coreEndpoints.js

@@ -71,6 +71,9 @@ export function setupCoreEndpoints(ctx, server) {
     server.endpoint({
         method: 'POST',
         path: `/agent/get-placeholder-messages`,
+        agent: {
+            hiddenFromAgents: true,
+        },
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ headers, adminUser }) {
             if (!ctx.options.placeholderMessages) {
                 return {
@@ -89,6 +92,9 @@ export function setupCoreEndpoints(ctx, server) {
     server.endpoint({
         method: 'POST',
         path: `/agent/response`,
+        agent: {
+            hiddenFromAgents: true,
+        },
         request_schema: agentResponseBodySchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, _raw_express_res, abortSignal }) {
             var _b;
@@ -115,6 +121,9 @@ export function setupCoreEndpoints(ctx, server) {
     server.endpoint({
         method: 'POST',
         path: `/agent/edit`,
+        agent: {
+            hiddenFromAgents: true,
+        },
         request_schema: agentEditBodySchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, _raw_express_res, abortSignal }) {
             var _b;
@@ -142,6 +151,9 @@ export function setupCoreEndpoints(ctx, server) {
     server.endpoint({
         method: 'POST',
         path: `/agent/approval`,
+        agent: {
+            hiddenFromAgents: true,
+        },
         request_schema: agentApprovalBodySchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, _raw_express_res, abortSignal }) {
             const data = body;
@@ -166,6 +178,9 @@ export function setupCoreEndpoints(ctx, server) {
     server.endpoint({
         method: 'POST',
         path: `/agent/steer`,
+        agent: {
+            hiddenFromAgents: true,
+        },
         request_schema: agentSteerBodySchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser }) {
             const data = body;
@@ -183,6 +198,9 @@ export function setupCoreEndpoints(ctx, server) {
     server.endpoint({
         method: 'POST',
         path: `/agent/speech-response`,
+        agent: {
+            hiddenFromAgents: true,
+        },
         target: 'upload',
         request_schema: agentSpeechResponseShapeSchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, response, _raw_express_req, _raw_express_res, abortSignal }) {

package/dist/transport/http/sessionEndpoints.js

@@ -32,6 +32,9 @@ export function setupSessionEndpoints(ctx, server) {
     server.endpoint({
         method: 'POST',
         path: `/agent/get-sessions`,
+        agent: {
+            hiddenFromAgents: true,
+        },
         request_schema: getSessionsBodySchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, response }) {
             var _b;
@@ -51,6 +54,9 @@ export function setupSessionEndpoints(ctx, server) {
     server.endpoint({
         method: 'POST',
         path: `/agent/get-session-info`,
+        agent: {
+            hiddenFromAgents: true,
+        },
         request_schema: sessionIdBodySchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, response }) {
             const data = body;
@@ -114,6 +120,9 @@ export function setupSessionEndpoints(ctx, server) {
     server.endpoint({
         method: 'POST',
         path: `/agent/create-session`,
+        agent: {
+            hiddenFromAgents: true,
+        },
         request_schema: createSessionBodySchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, response }) {
             const data = body;
@@ -137,6 +146,9 @@ export function setupSessionEndpoints(ctx, server) {
     server.endpoint({
         method: 'POST',
         path: `/agent/delete-session`,
+        agent: {
+            hiddenFromAgents: true,
+        },
         request_schema: sessionIdBodySchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, response }) {
             const data = body;
@@ -166,6 +178,9 @@ export function setupSessionEndpoints(ctx, server) {
     server.endpoint({
         method: 'POST',
         path: `/agent/add-system-message-to-turns`,
+        agent: {
+            hiddenFromAgents: true,
+        },
         request_schema: addSystemMessageBodySchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, response }) {
             const data = body;
@@ -191,6 +206,9 @@ export function setupSessionEndpoints(ctx, server) {
     server.endpoint({
         method: 'POST',
         path: `/agent/append-steer-to-turn`,
+        agent: {
+            hiddenFromAgents: true,
+        },
         request_schema: appendSteerBodySchema,
         handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, response }) {
             const data = body;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/agent",
-  "version": "2.8.2",
+  "version": "2.9.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
@@ -36,7 +36,7 @@
   "devDependencies": {
     "@types/jest": "^30.0.0",
     "@types/node": "latest",
-    "adminforth": "^3.8.2",
+    "adminforth": "^3.32.0",
     "jest": "^30.3.0",
     "semantic-release": "^24.2.1",
     "semantic-release-slack-bot": "^4.0.2",
@@ -80,6 +80,6 @@
     }
   ],
   "peerDependencies": {
-    "adminforth": "^3.8.2"
+    "adminforth": "^3.32.0"
   }
 }