@nexus-cortex/core 4.127.2 → 4.129.0

package/dist/orchestrator/CortexOrchestrator.js

@@ -46,7 +46,7 @@ import { CacheMetricsAccumulator } from '../session/CacheMetricsAccumulator.js';
 import { SubAgentProcessManager, createSubAgentProcessManager } from './SubAgentProcessManager.js';
 // Phase 1: Tool Architecture Refactor - Unified Tool Registry
 import { toolFactory } from '../tools/ToolFactory.js';
-import { resolveToolProfile, resolveToolAnchor, resolveFrameProfile, resolveLiftNudge, resolveLiftPlan, resolveEndTurnResolver, resolveHeadlessDropAskUser, resolveDeferredLoading, isNarrowProfile, isToolAllowedByProfile, applyToolProfile, webToolBlocked, resolveVisionHelperModel, resolveVisionHandoffMax, resolveSliceNudge, resolveSliceBlock, resolveSliceBlockAt, resolveSliceBlockMax } from '../tools/ToolProfile.js';
+import { resolveToolProfile, resolveToolAnchor, resolveFrameProfile, resolveLiftNudge, resolveLiftPlan, resolveEndTurnResolver, resolveHeadlessDropAskUser, resolveDeferredLoading, isNarrowProfile, isToolAllowedByProfile, applyToolProfile, webToolBlocked, resolveVisionHelperModel, resolveVisionHandoffMax, resolveSliceNudge, resolveSliceBlock, resolveSliceBlockAt, resolveSliceBlockMax, anchorAppliesToProcess } from '../tools/ToolProfile.js';
 import { sliceReadFile, decideSliceBlock, sliceReadStep } from './sliceBlock.js';
 import { TurnEvidence, evaluateEndTurnGates, buildMissingEndTurnReminder } from './endTurnGates.js';
 import { resolveCompactionResume, pickDropped, buildCompactionResumeReminder, isCompactionResumeMessage, resolveTaskText, resumeMemoryTargetTokens, coversAll, buildRollingSeedMessage, memoryIndexLine, upsertMemoryIndex, scaleEstimateToRequestView, approxCharsOf, anchoredRequestEstimate, resolveCompactionHandoffQA, resolveHandoffQAMaxQuestions, runHandoffQA } from './compactionResume.js';
@@ -85,6 +85,7 @@ import { classifyTask } from '../training/TaskClassifier.js';
 import { closestToolMatches } from './toolNameMatcher.js';
 import { classifyApiError } from './apiErrorClassifier.js';
 import { pinStaticSystemPrompt } from './staticSystemPromptPin.js';
+import { applyAllowlistKeepingCore } from './toolAllowlist.js';
 import { hasVisibleAssistantText, shouldForceSynthesis } from './assistantTextPresence.js';
 import { resolveTurnContractEnforce, checkTurnFormat, buildFormatRejectMessage, resolveActionPlanFields, ACTION_PLAN_TOOLS, planFieldsMissing, stripPlanFields, buildPlanFieldsRejectMessage } from './turnContractValidator.js'; // HB-TURN-CONTRACT-ENFORCE / R172
 import { computeToolBudgetSignal, isToolProgressStalled } from './toolBudgetSignal.js';
