Merge branch 'next' of github.com:devforth/adminforth into next

Author: yaroslav8765

dev-demo/custom/TurnDebugShow.vue

@@ -84,21 +84,21 @@
 
       <div class="mt-4 grid gap-3 md:grid-cols-5">
         <div class="rounded-lg bg-slate-50 p-3 dark:bg-slate-800/70">
-          <div class="text-xs uppercase tracking-wide text-slate-500 dark:text-slate-400">Prompt</div>
+          <div class="text-xs uppercase tracking-wide text-slate-500 dark:text-slate-400">Prompt Tokens</div>
           <div class="mt-1 text-sm font-semibold text-slate-900 dark:text-white">
-            {{ sequence.prompt ? `${sequence.prompt.length} chars` : 'Empty' }}
+            {{ sequence.prompt ? `${formatNumber(sequence.promptTokens)} tokens` : 'Empty' }}
           </div>
         </div>
         <div class="rounded-lg bg-slate-50 p-3 dark:bg-slate-800/70">
-          <div class="text-xs uppercase tracking-wide text-slate-500 dark:text-slate-400">Reasoning</div>
+          <div class="text-xs uppercase tracking-wide text-slate-500 dark:text-slate-400">Reasoning Tokens</div>
           <div class="mt-1 text-sm font-semibold text-slate-900 dark:text-white">
-            {{ sequence.reasoning ? `${sequence.reasoning.length} chars` : 'Empty' }}
+            {{ sequence.reasoning ? `${formatNumber(sequence.reasoningTokens)} tokens` : 'Empty' }}
           </div>
         </div>
         <div class="rounded-lg bg-slate-50 p-3 dark:bg-slate-800/70">
-          <div class="text-xs uppercase tracking-wide text-slate-500 dark:text-slate-400">Text</div>
+          <div class="text-xs uppercase tracking-wide text-slate-500 dark:text-slate-400">Text Tokens</div>
           <div class="mt-1 text-sm font-semibold text-slate-900 dark:text-white">
-            {{ sequence.text ? `${sequence.text.length} chars` : 'Empty' }}
+            {{ sequence.text ? `${formatNumber(sequence.textTokens)} tokens` : 'Empty' }}
           </div>
         </div>
         <div class="rounded-lg bg-slate-50 p-3 dark:bg-slate-800/70">
@@ -278,8 +278,11 @@ type DebugSequence = {
   sequenceId: number;
   startedAt: string;
   prompt: string;
+  promptTokens: number;
   reasoning: string;
+  reasoningTokens: number;
   text: string;
+  textTokens: number;
   cachedTokens: number;
   responseId: string | null;
   toolCalls: DebugToolCall[];

dev-demo/resources/agent_resources/sessions.ts

@@ -1,6 +1,7 @@
 import AdminForth, { AdminForthDataTypes } from 'adminforth';
 import type { AdminForthResourceInput, AdminUser } from 'adminforth';
 import { randomUUID } from 'crypto';
+import ForeignInlineListPlugin from '../../../plugins/adminforth-foreign-inline-list/index.js';
 
 export default {
   dataSource: 'sqlite',
@@ -42,6 +43,11 @@ export default {
         edit: false,
         create: false,
       }
-    }
+    },
+  ],
+  plugins: [
+    new ForeignInlineListPlugin({
+      foreignResourceId: 'turns',
+    }),
   ],
 } as AdminForthResourceInput;

dev-demo/resources/agent_resources/turns.ts

@@ -21,6 +21,10 @@ export default {
     {
       name: 'session_id',
       type: AdminForthDataTypes.STRING,
+      foreignResource: {
+        resourceId: 'sessions',
+        labelField: 'id'
+      }
     },
     {
       name: 'created_at',

tests/jest_tests/adminforth_agent_skills_registry.test.ts

@@ -0,0 +1,81 @@
+import { mkdtemp, mkdir, rm, writeFile } from "fs/promises";
+import os from "os";
+import path from "path";
+import {
+  listProjectSkillManifests,
+  loadSkillMarkdown,
+} from "../../plugins/adminforth-agent/agent/skills/registry.js";
+
+const SKILL_MARKDOWN = (name: string, description: string, body: string) => `name: ${name}
+description: ${description}
+---
+
+${body}
+`;
+
+describe("adminforth-agent skills registry", () => {
+  let customComponentsDir: string;
+
+  beforeEach(async () => {
+    customComponentsDir = await mkdtemp(
+      path.join(os.tmpdir(), "adminforth-agent-skills-"),
+    );
+  });
+
+  afterEach(async () => {
+    await rm(customComponentsDir, { recursive: true, force: true });
+  });
+
+  it("collects skills from both user custom skill directories", async () => {
+    const rootSkillDir = path.join(customComponentsDir, "skills", "root-skill");
+    const pluginSkillDir = path.join(
+      customComponentsDir,
+      "plugins",
+      "adminforth-agent",
+      "skills",
+      "plugin-skill",
+    );
+
+    await mkdir(rootSkillDir, { recursive: true });
+    await mkdir(pluginSkillDir, { recursive: true });
+
+    await writeFile(
+      path.join(rootSkillDir, "SKILL.md"),
+      SKILL_MARKDOWN("root-skill", "Root custom skill", "Root body"),
+      "utf8",
+    );
+    await writeFile(
+      path.join(pluginSkillDir, "SKILL.md"),
+      SKILL_MARKDOWN("plugin-skill", "Plugin custom skill", "Plugin body"),
+      "utf8",
+    );
+
+    const skills = await listProjectSkillManifests(customComponentsDir);
+
+    expect(skills.map((skill) => skill.name)).toEqual([
+      "root-skill",
+      "plugin-skill",
+    ]);
+  });
+
+  it("loads markdown from the plugin-scoped user custom directory", async () => {
+    const pluginSkillDir = path.join(
+      customComponentsDir,
+      "plugins",
+      "adminforth-agent",
+      "skills",
+      "plugin-skill",
+    );
+
+    await mkdir(pluginSkillDir, { recursive: true });
+    await writeFile(
+      path.join(pluginSkillDir, "SKILL.md"),
+      SKILL_MARKDOWN("plugin-skill", "Plugin custom skill", "Plugin body"),
+      "utf8",
+    );
+
+    await expect(loadSkillMarkdown("plugin-skill", customComponentsDir)).resolves.toContain(
+      "Plugin body",
+    );
+  });
+});