negotium 0.1.19 → 0.1.21

package/dist/agent-helpers.js

@@ -1907,6 +1907,19 @@ function vaultListWithValues(userId) {
 function vaultList(userId) {
   return activeVaultDatabase().prepare("SELECT key, description FROM vault WHERE user_id = ? ORDER BY key").all(userId);
 }
+function vaultSubstituteDetailed(userId, text) {
+  const entries = new Map(vaultListWithValues(userId).map((entry) => [entry.key, entry.value]));
+  const usedKeys = new Set;
+  const substituted = text.replace(/\{\{([^}]+)\}\}/g, (match, rawKey) => {
+    const key = normalizeVaultKey(rawKey);
+    const value = entries.get(key);
+    if (value === undefined)
+      return match;
+    usedKeys.add(key);
+    return value;
+  });
+  return { text: substituted, usedKeys: [...usedKeys] };
+}
 function valueReferencesVaultKey(userId, value) {
   const keys = new Set(vaultList(userId).map((entry) => entry.key));
   const visit = (candidate) => {
@@ -2533,9 +2546,7 @@ var MCP_CATALOG = {
   vault: {
     ...commonRuntimeMcpPolicy("vault"),
     build({ userId, agent }) {
-      const args = [`--user-id=${userId}`];
-      if (agent === "codex")
-        args.push("--http-only=true");
+      const args = [`--user-id=${userId}`, "--list-only=true"];
       return buildStdioMcpServer(agent, VAULT_SERVER, args);
     }
   }
@@ -2757,6 +2768,7 @@ function getMcpServersForQuery(opts) {
 var defaultHost = {
   getMcpServersForQuery,
   redactVaultSecrets,
+  substituteVaultSecrets: (userId, value) => vaultSubstituteDetailed(userId, value).text,
   referencesRuntimeSecretStorage,
   shouldRedirectVaultTool,
   claudeCodeExecutablePath: () => CLAUDE_EXECUTABLE,
@@ -2779,12 +2791,12 @@ function hostedMcpServers(opts) {
 function redactHostedSecrets(userId, value) {
   return activeHost().redactVaultSecrets(userId, value);
 }
+function substituteHostedSecrets(userId, value) {
+  return activeHost().substituteVaultSecrets(userId, value);
+}
 function referencesHostedSecretStorage(value) {
   return activeHost().referencesRuntimeSecretStorage(value);
 }
-function shouldRedirectHostedVaultTool(userId, toolName, input) {
-  return activeHost().shouldRedirectVaultTool(userId, toolName, input);
-}
 function hostedClaudeCodeExecutablePath() {
   return activeHost().claudeCodeExecutablePath();
 }
@@ -2836,6 +2848,9 @@ var CLAUDE_DEFAULT_DISALLOWED_TOOLS = [
   "TaskGet"
 ];
 var CLAUDE_NATIVE_AGENT_TOOLS = ["Task", "Agent", "TaskOutput", "TaskStop"];
+function substituteClaudeToolInput(userId, input) {
+  return deepMapStrings(input, (value) => substituteHostedSecrets(userId, value));
+}
 function buildClaudeDisallowedTools(extra = undefined) {
   return [
     ...new Set([
@@ -3074,14 +3089,14 @@ async function* claudeProvider(opts) {
                 };
               }
               const userId = opts.userId ?? "";
-              if (!shouldRedirectHostedVaultTool(userId, tool_name, tool_input)) {
+              const withVault = substituteClaudeToolInput(userId, tool_input);
+              if (JSON.stringify(withVault) === JSON.stringify(tool_input)) {
                 return { continue: true };
               }
               return {
                 hookSpecificOutput: {
                   hookEventName: "PreToolUse",
-                  permissionDecision: "deny",
-                  permissionDecisionReason: VAULT_BROKER_REDIRECT_ERROR
+                  updatedInput: withVault
                 }
               };
             }
@@ -3306,7 +3321,7 @@ import { createRequire } from "module";
 import { dirname as dirname6, join as join11 } from "path";
 
 // ../../packages/core/src/version.ts
-var NEGOTIUM_VERSION = "0.1.19";
+var NEGOTIUM_VERSION = "0.1.21";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
 var NEGOTIUM_MODEL_CATALOG = "negotium-model-catalog.json";
@@ -3941,14 +3956,12 @@ function buildMaestroDisallowedTools(callerDisallowedTools = []) {
 function buildVaultHook(userId) {
   return {
     name: "vault-guard",
-    pre({ toolName, input }) {
+    pre({ input }) {
       if (referencesHostedSecretStorage(input)) {
         return { decision: "block", error: "Runtime secret storage access is not permitted" };
       }
-      if (shouldRedirectHostedVaultTool(userId, toolName, input)) {
-        return { decision: "block", error: VAULT_BROKER_REDIRECT_ERROR };
-      }
-      return { decision: "allow" };
+      const substituted = deepMapStrings(input, (value) => substituteHostedSecrets(userId, value));
+      return JSON.stringify(substituted) === JSON.stringify(input) ? { decision: "allow" } : { decision: "modify", input: substituted };
     },
     post({ output }) {
       const redacted = redactHostedSecrets(userId, output);
@@ -4405,6 +4418,86 @@ var WsHub = {
 // ../../packages/core/src/prompts/builders.ts
 import { readFileSync as readFileSync9 } from "fs";
 import { resolve as resolve5 } from "path";
+
+// ../../packages/core/src/agents/model-catalog.ts
+var CODEX_PRO_20X_COST = "ChatGPT Pro 20x subscription: $200/month";
+var CODEX_COMMUNITY_WEEKLY = "Community plan-level observation: roughly 2\u20134B raw/cached tokens per week; fresh-input equivalent is much lower and unstable (low confidence)";
+var CLAUDE_MAX_20X_COST = "Claude Max 20x subscription: $200/month";
+var CLAUDE_COMMUNITY_SESSION = "Community observations vary from roughly 220\u2013250K locally displayed tokens per 5-hour session to billions of cache-heavy raw tokens per week; calibrated reports value a full weekly allowance around $680\u2013$1,900 at API rates. Recent heavy-model reports reach the weekly cap after about 4\u20135 full sessions (low confidence; not a token cap)";
+var SELECTABLE_MODELS = [
+  {
+    model: "gpt-5.6-sol",
+    agent: "codex",
+    description: "Highest-capability Codex route for the hardest agentic coding work.",
+    intelligenceTier: "fable",
+    routingSummary: "hardest coding work; 5x Codex quota cost",
+    accessCost: CODEX_PRO_20X_COST,
+    marginalTokenCost: "Codex credits: $5/M uncached input, $0.50/M cached input, $30/M output",
+    estimatedUsage: `Official Pro 20x range: 300\u20131,800 local messages per 5 hours; quota weight 5x Luna. ${CODEX_COMMUNITY_WEEKLY}`
+  },
+  {
+    model: "gpt-5.6-terra",
+    agent: "codex",
+    description: "High-capability Codex route for complex coding and reasoning.",
+    intelligenceTier: "opus",
+    routingSummary: "complex coding and reasoning; 2.5x Codex quota cost",
+    accessCost: CODEX_PRO_20X_COST,
+    marginalTokenCost: "Codex credits: $2.50/M uncached input, $0.25/M cached input, $15/M output",
+    estimatedUsage: `Official Pro 20x range: 400\u20132,200 local messages per 5 hours; quota weight 2.5x Luna. ${CODEX_COMMUNITY_WEEKLY}`
+  },
+  {
+    model: "gpt-5.6-luna",
+    agent: "codex",
+    description: "Default Codex route with strong everyday coding intelligence.",
+    intelligenceTier: "sonnet",
+    routingSummary: "everyday coding default; lowest Codex quota cost (1x)",
+    accessCost: CODEX_PRO_20X_COST,
+    marginalTokenCost: "Codex credits: $1/M uncached input, $0.10/M cached input, $6/M output",
+    estimatedUsage: `Official Pro 20x range: 1,000\u20135,600 local messages per 5 hours; lowest Codex quota weight (1x). ${CODEX_COMMUNITY_WEEKLY}`
+  },
+  {
+    model: "fable",
+    agent: "claude",
+    description: "Highest-capability Claude route for the hardest and longest-running tasks.",
+    intelligenceTier: "fable",
+    routingSummary: "hardest long-running work; highest Claude cost; explicit request only",
+    accessCost: CLAUDE_MAX_20X_COST,
+    marginalTokenCost: "Claude API/extra usage: $10/M input, $12.50/M cache write, $1/M cache read, $50/M output",
+    estimatedUsage: `${CLAUDE_COMMUNITY_SESSION}; Fable drains weighted quota fastest, so use only on explicit user request. No stable per-model token cap is published.`
+  },
+  {
+    model: "opus",
+    agent: "claude",
+    description: "High-capability Claude route for complex reasoning and tool-heavy work.",
+    intelligenceTier: "opus",
+    routingSummary: "complex reasoning and tool-heavy work; about 2.5x Sonnet marginal cost",
+    accessCost: CLAUDE_MAX_20X_COST,
+    marginalTokenCost: "Claude API/extra usage: $5/M input, $6.25/M cache write, $0.50/M cache read, $25/M output",
+    estimatedUsage: `${CLAUDE_COMMUNITY_SESSION}; Opus uses the shared all-model weekly pool more quickly than Sonnet. No stable per-model token cap is published.`
+  },
+  {
+    model: "sonnet",
+    agent: "claude",
+    description: "Default Claude route for capable, efficient everyday work.",
+    intelligenceTier: "sonnet",
+    routingSummary: "capable everyday default; lowest Claude model cost",
+    accessCost: CLAUDE_MAX_20X_COST,
+    marginalTokenCost: "Claude API/extra usage introductory rate: $2/M input, $2.50/M cache write, $0.20/M cache read, $10/M output through 2026-08-31; then $3/M input and $15/M output",
+    estimatedUsage: `${CLAUDE_COMMUNITY_SESSION}; Sonnet also has a separate weekly allowance and normally provides the highest Claude throughput. No stable weekly token cap is published.`
+  },
+  {
+    model: "deepseek-pro",
+    agent: "maestro",
+    description: "API-priced Sonnet-level route for cost-efficient everyday work.",
+    intelligenceTier: "sonnet",
+    routingSummary: "cost-efficient everyday work; pay-per-token and cheapest route",
+    accessCost: "DeepSeek V4 Pro pay-as-you-go API; no monthly subscription required",
+    marginalTokenCost: "DeepSeek API: $0.435/M uncached input, $0.003625/M cached input, $0.87/M output",
+    estimatedUsage: "No subscription token cap; pay per token. Official account concurrency limit is 500 requests."
+  }
+];
+
+// ../../packages/core/src/prompts/builders.ts
 var PROMPTS_DIR = resolve5(PROJECT_ROOT, "src/prompts");
 var SESSIONS_DIR = resolve5(PROMPTS_DIR, "sessions");
 function loadAgentPrompt(filename) {
@@ -5138,7 +5231,6 @@ function ensurePersonalGeneral(userId) {
 
 // ../../packages/core/src/agents/archiver.ts
 var MAX_BRIEF_ENTRIES = 8;
-var MIN_ARCHIVE_MESSAGES = 4;
 var MAX_SESSION_STEPS = 20;
 var activeArchiverSessions = new Map;
 function boundedSessionText(value) {
@@ -5166,10 +5258,6 @@ function getArchiverDef() {
 }
 function runArchiverTurn(params) {
   const { userId, topicId, topicTitle, archivePath, messageCount, mode = "deleted-topic" } = params;
-  if (mode !== "active-topic" && messageCount < MIN_ARCHIVE_MESSAGES) {
-    logger.info({ userId, topicTitle, messageCount, min: MIN_ARCHIVE_MESSAGES }, "archiver: skipped \u2014 too few messages to distil");
-    return false;
-  }
   let archiverDef;
   try {
     archiverDef = getArchiverDef();
@@ -5378,6 +5466,25 @@ ${rolled.join(`
   }
 }
 
+// ../../packages/core/src/agents/memory-archive-policy.ts
+function countMemoryArchiveExchanges(rows) {
+  let waitingForAssistant = false;
+  let completed = 0;
+  for (const row of rows) {
+    const assistant = row.author_id === "ai" || Boolean(row.agent_type);
+    const conversational = row.kind == null || row.kind === "message";
+    if (!assistant && row.author_id !== "system" && conversational) {
+      waitingForAssistant = true;
+      continue;
+    }
+    if (assistant && conversational && waitingForAssistant) {
+      completed++;
+      waitingForAssistant = false;
+    }
+  }
+  return completed;
+}
+
 // ../../packages/core/src/storage/runtime-leases.ts
 import { randomUUID as randomUUID5 } from "crypto";
 
@@ -5867,8 +5974,9 @@ function archiveTopicMessages(topicId, topicTitle, options = {}) {
       counter++;
     }
   }
-  logger.info({ topicId, topicTitle, archive: path, messageCount: rows.length, lastRowid }, "archiveTopicMessages: archived topic messages");
-  return { path, messageCount: rows.length, lastRowid };
+  const exchangeCount = countMemoryArchiveExchanges(rows);
+  logger.info({ topicId, topicTitle, archive: path, messageCount: rows.length, exchangeCount, lastRowid }, "archiveTopicMessages: archived topic messages");
+  return { path, messageCount: rows.length, exchangeCount, lastRowid };
 }
 
 // ../../packages/core/src/storage/topic-archive-state.ts
@@ -6065,6 +6173,7 @@ function archiveActiveTopicForMemory(topicId, userId, options) {
   if (!options.allowMentionOnly && topic.aiMode === "mention")
     return "mention-only-channel";
   let skipped = "empty";
+  let skipMemoryTurn = false;
   const claim = claimTopicArchiveJob(topicId, (afterRowid) => {
     const pending = getMessagesForTopicAfterRowid(topicId, afterRowid);
     const minMessages = options.minMessages;
@@ -6073,6 +6182,8 @@ function archiveActiveTopicForMemory(topicId, userId, options) {
       logger.debug({ topicId, topicTitle: topic.title, pending: pending.length, minMessages }, "topic-memory-archiver: skipped below threshold");
       return null;
     }
+    const exchangeCount = countMemoryArchiveExchanges(pending);
+    skipMemoryTurn = options.minExchanges !== undefined && exchangeCount < options.minExchanges;
     const archived = (options.archiveMessages ?? archiveTopicMessages)(topicId, topic.title, {
       afterRowid,
       reason: options.reason
@@ -6090,6 +6201,18 @@ function archiveActiveTopicForMemory(topicId, userId, options) {
   if (claim.kind === "busy")
     return "busy";
   const { job } = claim;
+  if (skipMemoryTurn) {
+    settleTopicArchiveJob(topicId, job.archivePath, true);
+    logger.info({
+      topicId,
+      topicTitle: topic.title,
+      messageCount: job.messageCount,
+      minExchanges: options.minExchanges,
+      archive: job.archivePath,
+      reason: options.reason
+    }, "topic-memory-archiver: raw snapshot preserved below exchange threshold");
+    return "below-threshold";
+  }
   const memoryTopic = getTopicMemoryOrigin(topicId) ?? topic;
   const launched = (options.launchArchiver ?? runArchiverTurn)({
     userId,
@@ -6242,4 +6365,4 @@ export {
   VAULT_BROKER_REDIRECT_ERROR
 };
 
-//# debugId=305266BD0EF55A1F64756E2164756E21
+//# debugId=AF4B0BAEC1BE82AE64756E2164756E21