@@ -1687,6 +1688,8 @@ export class CortexOrchestrator {
     applyAnchorIfArmed(tools) {
         if (this.anchorLifted)
             return tools;
+        if (!anchorAppliesToProcess(process.env))
+            return tools; // R266: delegates never get the narrow frame
         const anchor = resolveToolAnchor(process.env, this.cardAnchorProfile);
         if (!anchor)
             return tools;
@@ -1696,7 +1699,7 @@ export class CortexOrchestrator {
      *  armed (pre-lift calls to hidden tools are refused like any hidden
      *  tool), the session profile after. */
     effectiveGuardProfile() {
-        if (!this.anchorLifted) {
+        if (!this.anchorLifted && anchorAppliesToProcess(process.env)) {
             const anchor = resolveToolAnchor(process.env, this.cardAnchorProfile);
             if (anchor)
                 return anchor;
@@ -3803,6 +3806,7 @@ export class CortexOrchestrator {
                     // armed anchor narrowed toolsToUse at assembly. (When deferred loading
                     // is on, the re-filter block below performs the rebuild.)
                     if (!this.anchorLifted &&
+                        anchorAppliesToProcess(process.env) &&
                         resolveToolAnchor(process.env, this.cardAnchorProfile) &&
                         // Persist frame (backlog item 5): the anchored surface IS the session
                         // surface — never lift, never deliver the deferred corpus.
@@ -4216,6 +4220,17 @@ export class CortexOrchestrator {
         const serverSideMetadata = extractServerSideMetadata(effectiveModel.provider, apiResponse.data);
         if (this.config.debug)
             console.log('[Orchestrator] Server-side metadata extracted:', serverSideMetadata ? 'YES' : 'NO');
+        // 2026-10-18: bank every provider server-side call as a decision event (engagement evidence + cost attribution). Before this the only
+        // trace of an x_thread_fetch was a text annotation in the merged message; usage.serverSideToolsUsed showed the LAST request only.
+        if (serverSideMetadata && serverSideMetadata.toolCalls.length > 0) {
+            const details = convertedResponse.usage?.serverSideToolUsageDetails;
+            for (const tc of serverSideMetadata.toolCalls) {
+                try {
+                    this.gateDeps().recordEvent('server_side_tool', { provider: effectiveModel.provider, name: tc.name, status: tc.status, args: String(tc.arguments ?? '').slice(0, 300), ...(details ? { details } : {}) }, tc.name);
+                }
+                catch { /* best-effort */ }
+            }
+        }
         if (serverSideMetadata && this.config.debug) {
             console.log('[Orchestrator] Server-side tool metadata detected:', {
                 autonomousExecution: serverSideMetadata.autonomousExecution,
@@ -5637,6 +5652,7 @@ export class CortexOrchestrator {
                 this.deliverPlateauInstructionAtBoot(); // R210 HB-PLATEAU-STOP — streaming mirror
                 // Anchor lift — streaming mirror of the sendMessage continuation path.
                 if (!this.anchorLifted &&
+                    anchorAppliesToProcess(process.env) &&
                     resolveToolAnchor(process.env, this.cardAnchorProfile) &&
                     // Persist frame (backlog item 5): the anchored surface IS the session
                     // surface — never lift, never deliver the deferred corpus.
@@ -6312,14 +6328,6 @@ export class CortexOrchestrator {
     getToolDefinitions() {
         return toolFactory.getAllTools();
     }
-    /**
-     * Normalize a tool name for whitelist matching: lowercase + strip non-
-     * alphanumerics so PascalCase canonical names match the lower/snake_case
-     * names used in agent definitions (e.g. `WebSearch` ≡ `web_search`).
-     */
-    static normalizeToolName(name) {
-        return name.toLowerCase().replace(/[^a-z0-9]/g, '');
-    }
     /**
      * Apply `config.allowedBaseTools` to the factory/base tool list. Returns the
      * list unchanged when no allowlist is configured. MCP/management/context
@@ -6346,11 +6354,7 @@ export class CortexOrchestrator {
         return this.getFrameRunner().step({ action: input, task: this.lastRealUserText(), elapsedMs, deadlineMs: this.turnDeadlineMsActive, cwd: this.config.workingDirectory || process.cwd(), sessionId: this.currentSessionId ?? 'session', signal, predictorModel: 'generator' });
     }
     applyBaseToolAllowlist(tools) {
-        const allow = this.config.allowedBaseTools;
-        if (!allow || allow.length === 0)
-            return tools;
-        const allowed = new Set(allow.map((t) => CortexOrchestrator.normalizeToolName(t)));
-        return tools.filter((t) => allowed.has(CortexOrchestrator.normalizeToolName(t.name)));
+        return applyAllowlistKeepingCore(tools, this.config.allowedBaseTools); // R266: SearchTools + EndTurn always survive
     }
     /**
      * Get adapter registry (for advanced use cases)
@@ -7087,6 +7091,16 @@ export class CortexOrchestrator {
      */
     noteRequestUsage(usage) {
         this.sessionUsage = addMainUsage(this.sessionUsage, usage); // R190: cumulative first — the anchor logic below skips zero usage
+        // 2026-10-18: one server_side_tool event PER REQUEST that ran provider server-side tools (count + xAI's per-family details).
+        // This hook sees every main request; the Phase 2.4 per-call events see only the turn's final response.
+        const sst = Number(usage?.serverSideToolsUsed ?? 0);
+        if (sst > 0) {
+            const details = usage?.serverSideToolUsageDetails;
+            try {
+                this.gateDeps().recordEvent('server_side_tool', { count: sst, ...(details ? { details } : {}) }, 'server_side_tools');
+            }
+            catch { /* best-effort */ }
+        }
         const promptTokens = Number(usage?.inputTokens ?? 0);
         if (!(promptTokens > 0))
             return;
@@ -8503,10 +8517,15 @@ export class CortexOrchestrator {
         // model gets an unambiguous, server-qualified handle. Without prefixing,
         // bare names like `browse` collide with the model's PascalCase native
         // tool conventions and tools across servers can shadow each other.
+        // R266: a server named in CORTEX_MCP_AUTOCONNECT was asked for explicitly (the Browse delegate's
+        // envOverrides) — its tools are ESSENTIAL so the deferred filter cannot strip them; other MCP tools
+        // keep no tier (deferred as before).
+        const pinnedServers = new Set((process.env.CORTEX_MCP_AUTOCONNECT ?? '').split(',').map((x) => x.trim()).filter(Boolean));
         return mcpTools.map(tool => ({
             name: prefixMcpToolName(tool.serverName, tool.name),
             description: tool.description || `MCP tool from ${tool.serverName}`,
             schema: tool.inputSchema || { type: 'object', properties: {} },
+            ...(pinnedServers.has(tool.serverName) ? { discoveryTier: 'essential' } : {}),
             metadata: {
                 source: 'mcp',
                 serverName: tool.serverName,
@@ -8898,8 +8917,11 @@ export class CortexOrchestrator {
         const { runtime, reason } = await this.resolveSubAgentRuntimeFor(input);
         if (this.config.debug)
             console.log(`[SubAgent] runtime ${runtime} (${reason})`);
+        // R266b: the delegate inherits the parent's approval mode — auto-approving parents (headless, one-shot, TUI yolo)
+        // must not leave a child blocked on an approval the operator never sees; interactive parents keep the IPC forward.
+        const permissionMode = this.approvalMode?.autoApproveActions === true ? 'auto' : 'interactive';
         if (runtime !== 'herdr')
-            return processManager.spawnAgent(agentDef, taskPrompt, options);
+            return processManager.spawnAgent(agentDef, taskPrompt, { ...options, permissionMode });
         const name = sanitizeHerdrAgentName(`${agentDef.name}-${randomBytes(2).toString('hex')}`);
         const result = await runDelegateInHerdr({
             agentDef,