@geminixiang/mikan 1.0.0-beta.87 → 1.0.0-beta.89

package/dist/adapters/web/admin/portal.js

@@ -25,7 +25,6 @@ import { loadMcpTools } from "../../../harness/mcp.js";
 import { isValidMcpServerName, parseStandardMcpServers, redactMcpUrl, } from "../../../harness/mcp.js";
 import { applyConversationSettings, applyOfficeVisibility, applyGlobalSettings, } from "../../../settings/apply.js";
 import { escapeHtml, jsonResponse as jsonRes, readJsonBody, renderPortalShell, } from "../portal-shell.js";
-import { resolveExistingSessionFile } from "../session-view/portal.js";
 import { PRODUCT_NAME } from "../../messages.js";
 import { credentialAuthorizationKey } from "../../../sandbox/identity.js";
 import { resolveWorkspaceProjection } from "../../../office/projection.js";
@@ -251,25 +250,18 @@ async function serveSessionUsage(res, services) {
     jsonRes(res, 200, { sessions: rows });
 }
 async function listConversationSessionUsage(workspace, office, label) {
-    const sessionDir = workspace.office(office).sessionsDir;
-    let files;
-    try {
-        files = readdirSync(sessionDir, { withFileTypes: true })
-            .filter((entry) => entry.isFile() && entry.name.endsWith(".jsonl"))
-            .map((entry) => entry.name);
-    }
-    catch {
-        return [];
-    }
+    const conversationOffice = workspace.office(office);
     const rows = [];
-    for (const name of files) {
-        rows.push(...(await readSessionUsage(join(sessionDir, name), office.conversationId, label)));
+    for (const session of await SessionStore.list(conversationOffice)) {
+        rows.push(...(await readSessionUsage(conversationOffice, session.key, office.conversationId, label)));
     }
     return rows;
 }
-async function readSessionUsage(sessionFile, conversationId, label) {
+async function readSessionUsage(office, sessionKey, conversationId, label) {
     try {
-        const manager = await SessionStore.inspect(sessionFile);
+        const manager = await SessionStore.inspect(office, sessionKey);
+        if (!manager)
+            return [];
         const header = manager.getHeader();
         const entries = await manager.getEntries();
         const usage = entries.reduce((sum, entry) => {
@@ -293,9 +285,10 @@ async function readSessionUsage(sessionFile, conversationId, label) {
             {
                 conversationId,
                 label,
-                fileName: basename(sessionFile),
-                sessionId: header.id,
-                updatedAt: entries.length > 0 ? new Date(entries.at(-1).timestamp).toISOString() : header.timestamp,
+                sessionKey,
+                updatedAt: entries.length > 0
+                    ? new Date(entries.at(-1).timestamp).toISOString()
+                    : new Date(header.createdAt).toISOString(),
                 ...usage,
                 total,
             },
@@ -344,15 +337,10 @@ async function serveConversationUsage(res, url, services) {
     const cutoff = new Date(today);
     cutoff.setDate(today.getDate() - (days - 1));
     const flags = { hasOlder: false };
-    const sessionDir = workspace.office(office).sessionsDir;
-    try {
-        for (const entry of readdirSync(sessionDir, { withFileTypes: true })) {
-            if (!entry.isFile() || !entry.name.endsWith(".jsonl"))
-                continue;
-            await accumulateSessionUsageByDay(join(sessionDir, entry.name), cutoff, buckets, flags);
-        }
+    const conversationOffice = workspace.office(office);
+    for (const session of await SessionStore.list(conversationOffice)) {
+        await accumulateSessionUsageByDay(conversationOffice, session.key, cutoff, buckets, flags);
     }
-    catch { }
     const series = order.map((key) => buckets.get(key) ?? emptyBucket(key));
     const totals = series.reduce((sum, b) => {
         sum.input += b.input;
@@ -380,9 +368,11 @@ async function serveConversationUsage(res, url, services) {
         },
     });
 }
-async function accumulateSessionUsageByDay(sessionFile, cutoff, buckets, flags) {
+async function accumulateSessionUsageByDay(office, sessionKey, cutoff, buckets, flags) {
     try {
-        const manager = await SessionStore.inspect(sessionFile);
+        const manager = await SessionStore.inspect(office, sessionKey);
+        if (!manager)
+            return;
         for (const entry of await manager.getEntries()) {
             if (entry.type !== "message" || entry.message.role !== "assistant")
                 continue;
@@ -554,7 +544,7 @@ function serveConversationSlackUpdate(res, body, services, token) {
         return { ok: true };
     });
 }
-function serveConversationSessionLink(res, body, services, token) {
+async function serveConversationSessionLink(res, body, services, token) {
     const target = requireConversationWorkspace(res, body, services, token);
     if (!target)
         return;
@@ -569,9 +559,9 @@ function serveConversationSessionLink(res, body, services, token) {
         });
         return;
     }
-    const sessionFile = resolveExistingSessionFile(workspace.office(scope.address), scope.conversationId);
-    if (!sessionFile) {
-        jsonRes(res, 404, { error: "No session file found for this conversation" });
+    const office = workspace.office(scope.address);
+    if (!(await SessionStore.exists(office, scope.conversationId))) {
+        jsonRes(res, 404, { error: "No session found for this conversation" });
         return;
     }
     try {
@@ -580,7 +570,7 @@ function serveConversationSessionLink(res, body, services, token) {
             platformUserId: token.platformUserId,
             conversationId: scope.conversationId,
             sessionKey: scope.conversationId,
-            sessionFile,
+            office,
             platformUserName: token.platformUserName,
         });
         const url = `${services.portalBaseUrl}/session?token=${encodeURIComponent(viewToken)}`;
@@ -751,13 +741,11 @@ function buildTree(startDir, relPrefix) {
                 name,
                 path: rel,
                 type: "file",
-                size: stats.size,
-                mtimeMs: stats.mtimeMs,
             };
         }
         counter.value += 1;
         if (depth >= WORKSPACE_TREE_MAX_DEPTH) {
-            return { name, path: rel, type: "dir", truncated: true };
+            return { name, path: rel, type: "dir" };
         }
         let entries;
         try {
@@ -767,7 +755,6 @@ function buildTree(startDir, relPrefix) {
             return { name, path: rel, type: "dir" };
         }
         const children = [];
-        let truncated = false;
         for (const entry of entries.toSorted((a, b) => {
             if (a.isDirectory() !== b.isDirectory())
                 return a.isDirectory() ? -1 : 1;
@@ -777,7 +764,6 @@ function buildTree(startDir, relPrefix) {
             if (!isWorkspacePathAllowed(childRel))
                 continue;
             if (counter.value >= WORKSPACE_TREE_MAX_ENTRIES) {
-                truncated = true;
                 break;
             }
             const node = walk(join(dir, entry.name), childRel, depth + 1);
@@ -789,7 +775,6 @@ function buildTree(startDir, relPrefix) {
             path: rel,
             type: "dir",
             children,
-            truncated: truncated ? true : undefined,
         };
     };
     const node = walk(startDir, relPrefix, 0);
@@ -956,7 +941,6 @@ export function readSkillsFromDir(skillsDir, source) {
             name: meta.name ?? entry.name,
             description: meta.description ?? "",
             source,
-            path: skillMd,
             directory: entry.name,
         });
     }
@@ -1014,10 +998,10 @@ async function verifyMcpServers(servers) {
             if (failure) {
                 const url = servers[name]?.url;
                 const error = url ? failure.error.split(url).join(redactMcpUrl(url)) : failure.error;
-                return { name, error };
+                return { error };
             }
             const prefix = `mcp__${name}__`;
-            return { name, tools: loaded.tools.filter((t) => t.name.startsWith(prefix)).length };
+            return { tools: loaded.tools.filter((t) => t.name.startsWith(prefix)).length };
         });
     }
     finally {