negotium 0.2.3 → 0.2.5

package/dist/types/packages/core/src/agents/api-topic-agent-switch.d.ts

@@ -3,7 +3,7 @@ import type { AgentKind, EffortLevel } from "../types";
 export type ApiTopicSwitchOutcome = {
     kind: "fresh";
     agent: AgentKind;
-    reason: "no-history" | "bridge-failed";
+    reason: "no-history";
 } | {
     kind: "bridged";
     agent: AgentKind;

package/dist/types/packages/core/src/agents/codex-app-server.d.ts

@@ -0,0 +1,13 @@
+import { type ChildProcessWithoutNullStreams } from "node:child_process";
+interface CodexAppServerForkResult {
+    forkId: string;
+    rolloutPath: string;
+}
+interface CodexAppServerForkHost {
+    spawnServer(): ChildProcessWithoutNullStreams;
+    findRolloutPath(threadId: string): string | undefined;
+    timeoutMs: number;
+}
+export declare function createCodexAppServerForker(host: CodexAppServerForkHost): (parentThreadId: string) => Promise<CodexAppServerForkResult>;
+export declare function forkCodexSession(parentThreadId: string): Promise<CodexAppServerForkResult>;
+export {};

package/dist/types/packages/core/src/agents/codex-native-multi-agent.d.ts

@@ -1,4 +1,5 @@
 export declare const BUNDLED_CODEX_VERSION: string;
+export declare function codexCliScriptPath(): string;
 export declare function bundledCodexModelCachePath(authFilePath: string): string;
 export declare function ensureCodexModelCache(authFilePath: string, bootstrap?: (codexHome: string, cachePath: string) => Promise<void>): Promise<string>;
 /**

package/dist/types/packages/core/src/agents/contracts.d.ts

@@ -39,6 +39,8 @@ export interface ForkRegistryOptions {
 export interface ForkRegistryResult {
     forkId: string;
     rolloutPath: string;
+    /** Additional provider-owned files created for the fork. */
+    cleanupPaths?: string[];
 }
 export interface CleanupRolloutsOptions {
     cwd: string;

package/dist/types/packages/core/src/agents/execution-host.d.ts

@@ -31,3 +31,5 @@ export declare function shouldRedirectHostedVaultTool(userId: string, toolName:
 export declare function transformHostedQueryOptions(opts: AgentQueryOptions): AgentQueryOptions;
 export declare function hostedClaudeCodeExecutablePath(): string | undefined;
 export declare function hostedCodexAuthFilePath(): string;
+/** The one Codex state root used by auth, rollouts, native forks, and SDK resume. */
+export declare function hostedCodexHomePath(): string;

package/dist/types/packages/core/src/agents/fork.d.ts

@@ -1,11 +1,13 @@
+import type { ForkRegistryResult } from "./contracts";
 import type { AgentKind, EffortLevel } from "../types";
 /**
  * Agent-aware fork primitives.
  *
  * Strategy lives in each agent's registry (`*-registry.ts:forkSession`).
- * Claude uses the SDK's native `forkSession` (byte-equivalent rollout copy);
- * Codex synthesizes a rollout from the provider-agnostic conversation log
- * because the SDK has no fork API. Both surfaces converge on `ForkHandle`.
+ * Claude uses the SDK's native `forkSession`, Codex uses App Server's native
+ * `thread/fork`, and Maestro uses the SDK's `forkSessionAt`. Providers without
+ * a native branch primitive synthesize from the provider-agnostic conversation
+ * log. All surfaces converge on ForkHandle.
  */
 export interface ForkAgentSessionOptions {
     agent: AgentKind;
@@ -29,12 +31,11 @@ export interface ForkHandle {
     forkId: string;
     /** Absolute path of the rollout file to remove on cleanup. */
     rolloutPath: string;
+    /** Additional provider-owned files removed with the primary rollout. */
+    cleanupPaths?: string[];
 }
 export interface AgentForkHost {
-    forkSession(agent: AgentKind, options: Omit<ForkAgentSessionOptions, "agent">): Promise<{
-        forkId: string;
-        rolloutPath: string;
-    }>;
+    forkSession(agent: AgentKind, options: Omit<ForkAgentSessionOptions, "agent">): Promise<ForkRegistryResult>;
     exists(path: string): boolean;
     unlink(path: string): void;
     warn(details: Record<string, unknown>, message: string): void;

package/dist/types/packages/core/src/agents/memory-archive-policy.d.ts

@@ -10,5 +10,15 @@ export interface MemoryArchiveMessage {
  * mirrors Clawgram's lifecycle-level MIN_EXCHANGE_COUNT policy.
  */
 export declare const MIN_MEMORY_ARCHIVE_EXCHANGES = 6;
+export interface MemoryArchiveTopicContext {
+    isSubagent?: boolean;
+    memoryTopicId?: string;
+}
+/**
+ * Explicit-memory subagents are usually short, focused turns. Persist one
+ * completed exchange back to their selected memory topic, while retaining the
+ * normal threshold for regular topics and incomplete/failed turns.
+ */
+export declare function meetsMemoryArchiveExchangeThreshold(exchangeCount: number, minExchanges: number, topic: MemoryArchiveTopicContext): boolean;
 /** Count completed conversational exchanges while ignoring system/tool/card noise. */
 export declare function countMemoryArchiveExchanges(rows: readonly MemoryArchiveMessage[]): number;

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

@@ -10,8 +10,9 @@
  * synthesized `response_item`/`event_msg` pairs per turn.
  *
  * Tool history is folded into assistant text as `[Tool: ...]` annotations
- * (see shared.ts:extractChatPairs) — the SDK has no fork API and synthetic
- * tool_use IDs across SDKs are too fragile to reconstruct structurally.
+ * (see shared.ts:extractChatPairs). Native same-agent forks use App Server's
+ * `thread/fork`; this encoder remains the fallback and cross-agent bridge,
+ * where synthetic tool_use IDs are too fragile to reconstruct structurally.
  */
 import { type ChatPair } from "./shared";
 import type { ConversationEntry } from "../../storage/conversations";
@@ -71,6 +72,7 @@ export declare function readLatestCodexContextUsage(threadId: string): CodexCont
  * the same thread can resume without losing provider conversation history.
  */
 export declare function migrateCodexRolloutNativeMultiAgentMetadata(threadId: string): boolean;
+export declare function latestCodexRolloutPath(threadId: string): string | undefined;
 /**
  * Materialize a Codex rollout JSONL with the provided dialogue and place it
  * at `~/.codex/sessions/<yyyy>/<mm>/<dd>/rollout-<ts>-<threadId>.jsonl` so a

package/dist/types/packages/core/src/agents/self-config-core.d.ts

@@ -67,7 +67,7 @@ export type SelfConfigAgentSwitchResult = {
     outcome: {
         kind: "fresh";
         agent: AgentKind;
-        reason: "no-history" | "bridge-failed";
+        reason: "no-history";
     } | {
         kind: "bridged";
         agent: AgentKind;

package/dist/types/packages/core/src/mcp/factories/session-comm.d.ts

@@ -9,6 +9,7 @@ export interface SessionCommMcpHost {
     getMcpConfig(context: SessionCommContext): MaybePromise<SessionCommMcpResult>;
     getBrowserProfile?(context: SessionCommContext): MaybePromise<SessionCommMcpResult>;
     setBrowserProfile?(context: SessionCommContext, profile: string): MaybePromise<SessionCommMcpResult>;
+    deleteBrowserProfile?(context: SessionCommContext, profile: string): MaybePromise<SessionCommMcpResult>;
     peekSession(context: SessionCommContext): MaybePromise<SessionCommMcpResult>;
     setDescription(context: SessionCommContext, description: string): MaybePromise<SessionCommMcpResult>;
     askSession(context: SessionCommContext, input: {

package/dist/types/packages/core/src/platform/config.d.ts

@@ -10,7 +10,6 @@ export declare const BROWSER_DIR: string;
 export declare const BROWSER_PROFILES_DIR: string;
 export declare const BINARIES_DIR: string;
 export declare const SECRETS_DIR: string;
-export declare const CONTEXTS_DIR: string;
 export declare const DM_WORKSPACE_DIR: string;
 export declare const SESSION_WORKSPACE_DIR: string;
 export declare const CLAUDE_EXECUTABLE: string | undefined;

package/dist/types/packages/core/src/platform/mcp-config.d.ts

@@ -64,6 +64,8 @@ export declare function consumePlaywrightUnavailable(userId: string, topic: stri
  */
 export interface RuntimeMcpBuildContext {
     userId: string;
+    /** Vault namespace when credentials belong to a different principal. */
+    vaultUserId?: string;
     /** "dm" for DM scope, topic/session name for forum/fork. */
     session: string;
     /** REST/WS topic id when known. Prefer for authorization/scope checks. */
@@ -183,6 +185,7 @@ export declare function getManagerMcpServers(opts: {
  */
 export declare function getForumMcpServers(opts: {
     userId: string;
+    vaultUserId?: string;
     session: string;
     topicId?: string;
     subagentParentTopicId?: string;

package/dist/types/packages/core/src/platform/playwright/manager.d.ts

@@ -26,6 +26,8 @@ export interface PlaywrightManagerHost {
     readonly createChildEnvironment: (context: PlaywrightChildEnvironmentContext) => NodeJS.ProcessEnv;
     /** Reap an orphan that owns this exact host-managed data directory. */
     readonly cleanupBrowserProcessesForDataDir: (userDataDir: string) => void;
+    /** Remove an exact host-managed profile directory, rejecting paths outside the host's root. */
+    readonly removeProfileDataDir?: (userDataDir: string) => boolean;
     /** Reap host-managed browsers that are not represented by the supplied live directories. */
     readonly reapOrphanBrowsers: (liveUserDataDirs: Iterable<string>) => void;
 }
@@ -59,6 +61,19 @@ export declare function stopPlaywrightInstance(instanceKey: string): Promise<boo
 export declare function withPlaywrightProfileMaintenance<T>(ownerId: string, rawProfile: string, operation: (binding: PlaywrightProfileBinding, control: PlaywrightMaintenanceControl) => Promise<T>): Promise<T>;
 /** Stop a named profile before deleting or replacing its host-managed data directory. */
 export declare function stopPlaywrightProfile(ownerId: string, rawProfile: string): Promise<boolean>;
+export interface RemovePlaywrightProfileDataResult {
+    dataDir: string;
+    processStopped: boolean;
+    dataRemoved: boolean;
+}
+export interface RemovePlaywrightProfileDataOptions {
+    /** Revalidate external ownership immediately before the synchronous removal. */
+    beforeRemove?: () => void;
+    /** Commit external metadata before releasing the profile lifecycle barrier. */
+    afterRemove?: () => void;
+}
+/** Stop all exact-profile processes and remove its data through the configured host boundary. */
+export declare function removePlaywrightProfileData(ownerId: string, rawProfile: string, options?: RemovePlaywrightProfileDataOptions): Promise<RemovePlaywrightProfileDataResult>;
 export declare function pinPlaywrightInstance(instanceKey: string): void;
 export declare function unpinPlaywrightInstance(instanceKey: string): void;
 export declare function getPlaywrightCapability(instanceKey: string): string | undefined;

package/dist/types/packages/core/src/platform/playwright/profile-management.d.ts

@@ -0,0 +1,8 @@
+export interface DeleteManagedBrowserProfileResult {
+    profile: string;
+    metadataRemoved: boolean;
+    dataRemoved: boolean;
+    processStopped: boolean;
+}
+/** Delete an unused named profile while serialized against browser startup. */
+export declare function deleteManagedBrowserProfile(ownerId: string, rawProfile: string): Promise<DeleteManagedBrowserProfileResult>;

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

@@ -1,4 +1,5 @@
 export { isBrowserJanitorOwner, selectOrphanBrowserPids, } from "./browser-processes";
-export { closeBrowserOwnerTabs, configurePlaywrightManagerHost, ensureBrowserProfile, ensurePlaywright, getPlaywrightCapability, getPlaywrightManagerHost, killAllPlaywright, makeBrowserProfileInstanceKey, makeInstanceKey, onPlaywrightFailure, type PlaywrightChildEnvironmentContext, type PlaywrightFailure, type PlaywrightMaintenanceControl, type PlaywrightManagerHost, type PlaywrightProfileBinding, pinPlaywrightInstance, reapPlaywrightOrphans, resetPlaywrightManagerHost, resolvePlaywrightCapabilityOwner, resolvePlaywrightProfileBinding, resolvePlaywrightTopicBinding, resolveTopicProfileDir, stopPlaywrightInstance, stopPlaywrightProfile, unpinPlaywrightInstance, withPlaywrightInstanceMaintenance, withPlaywrightProfileMaintenance, } from "./manager";
+export { closeBrowserOwnerTabs, configurePlaywrightManagerHost, ensureBrowserProfile, ensurePlaywright, getPlaywrightCapability, getPlaywrightManagerHost, killAllPlaywright, makeBrowserProfileInstanceKey, makeInstanceKey, onPlaywrightFailure, type PlaywrightChildEnvironmentContext, type PlaywrightFailure, type PlaywrightMaintenanceControl, type PlaywrightManagerHost, type PlaywrightProfileBinding, pinPlaywrightInstance, reapPlaywrightOrphans, removePlaywrightProfileData, resetPlaywrightManagerHost, resolvePlaywrightCapabilityOwner, resolvePlaywrightProfileBinding, resolvePlaywrightTopicBinding, resolveTopicProfileDir, stopPlaywrightInstance, stopPlaywrightProfile, unpinPlaywrightInstance, withPlaywrightInstanceMaintenance, withPlaywrightProfileMaintenance, } from "./manager";
 export { browserProcessMatchesExpectedProfile, extractUserDataDirArg, selectIdleEvictionKey, selectReusablePort, waitForChildProcessExit, waitForChildProcessSpawnError, } from "./manager-utils";
+export { type DeleteManagedBrowserProfileResult, deleteManagedBrowserProfile, } from "./profile-management";
 export { probeMcpTransport, probePlaywrightMcpTransports, } from "./transport-probe";

package/dist/types/packages/core/src/query/active-rooms.d.ts

@@ -28,6 +28,8 @@ export interface DeferredInject {
     /** Topic execution epoch captured when this work was accepted. */
     runtimeEpoch?: number;
     userId: string;
+    /** Credential namespace when the executor and Vault owner differ. */
+    vaultUserId?: string;
     prompt: string;
     /** Inject source — the topic name/id this inject came from (never "user"). */
     origin: string;
@@ -105,8 +107,12 @@ export interface RoomQueryControl {
     durableRequestIds?: string[];
     /** Attachment ids currently being processed. User-turn preemption carries them forward. */
     attachments?: string[];
-    /** Provider session id this turn resumed from. Superseding user turns restart from this base. */
+    /** Latest provider session id observed for this turn. */
     sessionId?: string | null;
+    /** True once the provider has published the native session backing this turn. */
+    providerSessionObserved?: boolean;
+    /** True once provider output proves that this turn's prompt reached the native session. */
+    providerTurnContentObserved?: boolean;
     abortController: AbortController;
     abortReason: AbortReason;
     /** Specific failure surfaced when infrastructure aborts the turn. */

package/dist/types/packages/core/src/runtime/turn-runner.d.ts

@@ -12,7 +12,7 @@ export * from "./channel-context";
 export * from "./errors";
 export * from "./tasks";
 export * from "./turn-session";
-export { renderUserPromptBatch } from "./user-turn-envelope";
+export { renderUserPromptBatch, renderUserTurnBatch } from "./user-turn-envelope";
 export * from "./visuals";
 /** Browser and background shell tools are part of every ordinary topic. */
 export declare function withDefaultPlaywright(configuredMcp: string[], isManager: boolean): string[];
@@ -48,6 +48,45 @@ export declare function deliverAskCallbackToCaller(pending: AskPendingFileRef &
     callerTopicId: string;
     callerUserId: string;
 }, sourceLabel: string, body: string, kind: "reply" | "error"): Promise<boolean>;
+export type TopicRolloutReconstruction = {
+    kind: "rebuilt";
+    sessionId: string;
+} | {
+    kind: "no-history";
+} | {
+    kind: "failed";
+    error: string;
+};
+export declare function tryReconstructTopicRollout(opts: {
+    topicId: string;
+    topicTitle: string;
+    userId: string;
+    agent: AgentKind;
+    sessionId: string | null | undefined;
+    cwd: string;
+    model: string;
+    effort?: EffortLevel;
+}): TopicRolloutReconstruction;
+export type SessionRetryResolution = {
+    kind: "retry";
+    sessionId: string | null;
+} | {
+    kind: "failed";
+    error: string;
+};
+export declare function resolveSessionRetry(opts: {
+    topicId: string;
+    topicTitle: string;
+    userId: string;
+    agent: AgentKind;
+    sessionId: string | null | undefined;
+    cwd: string;
+    silent: boolean;
+    model: string;
+    effort?: EffortLevel;
+    externalSessionOwner?: boolean;
+    onSessionReset?: () => void;
+}): SessionRetryResolution;
 export interface AiTurnSettlement {
     queryId: string;
     kind: "completed" | "aborted" | "error";
@@ -106,6 +145,8 @@ export interface AiTurnExecutionOptions {
 export interface StartAiTurnParams extends AiTurnExecutionOptions {
     topic: AiTurnTopic;
     userId: string;
+    /** Credential namespace. Defaults to userId for backwards compatibility. */
+    vaultUserId?: string;
     prompt: string;
     allowAutoContinue: boolean;
     agentOverride?: AgentKind;

package/dist/types/packages/core/src/runtime/user-turn-envelope.d.ts

@@ -2,7 +2,14 @@
 export interface UserTurnEnvelope {
     prompt: string;
     attachments?: string[];
+    /** Authenticated human author. Execution may still run as the local principal. */
+    actorUserId?: string;
+    /** Display-only author label captured by the trusted ingress. */
+    actorLabel?: string;
 }
 export declare function legacyUserTurnEnvelope(prompt: string, attachments?: string[]): UserTurnEnvelope;
 export declare function flattenUserTurnAttachments(messages: readonly UserTurnEnvelope[]): string[] | undefined;
 export declare function renderUserPromptBatch(prompts: readonly string[]): string;
+export declare function renderUserTurnPrompt(message: UserTurnEnvelope): string;
+/** Render ordered user submissions while retaining their structured authorship. */
+export declare function renderUserTurnBatch(messages: readonly UserTurnEnvelope[]): string;

package/dist/types/packages/core/src/storage/browser-profiles.d.ts

@@ -6,6 +6,7 @@ export interface BrowserProfileRecord {
         id: string;
         title: string;
     }>;
+    deletable: boolean;
 }
 export declare function normalizeBrowserProfileName(name: string): string;
 export declare function getBrowserProfileOwner(topicId: string, fallbackUserId: string): string;
@@ -22,4 +23,5 @@ export declare function assignTopicBrowserProfile(opts: {
     profile: string;
 };
 export declare function listBrowserProfiles(ownerId: string): BrowserProfileRecord[];
-export declare function deleteBrowserProfile(ownerId: string, rawName: string): void;
+export declare function assertBrowserProfileDeletable(ownerId: string, rawName: string): string;
+export declare function deleteBrowserProfile(ownerId: string, rawName: string): boolean;

package/dist/types/packages/core/src/storage/runtime-turn-requests.d.ts

@@ -19,10 +19,14 @@ export interface RuntimeUserTurnExecution {
     bridgeSessionFromHistory?: boolean;
     peerBridge?: PeerRuntimeBridgeContext;
     from?: string;
+    /** Vault namespace for this turn, independent from the local execution principal. */
+    vaultUserId?: string;
     /** Newly accepted user texts not yet recorded in the unified conversation log. */
     conversationPrompts?: string[];
     /** Number of leading userMessages already present in the unified conversation log. */
     loggedUserMessageCount?: number;
+    /** Native session whose provider output proves it accepted this request's user turn. */
+    providerSessionId?: string;
     /** Request ids whose ordered messages were folded into this replacement. */
     supersededRequestIds?: string[];
 }
@@ -71,10 +75,23 @@ export declare function mergeRuntimeUserTurnRequest(input: {
     execution: RuntimeUserTurnExecution;
     topicEpoch: number;
     alreadyIncludedRequestIds?: string[];
+    /** Requests already committed to the provider's native session; keep their lineage, not prompts. */
+    omitRequestIds?: string[];
 }): {
     requestId: string;
     supersededRequestIds: string[];
 };
+/**
+ * Record that provider output proves the native session contains this durable
+ * turn. A session-id event alone is insufficient: some providers publish it
+ * before appending the user prompt. This marker lets a different runtime
+ * process omit only a demonstrably committed prompt when it merges a steering
+ * message after preemption.
+ *
+ * Match only the exact request id. A late session event from a superseded turn
+ * must not mark its replacement (whose prompts have not reached the provider).
+ */
+export declare function markRuntimeUserTurnProviderSessionObserved(topicId: string, requestId: string, sessionId: string): boolean;
 export declare function markRuntimeUserTurnMessagesLogged(topicId: string, requestId: string, ownerId: string, loggedUserMessages: readonly UserTurnEnvelope[]): boolean;
 export declare function claimNextRuntimeUserTurnRequest(ownerId: string, now?: number): RuntimeUserTurnRequest | null;
 export declare function markRuntimeUserTurnRunning(topicId: string, requestId: string, ownerId: string, queryId: string): boolean;

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

@@ -3,6 +3,7 @@ import type { StorageDatabase, StorageHostConfig } from "./storage-contract";
 export type { StorageDatabase, StorageDatabaseAdapter, StorageDatabaseInput, StorageHostConfig, StorageHostOptions, StorageStatement, StorageTransaction, } from "./storage-contract";
 type InternalStorageDatabase = InstanceType<typeof Database>;
 type StorageSchemaInitializer = (database: InternalStorageDatabase) => void;
+export declare function initializeDatabase(database: InternalStorageDatabase): void;
 export declare function resolveStorageDatabase(): InternalStorageDatabase;
 export declare function resolveStorageDataDir(): string;
 export declare function resolveStorageLogDir(): string;

package/dist/types/packages/core/src/storage/vault.d.ts

@@ -21,6 +21,14 @@ export declare const VAULT_DESCRIPTION_MAX_LENGTH = 500;
 export declare function normalizeVaultKey(key: string): string;
 export declare function validateVaultKey(key: string): boolean;
 export declare function vaultListWithValues(userId: string): VaultEntryWithValue[];
+/**
+ * Return only rows that can still be authenticated with the active master key.
+ *
+ * This is intentionally limited to redaction indexes: one damaged credential
+ * must not disable unrelated tools, while direct access to that credential
+ * continues to fail closed through vaultGetValue().
+ */
+export declare function vaultListDecryptableValues(userId: string): VaultEntryWithValue[];
 export declare function vaultSet(userId: string, key: string, value: string, description?: string): void;
 export declare function vaultHasKey(userId: string, key: string): boolean;
 export declare function vaultDel(userId: string, key: string): boolean;

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

@@ -169,6 +169,8 @@ export interface AgentQueryOptions {
     cwd: string;
     systemPrompt: string;
     userId?: string;
+    /** Credential namespace when it differs from the execution principal. */
+    vaultUserId?: string;
     session?: string;
     playwrightPort?: number;
     playwrightCapability?: string;

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

@@ -1 +1 @@
-export declare const NEGOTIUM_VERSION = "0.2.3";
+export declare const NEGOTIUM_VERSION = "0.2.5";

package/dist/vault.js

@@ -106,7 +106,6 @@ var BROWSER_DIR = resolveLocalStateDir("NEGOTIUM_BROWSER_DIR", "browser");
 var BROWSER_PROFILES_DIR = resolve(BROWSER_DIR, "profiles");
 var BINARIES_DIR = resolve(STATE_DIR, "binaries");
 var SECRETS_DIR = resolve(STATE_DIR, "secrets");
-var CONTEXTS_DIR = resolve(STATE_DIR, "data", "contexts");
 var DM_WORKSPACE_DIR = resolve(STATE_DIR, "data", "dm");
 var SESSION_WORKSPACE_DIR = resolve(STATE_DIR, "data", "sessions");
 var CLAUDE_EXECUTABLE_ENV = envText("NEGOTIUM_CLAUDE_EXECUTABLE");
@@ -249,7 +248,6 @@ mkdirSync(WORKSPACE_DIR, { recursive: true });
 mkdirSync(TOPIC_WORKSPACE_DIR, { recursive: true });
 mkdirSync(SHARED_WIKI_DIR, { recursive: true });
 mkdirSync(CRON_WORKSPACE_DIR, { recursive: true });
-mkdirSync(CONTEXTS_DIR, { recursive: true });
 mkdirSync(DM_WORKSPACE_DIR, { recursive: true });
 mkdirSync(SESSION_WORKSPACE_DIR, { recursive: true });
 mkdirSync(BROWSER_DIR, { recursive: true });
@@ -480,6 +478,20 @@ function vaultListWithValues(userId) {
     value: decryptRow(userId, row.key, row.value)
   }));
 }
+function vaultListDecryptableValues(userId) {
+  const rows = activeVaultDatabase().prepare("SELECT key, description, value FROM vault WHERE user_id = ? ORDER BY key").all(userId);
+  const entries = [];
+  for (const row of rows) {
+    try {
+      entries.push({
+        key: row.key,
+        description: row.description,
+        value: decryptRow(userId, row.key, row.value)
+      });
+    } catch {}
+  }
+  return entries;
+}
 function vaultSet(userId, key, value, description = "") {
   const normalizedKey = normalizeVaultKey(key);
   activeVaultDatabase().prepare(`INSERT INTO vault (user_id, key, value, description) VALUES (?, ?, ?, ?)
@@ -507,10 +519,12 @@ function vaultGetValue(userId, key) {
   return row ? decryptRow(userId, row.key, row.value) : undefined;
 }
 function vaultSubstituteDetailed(userId, text) {
-  const entries = new Map(vaultListWithValues(userId).map((entry) => [entry.key, entry.value]));
+  const entries = new Map;
   const usedKeys = new Set;
   const substituted = text.replace(/\{\{([^}]+)\}\}/g, (match, rawKey) => {
     const key = normalizeVaultKey(rawKey);
+    if (!entries.has(key))
+      entries.set(key, vaultGetValue(userId, key));
     const value = entries.get(key);
     if (value === undefined)
       return match;
@@ -550,7 +564,7 @@ function encodedSecretForms(value) {
   return [...forms].sort((a, b) => b.length - a.length);
 }
 function redactVaultSecrets(userId, text) {
-  const candidates = vaultListWithValues(userId).flatMap((entry) => encodedSecretForms(entry.value).map((form) => ({ form, key: entry.key }))).sort((a, b) => b.form.length - a.form.length || a.key.localeCompare(b.key));
+  const candidates = vaultListDecryptableValues(userId).flatMap((entry) => encodedSecretForms(entry.value).map((form) => ({ form, key: entry.key }))).sort((a, b) => b.form.length - a.form.length || a.key.localeCompare(b.key));
   if (candidates.length === 0)
     return text;
   const candidatesByFirstCharacter = new Map;
@@ -599,4 +613,4 @@ export {
   VAULT_DESCRIPTION_MAX_LENGTH
 };
 
-//# debugId=D6C5CDDC478A1CCC64756E2164756E21
+//# debugId=330AC50C00EFAF5164756E2164756E21