negotium 0.2.14 → 0.2.16

package/dist/types/packages/core/src/agents/rollout/codex.d.ts

@@ -38,6 +38,12 @@ export interface CodexContextUsage {
     contextTokens: number;
     contextWindow: number;
 }
+export interface CodexTokenTotals {
+    inputTokens: number;
+    outputTokens: number;
+    cachedInputTokens: number;
+    cacheWriteInputTokens: number;
+}
 export interface CodexPatchChangePreview {
     path: string;
     before?: string;
@@ -64,8 +70,11 @@ export declare function readCodexPatchCallIds(threadId: string): string[];
 export declare function readLatestCodexPatchPreview(threadId: string, expectedPaths: string[], consumedCallIds?: ReadonlySet<string>, expectedCallId?: string): CodexPatchPreview | undefined;
 /** Read the latest per-request context measurement from a Codex rollout. */
 export declare function extractLatestCodexContextUsage(jsonl: string): CodexContextUsage | undefined;
+/** Latest cumulative token counter persisted in a native Codex rollout. */
+export declare function extractLatestCodexTokenTotals(jsonl: string): CodexTokenTotals | undefined;
 /** Resolve a thread's current rollout and return its latest context measurement. */
 export declare function readLatestCodexContextUsage(threadId: string): CodexContextUsage | undefined;
+export declare function readLatestCodexTokenTotals(threadId: string): CodexTokenTotals | undefined;
 /**
  * Old and metadata-free Codex rollouts resume as native multi-agent v1 even
  * when the feature flag is false. Rewrite their runtime metadata in place so

package/dist/types/packages/core/src/mcp/factories/token-stats.d.ts

@@ -1,5 +1,5 @@
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { type Bucket } from "../../storage/token-stats";
+import { type Bucket, type CurrentSessionUsage } from "../../storage/token-stats";
 export interface TokenStatsMcpContext {
     userId: string;
 }
@@ -7,11 +7,13 @@ export interface TokenStatsSnapshot {
     total: Bucket;
     byHour: Record<string, Bucket>;
     bySession: Record<string, Bucket>;
+    currentSessions?: CurrentSessionUsage[];
+    ignoredLegacyRecords?: number;
     estimatedCostUsd: number;
 }
 export interface TokenStatsMcpHost {
     getStats(userId: string, from?: string, to?: string): TokenStatsSnapshot;
-    calcCost(bucket: Pick<Bucket, "inputTokens" | "outputTokens" | "cacheCreationInputTokens" | "cacheReadInputTokens">): number;
+    calcCost(bucket: Pick<Bucket, "inputTokens" | "outputTokens" | "cacheCreationInputTokens" | "cacheReadInputTokens" | "estimatedCostUsd">): number;
     extraSummaryLines?(userId: string): readonly string[];
 }
 export declare const defaultTokenStatsMcpHost: TokenStatsMcpHost;

package/dist/types/packages/core/src/runtime/bashrs-completions.d.ts

@@ -0,0 +1,50 @@
+/**
+ * bash-rs completion watcher — turns `result.json` files written by the Rust
+ * `bash-rs` background-bash daemon into session-inbox `tell`s. bash-rs is the
+ * only backend; the retired TypeScript server called `injectMessage()` itself.
+ *
+ * Why a watcher instead of bash-rs calling back into negotium: bash-rs is a
+ * standalone project (github.com/maestrojeong/bash-rs-mcp, sibling of
+ * browser-rs-mcp) that knows nothing about topics/session-inbox/turns — it
+ * only ever appends `{bash_id}/meta.json` (on spawn) and `{bash_id}/result.json`
+ * (on completion) under `BASHRS_SPILL_ROOT`, and never reads or deletes
+ * either. Any consumer, negotium or otherwise, watches that directory the
+ * same way `runtime/inbox.ts` already watches the session-inbox itself:
+ * `fs.watch` + a fallback poll, at-least-once, dedup by a stable id.
+ *
+ * `owner` on the wire is `${userId}\0${topicId}` — see
+ * `platform/mcp-config.ts::backgroundBashTransport` for what negotium sends
+ * as `X-Background-Bash-User`/`X-Background-Bash-Topic`, and bash-rs's own
+ * `security.rs::resolve_identity` for the matching NUL-join on the other end.
+ */
+/**
+ * Where a finished background job's turn is delivered.
+ *
+ * The default appends to negotium's own session inbox. An embedding host that
+ * owns a different inbox installs its own sink here — otium, for one, resolves
+ * `RUN_DIR` to its own state dir and runs its own inbox worker, so writing to
+ * negotium's path would drop the turn on the floor rather than deliver it.
+ * Mirrors the `setFileHooks()` seam in `runtime/file-hooks.ts`.
+ *
+ * A sink must throw to signal failure: the caller leaves `result.json` in
+ * place so the next sweep retries, which is what keeps delivery at-least-once.
+ */
+export interface BashrsCompletion {
+    userId: string;
+    topicId: string;
+    /** Stable per-job id; use it to collapse a retried delivery into one turn. */
+    bashId: string;
+    message: string;
+}
+export type BashrsCompletionSink = (completion: BashrsCompletion) => void;
+/** Install a host's delivery sink, or pass null to restore the default. */
+export declare function setBashrsCompletionSink(sink: BashrsCompletionSink | null): void;
+/** One sweep: deliver any new `result.json`, then reap old delivered jobs. */
+export declare function flushBashrsCompletions(): Promise<void>;
+/**
+ * Join the bashrs-completions worker election — same one-leader-per-role
+ * lease as `startSessionInboxWorker`, so exactly one runtime process watches
+ * `BASHRS_SPILL_ROOT` regardless of how many are up. Returns a cleanup
+ * function for graceful shutdown.
+ */
+export declare function startBashrsCompletionsWorker(): () => void;

package/dist/types/packages/core/src/runtime/public-helpers.d.ts

@@ -5,6 +5,8 @@ export { delay } from "../platform/delay";
 export { errMsg } from "../platform/error";
 export { appendJsonlEntry, appendJsonlLine, parseJsonlText, readJsonFile, readJsonlLines, writeJsonFileAtomic, writeJsonlFile, } from "../platform/jsonl";
 export { createLifecycleManager, type LifecycleLogger, type LifecycleManager, type LifecycleManagerOptions, type LifecycleProcessHost, onShutdown, runShutdown, type ShutdownHandler, type SignalReason, } from "../platform/lifecycle";
+export type { BashrsCompletion, BashrsCompletionSink, } from "./bashrs-completions";
+export { setBashrsCompletionSink, startBashrsCompletionsWorker, } from "./bashrs-completions";
 export { escapeRegExp, mentionsAi } from "./channel-context";
 export { buildContextWarningText, type ClaudeRequestTokenUsage, type ContextOccupancy, type ContextWarningOptions, type ContextWarningState, type ContextWarningTextOptions, claudeRequestContextTokens, clearContextWarning, contextUsageRatio, createContextWarningState, DEFAULT_CONTEXT_WARNING_RATIO, formatContextTokenCount, nextContextWarning, shouldWarnForContext, } from "./context-warning";
 export { renderTaskPanel, taskPanelMessageId } from "./task-format";

package/dist/types/packages/core/src/storage/token-stats.d.ts

@@ -1,10 +1,20 @@
+import type { AgentKind, TokenUsage } from "../types";
 export interface QueryRecord {
+    schemaVersion: 2;
     timestamp: string;
     session: string;
+    topicId: string;
+    providerSessionId?: string;
+    agent: AgentKind;
+    model: string;
+    /** Cache-miss input only. */
     inputTokens: number;
     outputTokens: number;
     cacheCreationInputTokens: number;
     cacheReadInputTokens: number;
+    contextTokens?: number;
+    contextWindow?: number;
+    estimatedCostUsd: number;
 }
 export interface Bucket {
     inputTokens: number;
@@ -12,19 +22,38 @@ export interface Bucket {
     cacheCreationInputTokens: number;
     cacheReadInputTokens: number;
     queries: number;
+    estimatedCostUsd: number;
+}
+export interface CurrentSessionUsage {
+    timestamp: string;
+    topicId: string;
+    topicTitle: string;
+    providerSessionId?: string;
+    agent: AgentKind;
+    model: string;
+    contextTokens: number;
+    contextWindow: number;
+}
+export interface TopicUsageSummary extends Bucket {
+    topicId: string;
+    currentSession?: CurrentSessionUsage;
 }
 export declare function tokenStatsFileId(userId: number | string): string;
-export declare function calcCost(b: Pick<Bucket, "inputTokens" | "outputTokens" | "cacheCreationInputTokens" | "cacheReadInputTokens">): number;
+export declare function calcCost(b: Pick<Bucket, "inputTokens" | "outputTokens" | "cacheCreationInputTokens" | "cacheReadInputTokens" | "estimatedCostUsd">): number;
 /** 쿼리 완료 시 호출 — JSONL에 한 줄 추가 */
-export declare function recordUsage(userId: number | string, session: string, usage: {
-    inputTokens: number;
-    outputTokens: number;
-    cacheCreationInputTokens?: number;
-    cacheReadInputTokens?: number;
+export declare function recordUsage(userId: number | string, session: string, usage: TokenUsage, context: {
+    topicId: string;
+    providerSessionId?: string;
+    agent: AgentKind;
+    model: string;
 }): void;
 export declare function getStats(userId: number | string, from?: string, to?: string): {
     total: Bucket;
     byHour: Record<string, Bucket>;
     bySession: Record<string, Bucket>;
+    currentSessions: CurrentSessionUsage[];
+    ignoredLegacyRecords: number;
     estimatedCostUsd: number;
 };
+/** Exact all-time usage for one topic, independent of transcript pagination. */
+export declare function getTopicStats(userId: number | string, topicId: string): TopicUsageSummary;

package/dist/types/packages/core/src/version.d.ts

@@ -1 +1 @@
-export declare const NEGOTIUM_VERSION = "0.2.14";
+export declare const NEGOTIUM_VERSION = "0.2.16";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "negotium",
-  "version": "0.2.14",
+  "version": "0.2.16",
   "type": "module",
   "description": "Install the Negotium multi-agent runtime and CLI with one package",
   "license": "Apache-2.0",