@jetcrab/pi-desk-usage 1.1.0 → 1.1.1-dev

package/dist/l4-usage-files.d.ts

@@ -2,4 +2,5 @@ import type { UsageFileDescriptor } from './usage-scan.js';
 export declare function pathKey(value: string): string;
 export declare function nestedParentSessionId(filePath: string): string | null;
 export declare function descriptor(path: string, nestedSubagent: boolean): Promise<UsageFileDescriptor | null>;
+export declare function listSessionCandidates(root: string, cwd: string, sessionId: string): Promise<UsageFileDescriptor[]>;
 export declare function listStandardSessionFiles(root: string): Promise<UsageFileDescriptor[]>;

package/dist/l4-usage-files.js

@@ -42,6 +42,30 @@ export async function descriptor(path, nestedSubagent) {
 function isSessionJsonlFile(name) {
     return name.endsWith('.jsonl') && !name.includes('.jsonl.');
 }
+export async function listSessionCandidates(root, cwd, sessionId) {
+    const directoryName = `--${resolve(cwd)
+        .replace(/^[/\\]/, '')
+        .replace(/[/\\:]/g, '-')}--`;
+    const suffix = `_${sessionId}.jsonl`.toLowerCase();
+    const files = [];
+    for (const directory of [join(root, directoryName), root]) {
+        let entries;
+        try {
+            entries = await readdir(directory, { withFileTypes: true });
+        }
+        catch {
+            continue;
+        }
+        for (const entry of entries) {
+            if (!entry.isFile() || !entry.name.toLowerCase().endsWith(suffix))
+                continue;
+            const file = await descriptor(join(directory, entry.name), false);
+            if (file)
+                files.push(file);
+        }
+    }
+    return files;
+}
 async function nestedSessionFiles(directory) {
     let entries;
     try {

package/dist/usage-runtime.js

@@ -6,7 +6,7 @@ import { PluginMethodError } from '@jetcrab/pi-desk-sdk/session';
 import { usageBucketRanges, usageBucketIndex, zonedHourStart } from './l4-usage-calendar.js';
 import { z } from 'zod';
 import { addTotals, aggregateEventModels, emptyStructureCounts, emptyTotals, hasUsage, promptTokens, totalEvents } from './l4-usage-aggregate.js';
-import { descriptor, listStandardSessionFiles, nestedParentSessionId, pathKey } from './l4-usage-files.js';
+import { descriptor, listSessionCandidates, listStandardSessionFiles, nestedParentSessionId, pathKey } from './l4-usage-files.js';
 import { createUsageActivities, createUsageTimeline } from './usage-timeline.js';
 const HOUR_MS = 60 * 60 * 1000;
 const HALF_HOUR_MS = HOUR_MS / 2;
@@ -396,10 +396,7 @@ export class UsageRuntime {
         });
     }
     async loadSessionDetails(workSession, signal) {
-        const main = await this.loadSessionById(workSession.source.sessionId, signal);
-        if (pathKey(main.file.cwd) !== pathKey(workSession.cwd)) {
-            throw new PluginMethodError(409, '工作会话目录与 Pi Session 不一致');
-        }
+        const main = await this.loadSessionById(workSession.source.sessionId, workSession.cwd, signal);
         const parent = main.file.parentSessionPath
             ? await this.loadExactFile(main.file.parentSessionPath, false, signal)
             : null;
@@ -517,21 +514,39 @@ export class UsageRuntime {
             throw new PluginMethodError(409, '工作会话来源已变化');
         return { source: workSession.source, cwd: workSession.cwd };
     }
-    async loadSessionById(sessionId, signal) {
-        const cached = [...this.cache.values()].find((entry) => !entry.descriptor.nestedSubagent && entry.file.sessionId === sessionId);
+    async loadSessionById(sessionId, cwd, signal) {
+        const cwdKey = pathKey(cwd);
+        const matches = (entry) => entry !== undefined &&
+            !entry.descriptor.nestedSubagent &&
+            entry.file.sessionId === sessionId &&
+            pathKey(entry.file.cwd) === cwdKey;
+        const cached = [...this.cache.values()].find(matches);
         if (cached) {
+            const key = pathKey(cached.file.path);
             const current = await descriptor(cached.file.path, false);
+            if (!current || signature(current) !== signature(cached.descriptor)) {
+                this.cache.delete(key);
+            }
             if (current)
                 await this.loadChanged([current], signal);
-            const refreshed = this.cache.get(pathKey(cached.file.path));
-            if (refreshed)
+            const refreshed = this.cache.get(key);
+            if (matches(refreshed))
                 return refreshed;
         }
-        const standardFiles = await listStandardSessionFiles(this.sessionsRoot);
-        const suffix = `_${sessionId}.jsonl`.toLowerCase();
-        const candidates = standardFiles.filter((file) => !file.nestedSubagent && basename(file.path).toLowerCase().endsWith(suffix));
+        const candidates = await listSessionCandidates(this.sessionsRoot, cwd, sessionId);
+        for (const candidate of candidates) {
+            const key = pathKey(candidate.path);
+            const previous = this.cache.get(key);
+            if (previous && signature(previous.descriptor) !== signature(candidate)) {
+                this.cache.delete(key);
+            }
+        }
         await this.loadChanged(candidates, signal);
-        const found = [...this.cache.values()].find((entry) => !entry.descriptor.nestedSubagent && entry.file.sessionId === sessionId);
+        const loaded = candidates.map((file) => this.cache.get(pathKey(file.path)));
+        const found = loaded.find(matches);
+        if (!found && loaded.some((entry) => entry?.file.sessionId === sessionId)) {
+            throw new PluginMethodError(409, '工作会话目录与 Pi Session 不一致');
+        }
         if (!found)
             throw new PluginMethodError(404, 'Pi Session 文件不存在');
         return found;

package/package.json

@@ -5,7 +5,7 @@
     "url": "git+https://github.com/JetCrab/pi-desk.git",
     "directory": "plugins/pi-desk-usage"
   },
-  "version": "1.1.0",
+  "version": "1.1.1-dev",
   "license": "Apache-2.0",
   "publishConfig": {
     "registry": "https://registry.npmjs.org",