negotium 0.1.11 → 0.1.13

package/dist/runtime/src/storage/storage-contract.ts

@@ -0,0 +1,54 @@
+export interface StorageStatement<Result = unknown, _Params = unknown> {
+  get(...params: any[]): Result | null | undefined;
+  all(...params: any[]): Result[];
+  run(...params: any[]): any;
+}
+
+export interface StorageTransaction<Args extends unknown[], Result> {
+  (...args: Args): Result;
+  deferred: (...args: Args) => Result;
+  immediate: (...args: Args) => Result;
+  exclusive: (...args: Args) => Result;
+}
+
+/** Structural SQLite surface supported by Bun and Negotium's Node shim. */
+export interface StorageDatabase {
+  query<Result = unknown, Params = unknown>(sql: string): StorageStatement<Result, Params>;
+  prepare<Result = unknown, Params = unknown>(sql: string): StorageStatement<Result, Params>;
+  exec(sql: string): void;
+  run(sql: string, ...params: any[]): any;
+  transaction<Args extends unknown[], Result>(
+    fn: (...args: Args) => Result,
+  ): StorageTransaction<Args, Result>;
+}
+
+/** Broad structural input accepted from Bun, Node, or a host-provided adapter. */
+export interface StorageDatabaseAdapter {
+  query(...args: any[]): any;
+  prepare(...args: any[]): any;
+  exec(sql: string): void;
+  run(sql: string, ...params: any[]): any;
+  transaction(...args: any[]): any;
+}
+
+export type StorageDatabaseInput = StorageDatabase | StorageDatabaseAdapter;
+
+export interface StorageHostConfig {
+  /** Borrowed SQLite connection. Negotium never closes an injected database. */
+  database?: StorageDatabaseInput;
+  /** Persistent JSON/JSONL state root. */
+  dataDir?: string;
+  /** Activity and token-usage log root. */
+  logDir?: string;
+  /** Durable ask edge root. Defaults to Negotium's runtime ask directory. */
+  sessionAsksDir?: string;
+  /** Shared topic workspace root used by wiki/archive helpers. */
+  workspaceDir?: string;
+  /** Shared wiki root. Defaults to `<workspaceDir>/wiki`. */
+  sharedWikiDir?: string;
+  /** Per-user sent-file log root. Defaults to `<dataDir>/users`. */
+  usersLogDir?: string;
+}
+
+/** Compatibility name retained for 0.1.11 consumers. */
+export type StorageHostOptions = StorageHostConfig;

package/dist/runtime/src/storage/storage-host.ts

@@ -2,34 +2,40 @@ import { mkdirSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join, resolve } from "node:path";
 import { Database } from "#storage/sqlite";
+import type { StorageDatabase, StorageHostConfig } from "#storage/storage-contract";
 
-export type StorageDatabase = InstanceType<typeof Database>;
+export type {
+  StorageDatabase,
+  StorageDatabaseAdapter,
+  StorageDatabaseInput,
+  StorageHostConfig,
+  StorageHostOptions,
+  StorageStatement,
+  StorageTransaction,
+} from "#storage/storage-contract";
 
