@yadsh/dsh-kv-persist 0.2.0 → 0.2.2

package/lib/service.js

@@ -11,8 +11,9 @@
  * reference plugins follow.
  */
 import { mkdir, rm, writeFile } from "node:fs/promises";
-import { join } from "node:path";
+import { join, resolve } from "node:path";
 import { Context, Service } from "@deepseek-ai/cordis";
+import { resolveDshHome } from "@yadsh/dsh-plugin-log";
 import { KvPersistConfigSchema, resolveKvPersistConfig, isManagedProvider } from "./config.js";
 import { LlamaCppBackend } from "./backends/llama-cpp/backend.js";
 import { SingleSlotCoordinator } from "./coordinator/coordinator.js";
@@ -21,13 +22,13 @@ import { KvPersistMetrics } from "./observability/metrics.js";
 import { SnapshotRepository } from "./snapshots/repository.js";
 /**
  * Metadata root resolution (SPEC §39): explicit config path wins, otherwise
- * `<$DSH_HOME>/cache/dsh-kv-persist` (cwd fallback for dev/test).
+ * `<DSH home>/cache/dsh-kv-persist`, where DSH home is `$DSH_HOME` when
+ * non-blank and `~/.dsh` otherwise.
  */
-export function resolveMetadataDir(config) {
+export function resolveMetadataDir(config, env = process.env) {
     if (config.metadataPath !== null)
-        return config.metadataPath;
-    const dshHome = process.env.DSH_HOME?.trim() ?? "";
-    return join(dshHome.length > 0 ? dshHome : process.cwd(), "cache", "dsh-kv-persist");
+        return resolve(config.metadataPath);
+    return join(resolveDshHome(env), "cache", "dsh-kv-persist");
 }
 /**
  * Register a host event whose name lives in the host's session-service
@@ -200,16 +201,20 @@ export class KvPersistService extends Service {
      * `next()` is invoked exactly once, after preparation, inside the slot
      * lease; chunks pass through unchanged and unbuffered.
      */
-    async handleStream(options, next) {
+    handleStream(options, next) {
         if (!this.handles(options.provider))
             return next();
-        return this.coordinator.runSessionRequest({
-            sessionId: options.sessionId === undefined ? null : String(options.sessionId),
-            provider: options.provider,
-            model: options.model,
-            purpose: options.purpose,
-            next,
-        });
+        const coordinator = this.coordinator;
+        return (async function* () {
+            const stream = await coordinator.runSessionRequest({
+                sessionId: options.sessionId === undefined ? null : String(options.sessionId),
+                provider: options.provider,
+                model: options.model,
+                purpose: options.purpose,
+                next,
+            });
+            yield* stream;
+        })();
     }
     async checkMetadataWritable() {
         const dir = resolveMetadataDir(this.config);

package/lib/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yadsh/dsh-kv-persist",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Persistent KV-cache/session-state manager for DeepSeek Harness (llama.cpp slot snapshots)",
   "keywords": [
     "deepseek",
@@ -68,14 +68,14 @@
     "@yadsh/dsh-config": "^0.0.0"
   },
   "dependencies": {
-    "pino": "^10.3.1"
+    "@yadsh/dsh-plugin-log": "^0.2.1"
   },
   "scripts": {
     "build": "tsc -p tsconfig.build.json",
-    "lint": "eslint src test",
+    "lint": "eslint src tests",
     "typecheck": "tsc -p tsconfig.json --noEmit",
     "test": "vitest run",
-    "test:llama": "vitest run test/integration/llama-server.test.ts",
+    "test:llama": "vitest run tests/integration/llama-server.test.ts",
     "verify:package": "node scripts/verify-package.mjs",
     "verify": "npm run verify:package",
     "check": "npm run typecheck && npm test && npm run build && npm run verify"

package/lib/logging/dsh-home.d.ts

@@ -1,13 +0,0 @@
-/**
- * DSH home resolution for plugin runtime helpers.
- *
- * Part of the future `@yadsh/dsh-plugin-log` package seed: this folder is a
- * verbatim, self-contained copy in every adopting plugin (guidelines §5.2),
- * so keep it free of imports outside `./`.
- */
-/**
- * Resolve the DSH home directory: `$DSH_HOME` when set to a non-blank value,
- * otherwise `~/.dsh` (the same convention as `dsh-draft-sessions` storage).
- */
-export declare function resolveDshHome(env?: NodeJS.ProcessEnv): string;
-//# sourceMappingURL=dsh-home.d.ts.map

package/lib/logging/dsh-home.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"dsh-home.d.ts","sourceRoot":"","sources":["../../src/logging/dsh-home.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH;;;GAGG;AACH,wBAAgB,cAAc,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAG3E"}

package/lib/logging/dsh-home.js

@@ -1,18 +0,0 @@
-/**
- * DSH home resolution for plugin runtime helpers.
- *
- * Part of the future `@yadsh/dsh-plugin-log` package seed: this folder is a
- * verbatim, self-contained copy in every adopting plugin (guidelines §5.2),
- * so keep it free of imports outside `./`.
- */
-import { homedir } from "node:os";
-import { join, resolve } from "node:path";
-/**
- * Resolve the DSH home directory: `$DSH_HOME` when set to a non-blank value,
- * otherwise `~/.dsh` (the same convention as `dsh-draft-sessions` storage).
- */
-export function resolveDshHome(env = process.env) {
-    const configured = env.DSH_HOME?.trim();
-    return configured ? resolve(configured) : join(homedir(), ".dsh");
-}
-//# sourceMappingURL=dsh-home.js.map

package/lib/logging/dsh-home.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"dsh-home.js","sourceRoot":"","sources":["../../src/logging/dsh-home.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE1C;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,MAAyB,OAAO,CAAC,GAAG;IACjE,MAAM,UAAU,GAAG,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC;IACxC,OAAO,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;AACpE,CAAC"}

package/lib/logging/index.d.ts

@@ -1,10 +0,0 @@
-/**
- * Plugin logging bundle (future `@yadsh/dsh-plugin-log`).
- *
- * Self-contained by design: every import stays inside this folder so the
- * whole directory can be copied between plugins verbatim, or replaced by the
- * extracted package import once it exists.
- */
-export * from "./dsh-home.js";
-export * from "./plugin-logger.js";
-//# sourceMappingURL=index.d.ts.map

package/lib/logging/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/logging/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC"}

package/lib/logging/index.js

@@ -1,10 +0,0 @@
-/**
- * Plugin logging bundle (future `@yadsh/dsh-plugin-log`).
- *
- * Self-contained by design: every import stays inside this folder so the
- * whole directory can be copied between plugins verbatim, or replaced by the
- * extracted package import once it exists.
- */
-export * from "./dsh-home.js";
-export * from "./plugin-logger.js";
-//# sourceMappingURL=index.js.map

package/lib/logging/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/logging/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC"}

package/lib/logging/plugin-logger.d.ts

@@ -1,94 +0,0 @@
-/**
- * Plugin file logger — the seed of the future `@yadsh/dsh-plugin-log` package.
- *
- * Every plugin currently carries its own verbatim copy of `src/logging/`
- * (guidelines §5.2); the exported API below is frozen so that switching to
- * the extracted package later is a one-line import change. The wrapper:
- *
- * - wraps `pino` for severity levels and NDJSON serialization;
- * - writes daily files `<dir>/<YYYY-MM-DD>.log`, by default under
- *   `<$DSH_HOME>/logs/<pluginId>`;
- * - mirrors selected records to an injectable console sink (default level
- *   `warn`) so operators still see problems live;
- * - never throws at runtime: file-system failures degrade to console-only
- *   logging (fail-open), and closed loggers silently drop records;
- * - disables file output when `DSH_LOG_DISABLED=1`, and under `NODE_ENV=test`
- *   unless `dir` is set explicitly (unit tests never touch a real home).
- *
- * Record shape (one JSON object per line): pino's `level` (numeric),
- * `time` (epoch ms) and `msg` (= the event code), plus `plugin` and the
- * caller's fields; `child(module)` adds `module`. Reserved pino keys
- * (`level`, `time`, `msg`, `plugin`, `module`) must not be used as field
- * names.
- */
-/** Ordered severity levels; `silent` disables the logger entirely. */
-export declare const PLUGIN_LOG_LEVELS: readonly ["trace", "debug", "info", "warn", "error", "fatal", "silent"];
-export type PluginLogLevel = (typeof PLUGIN_LOG_LEVELS)[number];
-/** Every level except `silent` (which also disables the console mirror). */
-export type ConsoleLevel = Exclude<PluginLogLevel, "silent">;
-/**
- * Receives console-mirrored records. Must not throw; the wrapper guards every
- * call regardless.
- */
-export type PluginConsoleSink = (level: ConsoleLevel, message: string) => void;
-/** Default console mirror threshold. */
-export declare const DEFAULT_CONSOLE_LEVEL: PluginLogLevel;
-/** Daily log files kept per plugin by default (0 = keep forever). */
-export declare const DEFAULT_LOG_RETENTION_DAYS = 14;
-/** Type guard for level strings (config parsing, env overrides). */
-export declare function isPluginLogLevel(value: unknown): value is PluginLogLevel;
-/** Logger configuration; every field except `pluginId` is optional. */
-export interface PluginLoggerOptions {
-    /**
-     * Plugin id: directory name, `plugin` record field and env-prefix source
-     * (`DSH_LOG_LEVEL_<ID>`). Must match `[A-Za-z0-9][A-Za-z0-9._-]*`.
-     */
-    readonly pluginId: string;
-    /** Severity threshold. Default: `DSH_LOG_LEVEL_<ID>` / `DSH_LOG_LEVEL` env, else `info`. */
-    readonly level?: PluginLogLevel;
-    /** Absolute log directory. Default: `<$DSH_HOME>/logs/<pluginId>`. */
-    readonly dir?: string;
-    /** Overrides the DSH home used to build the default `dir` (tests). */
-    readonly dshHome?: string;
-    /** Console mirror threshold; `silent` disables mirroring. Default: `warn`. */
-    readonly console?: PluginLogLevel;
-    /** Mirror target. Default: the global `console`. */
-    readonly consoleSink?: PluginConsoleSink;
-    /** Daily files older than this are deleted on rollover. Default: 14; 0 disables. */
-    readonly retentionDays?: number;
-    /** Master switch for file output. Default: auto (see the module docs). */
-    readonly file?: boolean;
-    /** Record fields to redact (pino `redact` paths), e.g. `["apiKey"]`. */
-    readonly redact?: readonly string[];
-    /** Clock for file naming, rollover and retention (tests). */
-    readonly now?: () => number;
-}
-/** Stable logging surface shared by every plugin (future package contract). */
-export interface PluginLogger {
-    trace(event: string, fields?: Record<string, unknown>): void;
-    debug(event: string, fields?: Record<string, unknown>): void;
-    info(event: string, fields?: Record<string, unknown>): void;
-    warn(event: string, fields?: Record<string, unknown>): void;
-    error(event: string, fields?: Record<string, unknown>): void;
-    fatal(event: string, fields?: Record<string, unknown>): void;
-    /** Bound sub-logger that adds a `module` field to every record. */
-    child(module: string): PluginLogger;
-    /** Current severity threshold. */
-    get level(): PluginLogLevel;
-    /** Change the severity threshold at runtime. */
-    setLevel(level: PluginLogLevel): void;
-    /** Best-effort synchronous flush of buffered file output. */
-    flush(): void;
-    /** Flush and close the destination; idempotent; later writes are dropped. */
-    close(): Promise<void>;
-}
-/** Create a standalone logger instance (no caching). */
-export declare function createPluginLogger(options: PluginLoggerOptions): PluginLogger;
-/**
- * Create or return the cached logger for `pluginId` + resolved `dir`. A later
- * call with an explicit `level` updates the cached instance's threshold, so
- * plugin config reloads take effect. `close()` evicts the cache entry; the
- * next call creates a fresh instance.
- */
-export declare function getPluginLogger(options: PluginLoggerOptions): PluginLogger;
-//# sourceMappingURL=plugin-logger.d.ts.map

package/lib/logging/plugin-logger.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"plugin-logger.d.ts","sourceRoot":"","sources":["../../src/logging/plugin-logger.ts"],"names":[],"mappings":"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"}