@adminforth/agent 2.5.9 → 2.6.0

package/dist/custom/SteerQueue.vue

@@ -28,8 +28,11 @@
         </span>
         <button
           type="button"
-          class="shrink-0 rounded-md px-2 py-1 text-xs font-medium text-lightPrimary transition-colors hover:bg-lightPrimary/10 dark:text-darkPrimary dark:hover:bg-darkPrimary/10"
-          :title="$t('Steer into the current response')"
+          class="shrink-0 rounded-md px-2 py-1 text-xs font-medium text-lightPrimary transition-colors hover:bg-lightPrimary/10 disabled:cursor-not-allowed disabled:opacity-40 disabled:hover:bg-transparent dark:text-darkPrimary dark:hover:bg-darkPrimary/10 dark:disabled:hover:bg-transparent"
+          :disabled="agentStore.isFinalResponseStreaming"
+          :title="agentStore.isFinalResponseStreaming
+            ? $t('The final response is streaming; this message will be sent after it finishes')
+            : $t('Steer into the current response')"
           @click="agentStore.steerQueuedMessage(item.id)"
         >
           {{ $t('Steer') }}

package/dist/custom/composables/agentStore/useAgentChat.ts

@@ -134,6 +134,11 @@ export function createAgentChatManager({
   }
 
   function handleManualApprovalStreamPart(dataPart: any) {
+    if (dataPart?.type === 'error') {
+      const error = dataPart.errorText ?? dataPart.error;
+      throw new Error(typeof error === 'string' && error ? error : 'Agent approval failed');
+    }
+
     if (dataPart?.type === 'text-delta' && typeof dataPart.delta === 'string') {
       appendTextDelta(dataPart.delta);
       return;
@@ -344,6 +349,7 @@ export function createAgentChatManager({
       body: JSON.stringify({
         sessionId,
         decision,
+        mode: activeModeName.value,
       }),
     });
 

package/dist/custom/composables/agentStore/useAgentSteerQueue.ts

@@ -13,12 +13,14 @@ export type QueuedMessage = {
 type CreateAgentSteerQueueOptions = {
   activeSessionId: Ref<string | null>;
   currentChat: ShallowRef<Chat<any> | null | undefined>;
+  isFinalResponseStreaming: Ref<boolean>;
   sendMessage: (text: string) => void | Promise<void>;
 };
 
 export function createAgentSteerQueue({
   activeSessionId,
   currentChat,
+  isFinalResponseStreaming,
   sendMessage,
 }: CreateAgentSteerQueueOptions) {
   const queue = ref<QueuedMessage[]>([]);
@@ -146,7 +148,10 @@ export function createAgentSteerQueue({
   async function steerQueuedMessage(id: string) {
     const item = queue.value.find((candidate: QueuedMessage) => candidate.id === id);
     const sessionId = activeSessionId.value;
-    if (!item || !sessionId || sessionId === PRE_SESSION_ID) {
+    // A steer is only consumed before a subsequent model call. Once the assistant is
+    // streaming its final text there is no such call left, so retain this item for the
+    // normal FIFO follow-up instead of silently losing the instruction server-side.
+    if (!item || !sessionId || sessionId === PRE_SESSION_ID || isFinalResponseStreaming.value) {
       return;
     }
     removeQueuedMessage(id);

package/dist/custom/composables/useAgentStore.ts

@@ -161,6 +161,7 @@ export const useAgentStore = defineStore('agent', () => {
 
     if (approvalPart?.data) {
       approvalPart.data.status = 'processing';
+      approvalPart.data.error = undefined;
     }
 
     try {
@@ -172,6 +173,7 @@ export const useAgentStore = defineStore('agent', () => {
     } catch (error) {
       if (approvalPart?.data) {
         approvalPart.data.status = 'pending';
+        approvalPart.data.error = error instanceof Error ? error.message : String(error);
       }
       console.error('Error submitting tool approval', error);
     }
@@ -238,9 +240,22 @@ export const useAgentStore = defineStore('agent', () => {
     return status === 'submitted' || status === 'streaming' || hasPendingToolApproval.value;
   });
 
+  // During an assistant text stream, a newly submitted steer cannot be consumed: the
+  // steer middleware only runs before another model call. Keep it in the queue so it
+  // becomes a normal follow-up when the current turn ends.
+  const isFinalResponseStreaming = computed(() => {
+    const chat = currentChat.value as any;
+    const lastMessage = chat?.lastMessage;
+
+    return chat?.status === 'streaming'
+      && lastMessage?.role === 'assistant'
+      && lastMessage.parts?.some((part: any) => part.type === 'text' && part.state === 'streaming');
+  });
+
   const steerBuffer = createAgentSteerQueue({
     activeSessionId,
     currentChat,
+    isFinalResponseStreaming,
     sendMessage,
   });
 
@@ -646,6 +661,7 @@ export const useAgentStore = defineStore('agent', () => {
     //_________-Steer queue-_____________
     submitUserMessage,
     isTurnActive,
+    isFinalResponseStreaming,
     steerQueue: steerBuffer.queue,
     steerQueuedMessage: steerBuffer.steerQueuedMessage,
     removeQueuedMessage: steerBuffer.removeQueuedMessage,

package/dist/custom/conversation_area/ToolApprovalRenderer.vue

@@ -70,6 +70,12 @@
             {{ data.status === 'processing' ? $t('Processing') : data.status === 'approved' ? $t('Approved') : $t('Rejected') }}
           </span>
         </div>
+        <p
+          v-if="data.error"
+          class="mt-3 text-sm leading-5 text-red-600 dark:text-red-400"
+        >
+          {{ data.error }}
+        </p>
       </div>
     </div>
   </div>

package/dist/llm/agentRuntime.js

@@ -13,6 +13,7 @@ import { createSequenceDebugMiddleware } from "./middleware/sequenceDebug.js";
 import { createSteerMiddleware } from "./middleware/steerMiddleware.js";
 import { createAgentLlmMetricsLogger } from "./agentModels.js";
 import { contextSchema, toLangchainAgentContext } from "./agentContext.js";
+import { createSystemMessagesMiddleware } from "./middleware/systemMessages.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; })
@@ -43,12 +44,14 @@ export class AgentRuntime {
                 descriptionPrefix: "Tool execution pending approval",
             });
             const steerMiddleware = createSteerMiddleware(this.options.steerBuffer);
+            const systemMessagesMiddleware = createSystemMessagesMiddleware();
             const middleware = [
                 steerMiddleware,
                 apiBasedToolsMiddleware,
                 hitlMiddleware,
                 ...((_a = input.models.modelMiddleware) !== null && _a !== void 0 ? _a : []),
                 sequenceDebugMiddleware,
+                systemMessagesMiddleware,
                 summarizationMiddleware({
                     model: input.models.summaryModel,
                     trigger: { tokens: 1024 * 64 },

package/dist/llm/middleware/systemMessages.d.ts

@@ -0,0 +1 @@
+export declare function createSystemMessagesMiddleware(): import("langchain").AgentMiddleware<undefined, undefined, unknown, readonly (import("@langchain/core/tools").ClientTool | import("@langchain/core/tools").ServerTool)[]>;

package/dist/llm/middleware/systemMessages.js

@@ -0,0 +1,55 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { createMiddleware } from "langchain";
+function isSystemMessage(message) {
+    var _a, _b;
+    return (((_a = message._getType) === null || _a === void 0 ? void 0 : _a.call(message)) === "system" ||
+        ((_b = message.getType) === null || _b === void 0 ? void 0 : _b.call(message)) === "system" ||
+        message.type === "system");
+}
+function contentToText(content, text) {
+    if (text)
+        return text;
+    if (typeof content === "string")
+        return content;
+    if (!Array.isArray(content))
+        return "";
+    return content
+        .map((block) => {
+        var _a;
+        if (typeof block === "string")
+            return block;
+        if (block && typeof block === "object" && "text" in block) {
+            return String((_a = block.text) !== null && _a !== void 0 ? _a : "");
+        }
+        return "";
+    })
+        .join("");
+}
+function normalizeSystemMessages(request) {
+    const extraSystemText = request.messages
+        .filter(isSystemMessage)
+        .map((message) => contentToText(message.content, message.text))
+        .filter(Boolean)
+        .join("\n\n");
+    return Object.assign(Object.assign({}, request), { systemMessage: extraSystemText
+            ? request.systemMessage.concat(extraSystemText)
+            : request.systemMessage, messages: request.messages.filter((message) => !isSystemMessage(message)) });
+}
+export function createSystemMessagesMiddleware() {
+    return createMiddleware({
+        name: "SystemMessagesMiddleware",
+        wrapModelCall(request, handler) {
+            return __awaiter(this, void 0, void 0, function* () {
+                return handler(normalizeSystemMessages(request));
+            });
+        },
+    });
+}

package/dist/persistence/checkpointStore.d.ts

@@ -7,6 +7,11 @@ export declare class AdminForthCheckpointSaver extends BaseCheckpointSaver {
     constructor(adminforth: any, pluginOptions: PluginOptions);
     private get resourceConfig();
     private resource;
+    /**
+     * Checkpoints contain LangChain message instances. Plain JSON.stringify loses
+     * their constructors, so a resumed HITL middleware cannot recognize AIMessage
+     * tool calls. Use LangGraph's serializer, which preserves those constructors.
+     */
     private serialize;
     private deserialize;
     private now;

package/dist/persistence/checkpointStore.js

@@ -39,18 +39,28 @@ export class AdminForthCheckpointSaver extends BaseCheckpointSaver {
     resource() {
         return this.adminforth.resource(this.resourceConfig.resourceId);
     }
+    /**
+     * Checkpoints contain LangChain message instances. Plain JSON.stringify loses
+     * their constructors, so a resumed HITL middleware cannot recognize AIMessage
+     * tool calls. Use LangGraph's serializer, which preserves those constructors.
+     */
     serialize(value) {
-        if (value === undefined || value === null)
-            return null;
-        return JSON.stringify(value);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (value === undefined || value === null)
+                return null;
+            const [encoding, payload] = yield this.serde.dumpsTyped(value);
+            if (encoding !== "json") {
+                throw new Error(`Unsupported checkpoint payload encoding "${encoding}".`);
+            }
+            return new TextDecoder().decode(payload);
+        });
     }
     deserialize(value) {
-        if (value === undefined || value === null)
-            return null;
-        if (typeof value === "string") {
-            return JSON.parse(value);
-        }
-        return value;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (value === undefined || value === null)
+                return null;
+            return this.serde.loadsTyped("json", typeof value === "string" ? value : JSON.stringify(value));
+        });
     }
     now() {
         return new Date().toISOString();
@@ -112,8 +122,8 @@ export class AdminForthCheckpointSaver extends BaseCheckpointSaver {
                 [r.taskIdField]: null,
                 [r.sequenceField]: 0,
                 [r.createdAtField]: createdAt,
-                [r.checkpointPayloadField]: this.serialize(checkpoint),
-                [r.metadataPayloadField]: this.serialize(metadata),
+                [r.checkpointPayloadField]: yield this.serialize(checkpoint),
+                [r.metadataPayloadField]: yield this.serialize(metadata),
                 [r.writesPayloadField]: null,
                 [r.schemaVersionField]: 1,
             });
@@ -144,7 +154,7 @@ export class AdminForthCheckpointSaver extends BaseCheckpointSaver {
                         [r.createdAtField]: createdAt,
                         [r.checkpointPayloadField]: null,
                         [r.metadataPayloadField]: null,
-                        [r.writesPayloadField]: this.serialize([channel, value]),
+                        [r.writesPayloadField]: yield this.serialize([channel, value]),
                         [r.schemaVersionField]: 1,
                     });
                 }
@@ -171,23 +181,23 @@ export class AdminForthCheckpointSaver extends BaseCheckpointSaver {
             }
             const resolvedCheckpointId = String(checkpointRow[r.checkpointIdField]);
             const writesRows = yield this.resource().list(Filters.AND(Filters.EQ(r.threadIdField, threadId), Filters.EQ(r.checkpointNamespaceField, storedCheckpointNs), Filters.EQ(r.checkpointIdField, resolvedCheckpointId), Filters.EQ(r.rowKindField, "writes")), undefined, undefined, [{ field: r.sequenceField, direction: "asc" }]);
-            const pendingWrites = writesRows.flatMap((row) => {
+            const pendingWrites = (yield Promise.all(writesRows.map((row) => __awaiter(this, void 0, void 0, function* () {
                 var _a;
                 const taskId = String((_a = row[r.taskIdField]) !== null && _a !== void 0 ? _a : "");
-                const write = this.deserialize(row[r.writesPayloadField]);
+                const write = yield this.deserialize(row[r.writesPayloadField]);
                 if (!write) {
                     return [];
                 }
                 const [channel, value] = write;
                 return [[taskId, channel, value]];
-            });
+            })))).flat();
             const parentCheckpointId = checkpointRow[r.parentCheckpointIdField]
                 ? String(checkpointRow[r.parentCheckpointIdField])
                 : null;
             const tuple = {
                 config: this.buildConfig(threadId, checkpointNs, resolvedCheckpointId),
-                checkpoint: this.deserialize(checkpointRow[r.checkpointPayloadField]),
-                metadata: ((_a = this.deserialize(checkpointRow[r.metadataPayloadField])) !== null && _a !== void 0 ? _a : {}),
+                checkpoint: yield this.deserialize(checkpointRow[r.checkpointPayloadField]),
+                metadata: ((_a = yield this.deserialize(checkpointRow[r.metadataPayloadField])) !== null && _a !== void 0 ? _a : {}),
                 parentConfig: parentCheckpointId
                     ? this.buildConfig(threadId, checkpointNs, parentCheckpointId)
                     : undefined,

package/dist/transport/http/coreEndpoints.js

@@ -25,6 +25,7 @@ const agentResponseBodySchema = z.object({
 const agentApprovalBodySchema = z.object({
     sessionId: z.string(),
     decision: z.enum(["approve", "reject"]),
+    mode: z.string().nullish(),
 }).strict();
 const agentSteerBodySchema = z.object({
     sessionId: z.string(),
@@ -151,6 +152,7 @@ export function setupCoreEndpoints(ctx, server) {
             yield ctx.handleTurn({
                 prompt: "",
                 sessionId: data.sessionId,
+                modeName: data.mode,
                 approvalDecision: data.decision,
                 abortSignal,
                 adminUser: adminUser,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/agent",
-  "version": "2.5.9",
+  "version": "2.6.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",