dsh-llm-verifier 0.1.10 → 0.1.13

package/lib/client.js

@@ -534,7 +534,7 @@ window.__ModuleLoader__.load({
 						groups: m.value.groups,
 						settings: view,
 						writable: s.value.writable,
-						failures: m.value.failures.map((f) => f.provider + ": " + f.message)
+						failures: m.value.failures.map((f) => (f.id ?? f.provider ?? f.name ?? "unknown") + ": " + f.message)
 					};
 					setLoaded(next);
 					setDraft(values(view));

package/lib/index.js

@@ -1605,10 +1605,14 @@ function escapes(root, target) {
 * together with the conversation log.
 */
 function resolveTopicDataDir(locator, header, cacheDir) {
-	const location = locator.locate(header);
-	if (location === void 0) throw new Error("llm-verifier: the active session persistence backend does not expose a per-session artifact directory");
 	if (isAbsolute(cacheDir)) throw new Error("llm-verifier: cacheDir must be relative so verifier data stays inside its topic directory");
-	const topicDir = dirname(location.path);
+	let topicDir;
+	if (typeof locator?.locate === "function") {
+		const location = locator.locate(header);
+		if (location && typeof location.path === "string") topicDir = dirname(location.path);
+	}
+	if (!topicDir && typeof locator?.root === "string" && header?.id) topicDir = resolve(locator.root, String(header.id));
+	if (topicDir === void 0) throw new Error("llm-verifier: the active session persistence backend does not expose a per-session artifact directory");
 	const target = resolve(topicDir, cacheDir);
 	if (escapes(topicDir, target)) throw new Error("llm-verifier: cacheDir must stay inside the topic directory");
 	return target;
@@ -2019,7 +2023,7 @@ function apply(ctx, config = {}) {
 			...sessionId ? { sessionId } : {}
 		};
 		try {
-			const headers = (await services.sessionPersistence.list()).filter((header) => sessionId === void 0 || String(header.id) === sessionId);
+			const headers = (await services.sessionPersistence.list()).map((item) => item && typeof item === "object" && "header" in item ? item.header : item).filter((header) => header !== void 0 && (sessionId === void 0 || String(header.id) === sessionId));
 			return rpcSuccess(mergeStatisticsOverviews(await Promise.all(headers.map((header) => topic(header).statistics.overview(query))), query));
 		} catch (error) {
 			return rpcFailure(error instanceof Error ? error.message : String(error));

package/lib/types/client.d.ts

@@ -9,7 +9,9 @@ interface VerifierRemote {
             value: {
                 groups: readonly ModelProviderGroup[];
                 failures: readonly {
-                    provider: string;
+                    id?: string;
+                    provider?: string;
+                    name?: string;
                     message: string;
                 }[];
             };

package/lib/types/client.js

@@ -40,7 +40,7 @@ export function VerifierSettings({ remote }) {
         const view = s.value.namespaces.find((x) => x.ns === NS);
         if (!view)
             throw new Error(t['settings.nsUnregistered']);
-        const next = { groups: m.value.groups, settings: view, writable: s.value.writable, failures: m.value.failures.map((f) => f.provider + ': ' + f.message) };
+        const next = { groups: m.value.groups, settings: view, writable: s.value.writable, failures: m.value.failures.map((f) => (f.id ?? f.provider ?? f.name ?? 'unknown') + ': ' + f.message) };
         setLoaded(next);
         setDraft(values(view));
     }

package/lib/types/index.js

@@ -125,7 +125,10 @@ export function apply(ctx, config = {}) {
         const sessionId = typeof row.sessionId === 'string' && row.sessionId.length > 0 ? row.sessionId : undefined;
         const query = { fromMs: numberField(row.fromMs, Number.NaN), toMs: numberField(row.toMs, Number.NaN), timezoneOffsetMinutes: numberField(row.timezoneOffsetMinutes, 0), recentLimit: numberField(row.recentLimit, 40), ...(sessionId ? { sessionId } : {}) };
         try {
-            const headers = (await services.sessionPersistence.list()).filter(header => sessionId === undefined || String(header.id) === sessionId);
+            const items = await services.sessionPersistence.list();
+            const headers = items
+                .map(item => item && typeof item === 'object' && 'header' in item ? item.header : item)
+                .filter(header => header !== undefined && (sessionId === undefined || String(header.id) === sessionId));
             const overviews = await Promise.all(headers.map(header => topic(header).statistics.overview(query)));
             const value = mergeStatisticsOverviews(overviews, query);
             return rpcSuccess(value);

package/lib/types/topic-storage.d.ts

@@ -1,8 +1,9 @@
 import type { SessionHeader } from '@deepseek-ai/dsh-session';
 export interface SessionArtifactLocator {
-    locate(meta: SessionHeader): {
+    locate?(meta: SessionHeader): {
         readonly path: string;
     } | undefined;
+    root?: string;
 }
 /**
  * Resolve verifier sidecars beneath the persistence backend's per-session

package/lib/types/topic-storage.js

@@ -10,12 +10,21 @@ function escapes(root, target) {
  * together with the conversation log.
  */
 export function resolveTopicDataDir(locator, header, cacheDir) {
-    const location = locator.locate(header);
-    if (location === undefined)
-        throw new Error('llm-verifier: the active session persistence backend does not expose a per-session artifact directory');
     if (isAbsolute(cacheDir))
         throw new Error('llm-verifier: cacheDir must be relative so verifier data stays inside its topic directory');
-    const topicDir = dirname(location.path);
+    let topicDir;
+    if (typeof locator?.locate === 'function') {
+        const location = locator.locate(header);
+        if (location && typeof location.path === 'string') {
+            topicDir = dirname(location.path);
+        }
+    }
+    if (!topicDir && typeof locator?.root === 'string' && header?.id) {
+        topicDir = resolve(locator.root, String(header.id));
+    }
+    if (topicDir === undefined) {
+        throw new Error('llm-verifier: the active session persistence backend does not expose a per-session artifact directory');
+    }
     const target = resolve(topicDir, cacheDir);
     if (escapes(topicDir, target))
         throw new Error('llm-verifier: cacheDir must stay inside the topic directory');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-llm-verifier",
-  "version": "0.1.10",
+  "version": "0.1.13",
   "description": "Configurable DSH-native LLM verifier with a Web settings page",
   "repository": {
     "type": "git",
@@ -60,14 +60,14 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1 || ^4.0.2",
-    "@deepseek-ai/dsh-tools": "^0.1.1-rc.2 || ^0.1.2-alpha.1 || ^0.1.2-alpha.2",
-    "@deepseek-ai/dsh-agent": "^0.1.1-rc.2 || ^0.1.2-alpha.1 || ^0.1.2-alpha.2",
-    "@deepseek-ai/dsh-session": "^0.1.1-rc.2 || ^0.1.2-alpha.1 || ^0.1.2-alpha.2",
-    "@deepseek-ai/dsh-llm": "^0.1.1-rc.2 || ^0.1.2-alpha.1 || ^0.1.2-alpha.2",
-    "@deepseek-ai/dsh-attachment": "^0.1.1-rc.2 || ^0.1.2-alpha.1 || ^0.1.2-alpha.2",
-    "@deepseek-ai/dsh-settings": "^0.1.1-rc.2 || ^0.1.2-alpha.1 || ^0.1.2-alpha.2",
-    "@deepseek-ai/dsh-credentials": "^0.1.1-rc.2 || ^0.1.2-alpha.1 || ^0.1.2-alpha.2",
-    "@deepseek-ai/dsh-client-connection": "^0.1.1-rc.2 || ^0.1.2-alpha.1 || ^0.1.2-alpha.2"
+    "@deepseek-ai/dsh-tools": "^0.1.1-rc.2 || ^0.1.2-alpha.1 || ^0.1.2-alpha.2 || ^0.1.2-alpha.3 || ^0.1.2-alpha.4 || ^0.1.2-alpha.5 || ^0.1.2-rc.1 || ~0.1.2",
+    "@deepseek-ai/dsh-agent": "^0.1.1-rc.2 || ^0.1.2-alpha.1 || ^0.1.2-alpha.2 || ^0.1.2-alpha.3 || ^0.1.2-alpha.4 || ^0.1.2-alpha.5 || ^0.1.2-rc.1 || ~0.1.2",
+    "@deepseek-ai/dsh-session": "^0.1.1-rc.2 || ^0.1.2-alpha.1 || ^0.1.2-alpha.2 || ^0.1.2-alpha.3 || ^0.1.2-alpha.4 || ^0.1.2-alpha.5 || ^0.1.2-rc.1 || ~0.1.2",
+    "@deepseek-ai/dsh-llm": "^0.1.1-rc.2 || ^0.1.2-alpha.1 || ^0.1.2-alpha.2 || ^0.1.2-alpha.3 || ^0.1.2-alpha.4 || ^0.1.2-alpha.5 || ^0.1.2-rc.1 || ~0.1.2",
+    "@deepseek-ai/dsh-attachment": "^0.1.1-rc.2 || ^0.1.2-alpha.1 || ^0.1.2-alpha.2 || ^0.1.2-alpha.3 || ^0.1.2-alpha.4 || ^0.1.2-alpha.5 || ^0.1.2-rc.1 || ~0.1.2",
+    "@deepseek-ai/dsh-settings": "^0.1.1-rc.2 || ^0.1.2-alpha.1 || ^0.1.2-alpha.2 || ^0.1.2-alpha.3 || ^0.1.2-alpha.4 || ^0.1.2-alpha.5 || ^0.1.2-rc.1 || ~0.1.2",
+    "@deepseek-ai/dsh-credentials": "^0.1.1-rc.2 || ^0.1.2-alpha.1 || ^0.1.2-alpha.2 || ^0.1.2-alpha.3 || ^0.1.2-alpha.4 || ^0.1.2-alpha.5 || ^0.1.2-rc.1 || ~0.1.2",
+    "@deepseek-ai/dsh-client-connection": "^0.1.1-rc.2 || ^0.1.2-alpha.1 || ^0.1.2-alpha.2 || ^0.1.2-alpha.3 || ^0.1.2-alpha.4 || ^0.1.2-alpha.5 || ^0.1.2-rc.1 || ~0.1.2"
   },
   "dependencies": {
     "schemastery": "^3.18.0"

package/src/client.tsx

@@ -26,7 +26,7 @@ interface VerifierRemote {
   session: {
     modelCatalog(): Promise<{
       ok: boolean
-      value: { groups: readonly ModelProviderGroup[]; failures: readonly { provider: string; message: string }[] }
+      value: { groups: readonly ModelProviderGroup[]; failures: readonly { id?: string; provider?: string; name?: string; message: string }[] }
       error: { message: string }
     }>
   }
@@ -81,7 +81,7 @@ export function VerifierSettings({ remote }: VerifierSettingsProps) {
   const lang = useLanguage()
   const t = dictionaries[lang]
   const [loaded,setLoaded]=useState<Loaded|null>(null); const [draft,setDraft]=useState<Values|null>(null); const [busy,setBusy]=useState(false); const [error,setError]=useState<string|null>(null); const [saved,setSaved]=useState(false)
-  const load=async()=>{setError(null);try{const [m,s]=await Promise.all([remote.session.modelCatalog(),remote.settings.describe()]);if(!m.ok)throw new Error(m.error.message);if(!s.ok)throw new Error(s.error.message);const view=s.value.namespaces.find((x:SettingsNamespaceView)=>x.ns===NS);if(!view)throw new Error(t['settings.nsUnregistered']);const next={groups:m.value.groups,settings:view,writable:s.value.writable,failures:m.value.failures.map((f: { provider: string; message: string })=>f.provider+': '+f.message)};setLoaded(next);setDraft(values(view))}catch(e){setError(message(e))}}
+  const load=async()=>{setError(null);try{const [m,s]=await Promise.all([remote.session.modelCatalog(),remote.settings.describe()]);if(!m.ok)throw new Error(m.error.message);if(!s.ok)throw new Error(s.error.message);const view=s.value.namespaces.find((x:SettingsNamespaceView)=>x.ns===NS);if(!view)throw new Error(t['settings.nsUnregistered']);const next={groups:m.value.groups,settings:view,writable:s.value.writable,failures:m.value.failures.map((f: { id?: string; provider?: string; name?: string; message: string })=>(f.id??f.provider??f.name??'unknown')+': '+f.message)};setLoaded(next);setDraft(values(view))}catch(e){setError(message(e))}}
   useEffect(()=>{void load()},[])
   const models=useMemo(()=>loaded?.groups.find(g=>g.id===draft?.provider)?.models??[],[loaded,draft?.provider])
   const selected=models.find(m=>m.id===draft?.model); const efforts=selected?.reasoning?.efforts??[]

package/src/index.ts

@@ -44,7 +44,7 @@ interface SessionVerificationOptions { fromSeq?: number; toSeq?: number; include
 interface SessionVerificationResult { sessionId: string; problem: string; score: number; baselineScore: number; winner: 'A' | 'B' | 'tie'; fromSeq: number; toSeq: number; omittedCharacters: number; calls: number; stats: RunStats }
 
 export function apply(ctx: Context, config: Config = {}): void {
-  const services = ctx as Context & { attachments: AttachmentStore; connection: HostConnectionHandle; sessionPersistence: SessionArtifactLocator & { list(signal?: AbortSignal): Promise<SessionHeader[]> } }
+  const services = ctx as Context & { attachments: AttachmentStore; connection: HostConnectionHandle; sessionPersistence: SessionArtifactLocator & { list(signal?: AbortSignal): Promise<readonly unknown[]> } }
   const entry = resolveConfig(config)
   let limiter = new RequestLimiter(entry.maxConcurrency)
   const current = installVerifierSettings(ctx, entry, () => { limiter = new RequestLimiter(current().maxConcurrency) })
@@ -128,7 +128,10 @@ export function apply(ctx: Context, config: Config = {}): void {
     const sessionId = typeof row.sessionId === 'string' && row.sessionId.length > 0 ? row.sessionId : undefined
     const query: StatisticsQuery = { fromMs: numberField(row.fromMs, Number.NaN), toMs: numberField(row.toMs, Number.NaN), timezoneOffsetMinutes: numberField(row.timezoneOffsetMinutes, 0), recentLimit: numberField(row.recentLimit, 40), ...(sessionId ? { sessionId } : {}) }
     try {
-      const headers = (await services.sessionPersistence.list()).filter(header => sessionId === undefined || String(header.id) === sessionId)
+      const items = await services.sessionPersistence.list()
+      const headers: SessionHeader[] = items
+        .map(item => item && typeof item === 'object' && 'header' in item ? (item as { header: SessionHeader }).header : item as SessionHeader)
+        .filter(header => header !== undefined && (sessionId === undefined || String(header.id) === sessionId))
       const overviews = await Promise.all(headers.map(header => topic(header).statistics.overview(query)))
       const value: StatisticsOverview = mergeStatisticsOverviews(overviews, query)
       return rpcSuccess(value)

package/src/statistics.test.ts

@@ -65,4 +65,16 @@ describe('StatisticsStore', () => {
     const result = await store.overview({ fromMs: 0, toMs: 10 })
     expect(result.recent[0]?.errorMessage).toHaveLength(500)
   })
+
+  it('normalizes legacy and modern sessionPersistence.list output formats', () => {
+    const legacyHeaders = [{ id: 'sess-1', cwd: 'C:\\test' }]
+    const modernSnapshots = [{ header: { id: 'sess-2', cwd: 'C:\\test' }, revision: 'rev-1' }]
+    const normalize = (items: readonly unknown[]) =>
+      items
+        .map(item => item && typeof item === 'object' && 'header' in item ? (item as { header: { id: string } }).header : item as { id: string })
+        .filter(header => header !== undefined)
+
+    expect(normalize(legacyHeaders).map(h => h.id)).toEqual(['sess-1'])
+    expect(normalize(modernSnapshots).map(h => h.id)).toEqual(['sess-2'])
+  })
 })

package/src/topic-storage.test.ts

@@ -20,5 +20,12 @@ describe('resolveTopicDataDir', () => {
 
   it('fails closed when the backend cannot locate a topic artifact', () => {
     expect(() => resolveTopicDataDir({ locate: () => undefined }, header, 'verifier')).toThrow(/does not expose/u)
+    expect(() => resolveTopicDataDir({}, header, 'verifier')).toThrow(/does not expose/u)
+  })
+
+  it('falls back to root-based path when locate is missing', () => {
+    const result = resolveTopicDataDir({ root: 'C:\\data\\sessions' }, header, 'verifier')
+    expect(result).toBe(join('C:\\data\\sessions', 'session-test', 'verifier'))
   })
 })
+

package/src/topic-storage.ts

@@ -2,7 +2,8 @@ import { dirname, isAbsolute, relative, resolve } from 'node:path'
 import type { SessionHeader } from '@deepseek-ai/dsh-session'
 
 export interface SessionArtifactLocator {
-  locate(meta: SessionHeader): { readonly path: string } | undefined
+  locate?(meta: SessionHeader): { readonly path: string } | undefined
+  root?: string
 }
 
 function escapes(root: string, target: string): boolean {
@@ -17,10 +18,24 @@ function escapes(root: string, target: string): boolean {
  * together with the conversation log.
  */
 export function resolveTopicDataDir(locator: SessionArtifactLocator, header: SessionHeader, cacheDir: string): string {
-  const location = locator.locate(header)
-  if (location === undefined) throw new Error('llm-verifier: the active session persistence backend does not expose a per-session artifact directory')
   if (isAbsolute(cacheDir)) throw new Error('llm-verifier: cacheDir must be relative so verifier data stays inside its topic directory')
-  const topicDir = dirname(location.path)
+
+  let topicDir: string | undefined
+  if (typeof locator?.locate === 'function') {
+    const location = locator.locate(header)
+    if (location && typeof location.path === 'string') {
+      topicDir = dirname(location.path)
+    }
+  }
+
+  if (!topicDir && typeof locator?.root === 'string' && header?.id) {
+    topicDir = resolve(locator.root, String(header.id))
+  }
+
+  if (topicDir === undefined) {
+    throw new Error('llm-verifier: the active session persistence backend does not expose a per-session artifact directory')
+  }
+
   const target = resolve(topicDir, cacheDir)
   if (escapes(topicDir, target)) throw new Error('llm-verifier: cacheDir must stay inside the topic directory')
   return target