@adminforth/agent 1.4.0 → 1.6.0

package/agent/middleware/sequenceDebug.ts

@@ -21,8 +21,11 @@ export type SequenceDebug = {
   sequenceId: number;
   startedAt: string;
   prompt: string;
+  promptTokens: number;
   reasoning: string;
+  reasoningTokens: number;
   text: string;
+  textTokens: number;
   cachedTokens: number;
   responseId: string | null;
   toolCalls: SequenceDebugToolCall[];
@@ -37,14 +40,18 @@ type PendingSequenceDebug = Omit<SequenceDebug, "toolCalls" | "endedAt" | "resul
 };
 
 type SequenceDebugModelCall = {
+  promptTokens: number;
   reasoning: string;
+  reasoningTokens: number;
   text: string;
+  textTokens: number;
   cachedTokens: number;
   responseId: string | null;
   resultType: SequenceDebugResultType;
 };
 
 type OpenAiUsageMetadata = {
+  input_tokens?: number;
   input_token_details?: {
     cache_read?: number;
   };
@@ -70,8 +77,11 @@ function createPendingSequenceDebug(sequenceId: number): PendingSequenceDebug {
     sequenceId,
     startedAt: new Date().toISOString(),
     prompt: "",
+    promptTokens: 0,
     reasoning: "",
+    reasoningTokens: 0,
     text: "",
+    textTokens: 0,
     cachedTokens: 0,
     responseId: null,
     toolCalls: [],
@@ -97,8 +107,11 @@ function finalizeSequenceDebug(sequence: PendingSequenceDebug): SequenceDebug {
     sequenceId: sequence.sequenceId,
     startedAt: sequence.startedAt,
     prompt: sequence.prompt,
+    promptTokens: sequence.promptTokens,
     reasoning: sequence.reasoning,
+    reasoningTokens: sequence.reasoningTokens,
     text: sequence.text,
+    textTokens: sequence.textTokens,
     cachedTokens: sequence.cachedTokens,
     responseId: sequence.responseId,
     toolCalls: sequence.toolCalls.map(({ completed: _completed, ...toolCall }) => toolCall),
@@ -176,6 +189,29 @@ function hasToolCallSignal(message: {
   );
 }
 
+function hasTokenCounter(model: unknown): model is {
+  getNumTokens: (content: string) => Promise<number>;
+} {
+  return (
+    typeof model === "object" &&
+    model !== null &&
+    "getNumTokens" in model &&
+    typeof model.getNumTokens === "function"
+  );
+}
+
+async function countTokens(model: unknown, content: string) {
+  if (!content) {
+    return 0;
+  }
+
+  if (!hasTokenCounter(model)) {
+    return 0;
+  }
+
+  return await model.getNumTokens(content);
+}
+
 function extractSequenceResponseDebug(message: AIMessage): SequenceDebugModelCall {
   const blocks = getMessageBlocks(message);
   const reasoning = blocks
@@ -188,8 +224,13 @@ function extractSequenceResponseDebug(message: AIMessage): SequenceDebugModelCal
     .join("");
 
   return {
+    promptTokens:
+      (message.usage_metadata as OpenAiUsageMetadata | undefined)?.input_tokens ??
+      0,
     reasoning,
+    reasoningTokens: 0,
     text: textFromBlocks || (typeof message.content === "string" ? message.content : ""),
+    textTokens: 0,
     cachedTokens:
       (message.usage_metadata as OpenAiUsageMetadata | undefined)
         ?.input_token_details?.cache_read ?? 0,
@@ -238,8 +279,11 @@ export function createSequenceDebugCollector(): SequenceDebugCollector {
     },
     handleModelCallComplete(params) {
       const sequenceDebug = ensureSequenceDebug();
+      sequenceDebug.promptTokens = params.promptTokens;
       sequenceDebug.reasoning = params.reasoning;
+      sequenceDebug.reasoningTokens = params.reasoningTokens;
       sequenceDebug.text = params.text;
+      sequenceDebug.textTokens = params.textTokens;
       sequenceDebug.cachedTokens = params.cachedTokens;
       sequenceDebug.responseId = params.responseId;
       sequenceDebug.resultType = params.resultType;
@@ -311,17 +355,31 @@ export function createSequenceDebugMiddleware(
   return createMiddleware({
     name: "SequenceDebugMiddleware",
     async wrapModelCall(request, handler) {
+      const prompt = stringifyPromptForDebug({
+        systemMessage: request.systemMessage,
+        messages: request.messages,
+        tools: request.tools,
+        modelSettings: request.modelSettings,
+      });
+
       sink.handleModelCallStart(
-        stringifyPromptForDebug({
-          systemMessage: request.systemMessage,
-          messages: request.messages,
-          tools: request.tools,
-          modelSettings: request.modelSettings,
-        }),
+        prompt,
       );
 
       const response = await handler(request) as AIMessage;
-      sink.handleModelCallComplete(extractSequenceResponseDebug(response));
+      const debug = extractSequenceResponseDebug(response);
+      const [promptTokens, reasoningTokens, textTokens] = await Promise.all([
+        debug.promptTokens || countTokens(request.model, prompt),
+        countTokens(request.model, debug.reasoning),
+        countTokens(request.model, debug.text),
+      ]);
+
+      sink.handleModelCallComplete({
+        ...debug,
+        promptTokens,
+        reasoningTokens,
+        textTokens,
+      });
       return response;
     },
   });

package/agent/skills/registry.ts

@@ -6,6 +6,11 @@ import { parse as parseYaml } from "yaml";
 const PLUGIN_SKILLS_DIRECTORY_PATH = fileURLToPath(
   new URL("../../custom/skills/", import.meta.url),
 );
+const USER_PLUGIN_SKILLS_DIRECTORY_PATH_SEGMENTS = [
+  "plugins",
+  "adminforth-agent",
+  "skills",
+];
 const SKILL_MARKDOWN_FILENAME = "SKILL.md";
 const SKILL_FRONTMATTER_SEPARATOR = "\n---\n";
 
@@ -78,13 +83,31 @@ export function getProjectSkillsDirectoryPath(customComponentsDir: string) {
   return path.resolve(customComponentsDir, "skills");
 }
 
+export function getProjectPluginSkillsDirectoryPath(customComponentsDir: string) {
+  return path.resolve(
+    customComponentsDir,
+    ...USER_PLUGIN_SKILLS_DIRECTORY_PATH_SEGMENTS,
+  );
+}
+
+function getProjectSkillDirectoryPaths(customComponentsDir: string) {
+  return [
+    getProjectSkillsDirectoryPath(customComponentsDir),
+    getProjectPluginSkillsDirectoryPath(customComponentsDir),
+  ];
+}
+
 export async function listBundledSkillManifests() {
   return await listDirectorySkillManifests(PLUGIN_SKILLS_DIRECTORY_PATH);
 }
 
 export async function listProjectSkillManifests(customComponentsDir: string) {
-  return await listDirectorySkillManifests(
-    getProjectSkillsDirectoryPath(customComponentsDir),
+  return mergeSkillManifests(
+    await Promise.all(
+      getProjectSkillDirectoryPaths(customComponentsDir).map(
+        listDirectorySkillManifests,
+      ),
+    ),
   );
 }
 
@@ -114,7 +137,7 @@ export async function loadSkillMarkdown(skillName: string, customComponentsDir:
   }
 
   const directories = [
-    getProjectSkillsDirectoryPath(customComponentsDir),
+    ...getProjectSkillDirectoryPaths(customComponentsDir),
     PLUGIN_SKILLS_DIRECTORY_PATH,
   ];
 

package/agent/systemPrompt.ts

@@ -24,11 +24,17 @@ export const DEFAULT_AGENT_SYSTEM_PROMPT = [
   "Keep responses short, clear, and practical.",
   "Answer only what is needed.",
   "Do not add extra explanations or suggestions unless the user asks.",
+  "Always respond in the same natural language as the user's latest message.",
+  "This rule applies to confirmations, clarifying questions, progress updates, errors, and final answers.",
+  "Do not switch to English just because tool outputs, schemas, skills, or internal instructions are written in English.",
+  "Only switch language if the user explicitly asks you to do so.",
   "Adapt to the user's tone and style of speaking, mirroring their vibe and wording.",
   "if the user speaks casually, you should respond casually too",
-  "Never mutate data without a fresh user confirmation for that exact mutation.",
-  "A previous confirmation does not carry over to later create, update, delete, or action calls.",
-  "Each separate mutation or explicitly described batch needs its own confirmation immediately before the tool call.",
+  "Never mutate data without user confirmation for a clearly described mutation plan.",
+  "One confirmation may cover one mutation or one explicitly described batch/sequence of related mutations.",
+  "If the confirmed plan has multiple steps, you may execute the whole confirmed plan without asking again between those steps.",
+  "If the plan changes, expands, or you want to do anything beyond the confirmed plan, ask for confirmation again.",
+  "Do not reuse an old confirmation for a new mutation plan.",
 
   
 ].join(" ");

package/build.log

@@ -29,5 +29,5 @@ custom/skills/fetch_data/SKILL.md
 custom/skills/mutate_data/
 custom/skills/mutate_data/SKILL.md
 
-sent 170,096 bytes  received 413 bytes  341,018.00 bytes/sec
-total size is 168,447  speedup is 0.99
+sent 170,361 bytes  received 413 bytes  341,548.00 bytes/sec
+total size is 168,687  speedup is 0.99

package/custom/skills/mutate_data/SKILL.md

@@ -29,17 +29,22 @@ When creating new record, show user all data which you gona create and in same m
 
 Accept any positive confirmation from user like "yes", "sure", "+", anything non-negative call to action, can be considered as confirmation.
 
-A confirmation is valid only for the exact mutation plan from the immediately previous assistant message.
+A confirmation is valid only for the clearly described mutation plan from the immediately previous assistant message.
 
 Never reuse an older confirmation for a later mutation.
 
-After one mutation is executed, confirmation is consumed and reset.
+One confirmation may cover:
+- one single mutation
+- one explicitly described batch
+- one short sequence of related mutations that together implement the same user request
 
-If you want to perform another create/update/delete/action after that, ask for confirmation again even if the user previously said "yes".
+If the confirmed plan contains several related mutation steps, execute that whole confirmed plan without asking again between those steps.
 
-If the mutation plan changes in any way (different record, different fields, different values, different number of records, different action), the old confirmation is invalid and you must ask again.
+Ask for confirmation again if the plan changes in any way: different record, different fields, different values, different number of records, different action, or any extra mutation that was not listed in the confirmation message.
 
-If you are creating or deleting multiple records in one batch, you may ask once only for that exact batch, but you must list the whole batch explicitly in the confirmation message. Any extra record outside that described batch requires a new confirmation.
+If you are creating or deleting multiple records in one batch, you may ask once for that exact batch, but list the whole batch explicitly in the confirmation message. Any extra record outside that described batch requires a new confirmation.
+
+After the confirmed plan is finished, do not treat that confirmation as still active for later requests.
 
 # Calling actions
 

package/dist/agent/middleware/sequenceDebug.js

@@ -25,8 +25,11 @@ function createPendingSequenceDebug(sequenceId) {
         sequenceId,
         startedAt: new Date().toISOString(),
         prompt: "",
+        promptTokens: 0,
         reasoning: "",
+        reasoningTokens: 0,
         text: "",
+        textTokens: 0,
         cachedTokens: 0,
         responseId: null,
         toolCalls: [],
@@ -47,8 +50,11 @@ function finalizeSequenceDebug(sequence) {
         sequenceId: sequence.sequenceId,
         startedAt: sequence.startedAt,
         prompt: sequence.prompt,
+        promptTokens: sequence.promptTokens,
         reasoning: sequence.reasoning,
+        reasoningTokens: sequence.reasoningTokens,
         text: sequence.text,
+        textTokens: sequence.textTokens,
         cachedTokens: sequence.cachedTokens,
         responseId: sequence.responseId,
         toolCalls: sequence.toolCalls.map((_a) => {
@@ -98,8 +104,25 @@ function hasToolCallSignal(message) {
         (Array.isArray((_a = message.additional_kwargs) === null || _a === void 0 ? void 0 : _a.tool_calls) &&
             message.additional_kwargs.tool_calls.length > 0));
 }
+function hasTokenCounter(model) {
+    return (typeof model === "object" &&
+        model !== null &&
+        "getNumTokens" in model &&
+        typeof model.getNumTokens === "function");
+}
+function countTokens(model, content) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!content) {
+            return 0;
+        }
+        if (!hasTokenCounter(model)) {
+            return 0;
+        }
+        return yield model.getNumTokens(content);
+    });
+}
 function extractSequenceResponseDebug(message) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g;
     const blocks = getMessageBlocks(message);
     const reasoning = blocks
         .filter((block) => (block === null || block === void 0 ? void 0 : block.type) === "reasoning")
@@ -110,10 +133,13 @@ function extractSequenceResponseDebug(message) {
         .map((block) => { var _a; return String((_a = block.text) !== null && _a !== void 0 ? _a : ""); })
         .join("");
     return {
+        promptTokens: (_b = (_a = message.usage_metadata) === null || _a === void 0 ? void 0 : _a.input_tokens) !== null && _b !== void 0 ? _b : 0,
         reasoning,
+        reasoningTokens: 0,
         text: textFromBlocks || (typeof message.content === "string" ? message.content : ""),
-        cachedTokens: (_c = (_b = (_a = message.usage_metadata) === null || _a === void 0 ? void 0 : _a.input_token_details) === null || _b === void 0 ? void 0 : _b.cache_read) !== null && _c !== void 0 ? _c : 0,
-        responseId: (_e = (_d = message.response_metadata) === null || _d === void 0 ? void 0 : _d.id) !== null && _e !== void 0 ? _e : null,
+        textTokens: 0,
+        cachedTokens: (_e = (_d = (_c = message.usage_metadata) === null || _c === void 0 ? void 0 : _c.input_token_details) === null || _d === void 0 ? void 0 : _d.cache_read) !== null && _e !== void 0 ? _e : 0,
+        responseId: (_g = (_f = message.response_metadata) === null || _f === void 0 ? void 0 : _f.id) !== null && _g !== void 0 ? _g : null,
         resultType: hasToolCallSignal(message) ? "tool_calls" : "final_text",
     };
 }
@@ -147,8 +173,11 @@ export function createSequenceDebugCollector() {
         },
         handleModelCallComplete(params) {
             const sequenceDebug = ensureSequenceDebug();
+            sequenceDebug.promptTokens = params.promptTokens;
             sequenceDebug.reasoning = params.reasoning;
+            sequenceDebug.reasoningTokens = params.reasoningTokens;
             sequenceDebug.text = params.text;
+            sequenceDebug.textTokens = params.textTokens;
             sequenceDebug.cachedTokens = params.cachedTokens;
             sequenceDebug.responseId = params.responseId;
             sequenceDebug.resultType = params.resultType;
@@ -204,14 +233,23 @@ export function createSequenceDebugMiddleware(sink) {
         name: "SequenceDebugMiddleware",
         wrapModelCall(request, handler) {
             return __awaiter(this, void 0, void 0, function* () {
-                sink.handleModelCallStart(stringifyPromptForDebug({
+                const prompt = stringifyPromptForDebug({
                     systemMessage: request.systemMessage,
                     messages: request.messages,
                     tools: request.tools,
                     modelSettings: request.modelSettings,
-                }));
+                });
+                sink.handleModelCallStart(prompt);
                 const response = yield handler(request);
-                sink.handleModelCallComplete(extractSequenceResponseDebug(response));
+                const debug = extractSequenceResponseDebug(response);
+                const [promptTokens, reasoningTokens, textTokens] = yield Promise.all([
+                    debug.promptTokens || countTokens(request.model, prompt),
+                    countTokens(request.model, debug.reasoning),
+                    countTokens(request.model, debug.text),
+                ]);
+                sink.handleModelCallComplete(Object.assign(Object.assign({}, debug), { promptTokens,
+                    reasoningTokens,
+                    textTokens }));
                 return response;
             });
         },

package/dist/agent/skills/registry.js

@@ -12,6 +12,11 @@ import path from "path";
 import { fileURLToPath } from "url";
 import { parse as parseYaml } from "yaml";
 const PLUGIN_SKILLS_DIRECTORY_PATH = fileURLToPath(new URL("../../custom/skills/", import.meta.url));
+const USER_PLUGIN_SKILLS_DIRECTORY_PATH_SEGMENTS = [
+    "plugins",
+    "adminforth-agent",
+    "skills",
+];
 const SKILL_MARKDOWN_FILENAME = "SKILL.md";
 const SKILL_FRONTMATTER_SEPARATOR = "\n---\n";
 function parseSkillManifest(directoryName, markdown) {
@@ -58,6 +63,15 @@ function mergeSkillManifests(skillGroups) {
 export function getProjectSkillsDirectoryPath(customComponentsDir) {
     return path.resolve(customComponentsDir, "skills");
 }
+export function getProjectPluginSkillsDirectoryPath(customComponentsDir) {
+    return path.resolve(customComponentsDir, ...USER_PLUGIN_SKILLS_DIRECTORY_PATH_SEGMENTS);
+}
+function getProjectSkillDirectoryPaths(customComponentsDir) {
+    return [
+        getProjectSkillsDirectoryPath(customComponentsDir),
+        getProjectPluginSkillsDirectoryPath(customComponentsDir),
+    ];
+}
 export function listBundledSkillManifests() {
     return __awaiter(this, void 0, void 0, function* () {
         return yield listDirectorySkillManifests(PLUGIN_SKILLS_DIRECTORY_PATH);
@@ -65,7 +79,7 @@ export function listBundledSkillManifests() {
 }
 export function listProjectSkillManifests(customComponentsDir) {
     return __awaiter(this, void 0, void 0, function* () {
-        return yield listDirectorySkillManifests(getProjectSkillsDirectoryPath(customComponentsDir));
+        return mergeSkillManifests(yield Promise.all(getProjectSkillDirectoryPaths(customComponentsDir).map(listDirectorySkillManifests)));
     });
 }
 export function listSkillManifests(customComponentsDir) {
@@ -90,7 +104,7 @@ export function loadSkillMarkdown(skillName, customComponentsDir) {
             return null;
         }
         const directories = [
-            getProjectSkillsDirectoryPath(customComponentsDir),
+            ...getProjectSkillDirectoryPaths(customComponentsDir),
             PLUGIN_SKILLS_DIRECTORY_PATH,
         ];
         for (const skillsDirectoryPath of directories) {

package/dist/agent/systemPrompt.js

@@ -23,11 +23,17 @@ export const DEFAULT_AGENT_SYSTEM_PROMPT = [
     "Keep responses short, clear, and practical.",
     "Answer only what is needed.",
     "Do not add extra explanations or suggestions unless the user asks.",
+    "Always respond in the same natural language as the user's latest message.",
+    "This rule applies to confirmations, clarifying questions, progress updates, errors, and final answers.",
+    "Do not switch to English just because tool outputs, schemas, skills, or internal instructions are written in English.",
+    "Only switch language if the user explicitly asks you to do so.",
     "Adapt to the user's tone and style of speaking, mirroring their vibe and wording.",
     "if the user speaks casually, you should respond casually too",
-    "Never mutate data without a fresh user confirmation for that exact mutation.",
-    "A previous confirmation does not carry over to later create, update, delete, or action calls.",
-    "Each separate mutation or explicitly described batch needs its own confirmation immediately before the tool call.",
+    "Never mutate data without user confirmation for a clearly described mutation plan.",
+    "One confirmation may cover one mutation or one explicitly described batch/sequence of related mutations.",
+    "If the confirmed plan has multiple steps, you may execute the whole confirmed plan without asking again between those steps.",
+    "If the plan changes, expands, or you want to do anything beyond the confirmed plan, ask for confirmation again.",
+    "Do not reuse an old confirmation for a new mutation plan.",
 ].join(" ");
 function formatResources(resources) {
     return resources

package/dist/custom/skills/mutate_data/SKILL.md

@@ -29,17 +29,22 @@ When creating new record, show user all data which you gona create and in same m
 
 Accept any positive confirmation from user like "yes", "sure", "+", anything non-negative call to action, can be considered as confirmation.
 
-A confirmation is valid only for the exact mutation plan from the immediately previous assistant message.
+A confirmation is valid only for the clearly described mutation plan from the immediately previous assistant message.
 
 Never reuse an older confirmation for a later mutation.
 
-After one mutation is executed, confirmation is consumed and reset.
+One confirmation may cover:
+- one single mutation
+- one explicitly described batch
+- one short sequence of related mutations that together implement the same user request
 
-If you want to perform another create/update/delete/action after that, ask for confirmation again even if the user previously said "yes".
+If the confirmed plan contains several related mutation steps, execute that whole confirmed plan without asking again between those steps.
 
-If the mutation plan changes in any way (different record, different fields, different values, different number of records, different action), the old confirmation is invalid and you must ask again.
+Ask for confirmation again if the plan changes in any way: different record, different fields, different values, different number of records, different action, or any extra mutation that was not listed in the confirmation message.
 
-If you are creating or deleting multiple records in one batch, you may ask once only for that exact batch, but you must list the whole batch explicitly in the confirmation message. Any extra record outside that described batch requires a new confirmation.
+If you are creating or deleting multiple records in one batch, you may ask once for that exact batch, but list the whole batch explicitly in the confirmation message. Any extra record outside that described batch requires a new confirmation.
+
+After the confirmed plan is finished, do not treat that confirmation as still active for later requests.
 
 # Calling actions
 

package/dist/index.js

@@ -159,6 +159,9 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
                     res.write(`data: ${JSON.stringify(obj)}\n\n`);
                 };
                 const emitToolCallEvent = (event) => {
+                    if (event.phase === "start") {
+                        endActiveBlock();
+                    }
                     sequenceDebugCollector.handleToolCallEvent(event);
                     send({
                         type: "data-tool-call",

package/index.ts

@@ -177,6 +177,10 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
         };
 
         const emitToolCallEvent = (event: ToolCallEvent) => {
+          if (event.phase === "start") {
+            endActiveBlock();
+          }
+
           sequenceDebugCollector.handleToolCallEvent(event);
 
           send({

package/package.json

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