-export interface StorageHostOptions {
-  /** Borrowed SQLite connection. Negotium never closes an injected database. */
-  database?: StorageDatabase;
-  /** Persistent JSON/JSONL state root. */
-  dataDir?: string;
-  /** Activity and token-usage log root. */
-  logDir?: string;
-  /** Durable ask edge root. Defaults to Negotium's runtime ask directory. */
-  sessionAsksDir?: string;
-  /** Shared topic workspace root used by wiki/archive helpers. */
-  workspaceDir?: string;
+let configuredHost: Readonly<StorageHostConfig> = {};
+type InternalStorageDatabase = InstanceType<typeof Database>;
+type OwnedStorageDatabase = InternalStorageDatabase & { close(): void };
+let fallbackDatabase: OwnedStorageDatabase | null = null;
+let fallbackDatabasePath: string | null = null;
+
+interface StorageHostFrame {
+  active: boolean;
+  patch: Readonly<StorageHostConfig>;
 }
 
-let configuredHost: Readonly<StorageHostOptions> = {};
-let fallbackDatabase: StorageDatabase | null = null;
+const storageHostFrames: StorageHostFrame[] = [];
 
-type StorageSchemaInitializer = (database: StorageDatabase) => void;
+type StorageSchemaInitializer = (database: InternalStorageDatabase) => void;
 interface RegisteredSchemaInitializer {
   initialize: StorageSchemaInitializer;
   priority: number;
 }
 
 const schemaInitializers: RegisteredSchemaInitializer[] = [];
-const initializedSchemas = new WeakMap<StorageDatabase, Set<StorageSchemaInitializer>>();
-const initializingDatabases = new WeakSet<StorageDatabase>();
+const initializedSchemas = new WeakMap<InternalStorageDatabase, Set<StorageSchemaInitializer>>();
+const initializingDatabases = new WeakSet<InternalStorageDatabase>();
 
 function envPath(name: string, fallback: string): string {
   const value = process.env[name]?.trim();
@@ -58,10 +64,10 @@ function defaultSessionAsksDir(): string {
 }
 
 function defaultSessionsDatabasePath(): string {
-  return envPath("SESSIONS_DB_PATH", join(defaultDataDir(), "sessions.db"));
+  return envPath("SESSIONS_DB_PATH", join(resolveStorageDataDir(), "sessions.db"));
 }
 
-function initializeDatabase(database: StorageDatabase): void {
+function initializeDatabase(database: InternalStorageDatabase): void {
   database.exec("PRAGMA journal_mode = WAL");
   database.exec("PRAGMA foreign_keys = ON");
   database.exec("PRAGMA busy_timeout = 5000");
@@ -73,17 +79,19 @@ function initializeDatabase(database: StorageDatabase): void {
   }
 }
 
-function defaultDatabase(): StorageDatabase {
-  if (fallbackDatabase) return fallbackDatabase;
+function defaultDatabase(): InternalStorageDatabase {
   const path = defaultSessionsDatabasePath();
+  if (fallbackDatabase && fallbackDatabasePath === path) return fallbackDatabase;
+  if (fallbackDatabase) fallbackDatabase.close();
   mkdirSync(dirname(path), { recursive: true });
-  fallbackDatabase = new Database(path, { create: true });
+  fallbackDatabase = new Database(path, { create: true }) as unknown as OwnedStorageDatabase;
+  fallbackDatabasePath = path;
   initializeDatabase(fallbackDatabase);
   return fallbackDatabase;
 }
 
-export function resolveStorageDatabase(): StorageDatabase {
-  return configuredHost.database ?? defaultDatabase();
+export function resolveStorageDatabase(): InternalStorageDatabase {
+  return (configuredHost.database ?? defaultDatabase()) as InternalStorageDatabase;
 }
 
 export function resolveStorageDataDir(): string {
@@ -103,11 +111,41 @@ export function resolveStorageWorkspaceDir(): string {
 }
 
 export function resolveStorageSharedWikiDir(): string {
-  return join(resolveStorageWorkspaceDir(), "wiki");
+  return configuredHost.sharedWikiDir ?? join(resolveStorageWorkspaceDir(), "wiki");
 }
 
 export function resolveStorageUsersLogDir(): string {
-  return join(resolveStorageDataDir(), "users");
+  return configuredHost.usersLogDir ?? join(resolveStorageDataDir(), "users");
+}
+
+const STORAGE_PATH_KEYS = [
+  "dataDir",
+  "logDir",
+  "sessionAsksDir",
+  "workspaceDir",
+  "sharedWikiDir",
+  "usersLogDir",
+] as const;
+
+function normalizeStorageHostPatch(options: StorageHostConfig): Readonly<StorageHostConfig> {
+  const patch: StorageHostConfig = {};
+  if (options.database !== undefined) patch.database = options.database;
+  for (const key of STORAGE_PATH_KEYS) {
+    const value = options[key];
+    if (value === undefined) continue;
+    if (!value.trim()) throw new TypeError(`${key} must not be empty`);
+    patch[key] = resolve(value);
+  }
+  return Object.freeze(patch);
+}
+
+function refreshConfiguredHost(): void {
+  configuredHost = Object.freeze(
+    Object.assign(
+      {},
+      ...storageHostFrames.filter((frame) => frame.active).map((frame) => frame.patch),
+    ),
+  );
 }
 
 /**
@@ -117,22 +155,32 @@ export function resolveStorageUsersLogDir(): string {
  * touches a filesystem path. The returned disposer restores the exact prior
  * host, which keeps tests and nested embeddings isolated.
  */
-export function configureStorageHost(options: StorageHostOptions): () => void {
-  const previous = configuredHost;
-  configuredHost = Object.freeze({ ...previous, ...options });
-  let restored = false;
+export function configureStorageHost(options: StorageHostConfig): () => void {
+  const frame: StorageHostFrame = { active: true, patch: normalizeStorageHostPatch(options) };
+  storageHostFrames.push(frame);
+  refreshConfiguredHost();
   return () => {
-    if (restored) return;
-    restored = true;
-    configuredHost = previous;
+    if (!frame.active) return;
+    frame.active = false;
+    const index = storageHostFrames.indexOf(frame);
+    if (index >= 0) storageHostFrames.splice(index, 1);
+    refreshConfiguredHost();
   };
 }
 
+/** Remove every configured host layer and restore standalone fallbacks. */
+export function resetStorageHost(): void {
+  for (const frame of storageHostFrames) frame.active = false;
+  storageHostFrames.length = 0;
+  refreshConfiguredHost();
+}
+
 /** Close only Negotium's fallback connection. Injected connections are borrowed. */
 export function closeStorageDatabase(): void {
-  if (configuredHost.database || !fallbackDatabase) return;
+  if (!fallbackDatabase) return;
   fallbackDatabase.close();
   fallbackDatabase = null;
+  fallbackDatabasePath = null;
 }
 
 export function registerStorageSchemaInitializer(
@@ -143,7 +191,9 @@ export function registerStorageSchemaInitializer(
   schemaInitializers.sort((a, b) => a.priority - b.priority);
 }
 
-export function ensureStorageSchemas(database = resolveStorageDatabase()): void {
+export function ensureStorageSchemas(
+  database: InternalStorageDatabase = resolveStorageDatabase(),
+): void {
   if (initializingDatabases.has(database)) return;
   let initialized = initializedSchemas.get(database);
   if (!initialized) {
@@ -170,7 +220,7 @@ export function ensureStorageSchemas(database = resolveStorageDatabase()): void
 }
 
 /** Stable proxy identity used by legacy imports and embedding hosts. */
-export const storageDatabase = new Proxy({} as StorageDatabase, {
+export const internalStorageDatabase = new Proxy({} as InternalStorageDatabase, {
   get(_target, property) {
     const database = resolveStorageDatabase();
     ensureStorageSchemas(database);
@@ -183,3 +233,6 @@ export const storageDatabase = new Proxy({} as StorageDatabase, {
     return Reflect.set(database as object, property, value, database);
   },
 });
+
+/** Structurally typed view intended for embedding hosts. */
+export const storageDatabase = internalStorageDatabase as unknown as StorageDatabase;

package/dist/runtime/src/storage/storage-public-host.ts

@@ -0,0 +1,16 @@
+import type { StorageDatabase, StorageHostConfig } from "#storage/storage-contract";
+import {
+  configureStorageHost as configureInternalStorageHost,
+  resetStorageHost as resetInternalStorageHost,
+  storageDatabase,
+} from "#storage/storage-host";
+
+/** Configure the lazy process-local storage boundary and return an idempotent disposer. */
+export const configureStorageHost: (options: StorageHostConfig) => () => void =
+  configureInternalStorageHost;
+
+/** Remove every configured host layer and restore standalone fallbacks. */
+export const resetStorageHost: () => void = resetInternalStorageHost;
+
+/** Stable structurally typed proxy over the currently active database. */
+export const db: StorageDatabase = storageDatabase;

package/dist/runtime/src/storage/storage-public.ts

@@ -57,11 +57,16 @@ export {
 } from "#storage/forum/index";
 export * as sessionAsks from "#storage/session-asks";
 export * from "#storage/session-asks";
-export type { StorageDatabase, StorageHostOptions } from "#storage/storage-host";
-export {
-  configureStorageHost,
-  storageDatabase as db,
-} from "#storage/storage-host";
+export type {
+  StorageDatabase,
+  StorageDatabaseAdapter,
+  StorageDatabaseInput,
+  StorageHostConfig,
+  StorageHostOptions,
+  StorageStatement,
+  StorageTransaction,
+} from "#storage/storage-contract";
+export { configureStorageHost, db, resetStorageHost } from "#storage/storage-public-host";
 export * as tasks from "#storage/tasks";
 export * from "#storage/tasks";
 export * as tokenStats from "#storage/token-stats";
@@ -78,3 +83,14 @@ export * as wiki from "#storage/wiki";
 export * from "#storage/wiki";
 export * as wikiSummaryNames from "#storage/wiki-summary-names";
 export * from "#storage/wiki-summary-names";
+export type { AgentKind, EffortLevel } from "#types";
+export type {
+  AiMode,
+  MessageDto,
+  ParticipantDto,
+  ResponsePolicy,
+  TopicAccessMode,
+  TopicDto,
+  TopicKind,
+  TopicVisibility,
+} from "#types/api";

package/dist/runtime/src/storage/token-stats.ts

@@ -36,7 +36,7 @@ export function tokenStatsFileId(userId: number | string): string {
   const rawUserId = String(userId);
   // Preserve existing filenames for ordinary IDs, but never let an external
   // identity introduce path separators or unbounded filename length.
-  return /^[A-Za-z0-9][A-Za-z0-9_.@-]{0,255}$/.test(rawUserId)
+  return /^[A-Za-z0-9][A-Za-z0-9_.@-]{0,255}$/.test(rawUserId) && !rawUserId.includes("..")
     ? rawUserId
     : `sha256-${createHash("sha256").update(rawUserId).digest("hex")}`;
 }

package/dist/runtime/src/types/api.ts

@@ -206,6 +206,8 @@ export interface MessageDto {
   authorAvatarUrl?: string | null;
   text: string;
   attachments?: AttachmentDto[];
+  /** Internal hint: an external channel may claim and acknowledge attachment delivery. */
+  deliveryAckRequested?: boolean;
   queryId?: string;
   agentType?: AgentKind;
   model?: string;

package/dist/runtime/src/types.ts

@@ -182,6 +182,8 @@ export interface AgentQueryOptions {
   autoContinue?: boolean;
   /** Expose Otium-only visual panel tools for this turn. Default-deny. */
   visualTools?: boolean;
+  /** Expose adapter-backed file-delivery tools for this turn. Default-deny. */
+  fileDeliveryTools?: boolean;
   abortController?: AbortController;
   model?: string;
   /** Provider-side hard budget when the selected SDK supports one. */

package/dist/runtime/src/version.ts

@@ -1 +1 @@
-export const NEGOTIUM_VERSION = "0.1.11";
+export const NEGOTIUM_VERSION = "0.1.13";

package/dist/runtime-helpers.js

@@ -212,7 +212,7 @@ var WHISPER_MODEL = envText("WHISPER_MODEL_FILE") ?? "turbo";
 var TESSERACT_BIN = envText("TESSERACT_BIN") ?? "tesseract";
 var PDFTOTEXT_BIN = envText("PDFTOTEXT_BIN") ?? "pdftotext";
 var _envMaxTellDepth = Number.parseInt(process.env.MAX_TELL_DEPTH ?? "", 10);
-var MAX_TELL_DEPTH = Number.isInteger(_envMaxTellDepth) && _envMaxTellDepth > 0 ? _envMaxTellDepth : 3;
+var MAX_TELL_DEPTH = Number.isInteger(_envMaxTellDepth) && _envMaxTellDepth > 0 ? _envMaxTellDepth : 20;
 
 // ../../packages/core/src/storage/storage-host.ts
 import { mkdirSync as mkdirSync2 } from "fs";
@@ -273,6 +273,7 @@ if (isBun) {
 // ../../packages/core/src/storage/storage-host.ts
 var configuredHost = {};
 var fallbackDatabase = null;
+var fallbackDatabasePath = null;
 var schemaInitializers = [];
 var initializedSchemas = new WeakMap;
 var initializingDatabases = new WeakSet;
@@ -287,7 +288,7 @@ function defaultDataDir() {
   return envPath("NEGOTIUM_DATA_DIR", join2(defaultStateDir(), "data"));
 }
 function defaultSessionsDatabasePath() {
-  return envPath("SESSIONS_DB_PATH", join2(defaultDataDir(), "sessions.db"));
+  return envPath("SESSIONS_DB_PATH", join2(resolveStorageDataDir(), "sessions.db"));
 }
 function initializeDatabase(database) {
   database.exec("PRAGMA journal_mode = WAL");
@@ -299,17 +300,23 @@ function initializeDatabase(database) {
   } catch {}
 }
 function defaultDatabase() {
-  if (fallbackDatabase)
-    return fallbackDatabase;
   const path = defaultSessionsDatabasePath();
+  if (fallbackDatabase && fallbackDatabasePath === path)
+    return fallbackDatabase;
+  if (fallbackDatabase)
+    fallbackDatabase.close();
   mkdirSync2(dirname2(path), { recursive: true });
   fallbackDatabase = new Database(path, { create: true });
+  fallbackDatabasePath = path;
   initializeDatabase(fallbackDatabase);
   return fallbackDatabase;
 }
 function resolveStorageDatabase() {
   return configuredHost.database ?? defaultDatabase();
 }
+function resolveStorageDataDir() {
+  return configuredHost.dataDir ?? defaultDataDir();
+}
 function registerStorageSchemaInitializer(initialize, priority = 100) {
   schemaInitializers.push({ initialize, priority });
   schemaInitializers.sort((a, b) => a.priority - b.priority);
@@ -339,7 +346,7 @@ function ensureStorageSchemas(database = resolveStorageDatabase()) {
     initializingDatabases.delete(database);
   }
 }
-var storageDatabase = new Proxy({}, {
+var internalStorageDatabase = new Proxy({}, {
   get(_target, property) {
     const database = resolveStorageDatabase();
     ensureStorageSchemas(database);
@@ -352,9 +359,13 @@ var storageDatabase = new Proxy({}, {
     return Reflect.set(database, property, value, database);
   }
 });
+
+// ../../packages/core/src/storage/forum-db.ts
+var db = internalStorageDatabase;
+
 // ../../packages/core/src/storage/api-messages.ts
 function initializeApiMessagesSchema() {
-  storageDatabase.exec(`
+  db.exec(`
   CREATE TABLE IF NOT EXISTS api_messages (
     id TEXT PRIMARY KEY,
     topic_id TEXT NOT NULL,
@@ -378,34 +389,34 @@ function initializeApiMessagesSchema() {
   )
 `);
   try {
-    storageDatabase.exec("ALTER TABLE api_messages ADD COLUMN source_adapter TEXT");
+    db.exec("ALTER TABLE api_messages ADD COLUMN source_adapter TEXT");
   } catch {}
   try {
-    storageDatabase.exec("ALTER TABLE api_messages ADD COLUMN deleted INTEGER NOT NULL DEFAULT 0");
+    db.exec("ALTER TABLE api_messages ADD COLUMN deleted INTEGER NOT NULL DEFAULT 0");
   } catch {}
   try {
-    storageDatabase.exec("ALTER TABLE api_messages ADD COLUMN edited_at TEXT");
+    db.exec("ALTER TABLE api_messages ADD COLUMN edited_at TEXT");
   } catch {}
   try {
-    storageDatabase.exec("ALTER TABLE api_messages ADD COLUMN reactions TEXT");
+    db.exec("ALTER TABLE api_messages ADD COLUMN reactions TEXT");
   } catch {}
   try {
-    storageDatabase.exec("ALTER TABLE api_messages ADD COLUMN kind TEXT");
+    db.exec("ALTER TABLE api_messages ADD COLUMN kind TEXT");
   } catch {}
   try {
-    storageDatabase.exec("ALTER TABLE api_messages ADD COLUMN ask_user_question TEXT");
+    db.exec("ALTER TABLE api_messages ADD COLUMN ask_user_question TEXT");
   } catch {}
   try {
-    storageDatabase.exec("ALTER TABLE api_messages ADD COLUMN mentions TEXT");
+    db.exec("ALTER TABLE api_messages ADD COLUMN mentions TEXT");
   } catch {}
   try {
-    storageDatabase.exec("ALTER TABLE api_messages ADD COLUMN thread_root_id TEXT");
+    db.exec("ALTER TABLE api_messages ADD COLUMN thread_root_id TEXT");
   } catch {}
   try {
-    storageDatabase.exec("ALTER TABLE api_messages ADD COLUMN subagent_card TEXT");
+    db.exec("ALTER TABLE api_messages ADD COLUMN subagent_card TEXT");
   } catch {}
-  storageDatabase.exec("CREATE INDEX IF NOT EXISTS idx_api_messages_topic ON api_messages(topic_id)");
-  storageDatabase.exec("CREATE INDEX IF NOT EXISTS idx_api_messages_thread_root ON api_messages(thread_root_id)");
+  db.exec("CREATE INDEX IF NOT EXISTS idx_api_messages_topic ON api_messages(topic_id)");
+  db.exec("CREATE INDEX IF NOT EXISTS idx_api_messages_thread_root ON api_messages(thread_root_id)");
 }
 registerStorageSchemaInitializer(initializeApiMessagesSchema, 30);
 var appendHooks = new Set;
@@ -537,4 +548,4 @@ export {
   MERMAID_BROWSER_ASSET_PATH
 };
 
-//# debugId=BE4405D4EC79C76A64756E2164756E21
+//# debugId=B54B49179ACB3E0164756E2164756E21