longer-agent 0.1.0 → 0.1.2

package/dist/session.js

@@ -16,7 +16,7 @@ import { Agent, isNoReply, NO_REPLY_MARKER } from "./agents/agent.js";
 import { createEphemeralLogState } from "./ephemeral-log.js";
 import { allocateContextId, stripContextTags, ContextTagStripBuffer } from "./context-rendering.js";
 import { generateShowContext } from "./show-context.js";
-import { getThinkingLevels, getModelMaxOutputTokens } from "./config.js";
+import { getThinkingLevels } from "./config.js";
 import { ToolResult } from "./providers/base.js";
 import { SPAWN_AGENT_TOOL, KILL_AGENT_TOOL, CHECK_STATUS_TOOL, WAIT_TOOL, SHOW_CONTEXT_TOOL, SUMMARIZE_CONTEXT_TOOL, ASK_TOOL, PLAN_TOOL, } from "./tools/comm.js";
 import { buildBashEnv, executeTool, } from "./tools/basic.js";
@@ -30,7 +30,7 @@ import { LogIdAllocator, createSystemPrompt, createTurnStart, createUserMessage
 import { projectToApiMessages } from "./log-projection.js";
 import { archiveWindow, createGlobalTuiPreferences, createLogSessionMeta, } from "./persistence.js";
 import { resolvePersistedModelSelection, } from "./model-selection.js";
-import { DEFAULT_THRESHOLDS, computeHysteresisThresholds, } from "./settings.js";
+import { DEFAULT_THRESHOLDS, } from "./settings.js";
 // ------------------------------------------------------------------
 // Constants
 // ------------------------------------------------------------------
@@ -211,8 +211,8 @@ export class Session {
     _thresholds = { ...DEFAULT_THRESHOLDS };
     _hintResetNone = DEFAULT_THRESHOLDS.summarize_hint_level1 / 100 - 0.20;
     _hintResetLevel1 = (DEFAULT_THRESHOLDS.summarize_hint_level1 + DEFAULT_THRESHOLDS.summarize_hint_level2) / 200;
-    // Global max_output_tokens override from settings.json
-    _settingsMaxOutputTokens;
+    // Context window multiplier (0.0–1.0). Effective context = contextLength × _contextRatio.
+    _contextRatio = 1.0;
     // Hint compression (two-tier state machine)
     _hintState = "none";
     // show_context: number of remaining rounds where annotations are active
@@ -275,19 +275,18 @@ export class Session {
         this._progress = opts.progress;
         this._mcpManager = opts.mcpManager;
         this._promptsDirs = opts.promptsDirs;
-        // Apply user settings (thresholds + max_output_tokens)
-        if (opts.settings) {
-            this._applySettings(opts.settings);
+        // Apply context ratio
+        if (opts.contextRatio !== undefined) {
+            this._contextRatio = Math.max(0.01, Math.min(1.0, opts.contextRatio));
         }
         // Attach store if provided (must be set before _initConversation)
         if (opts.store) {
             this._store = opts.store;
         }
         // Resolve path variables
-        const pathOverrides = opts.config.pathOverrides;
-        this._projectRoot = pathOverrides.projectRoot ?? process.cwd();
-        this._sessionArtifactsOverride = pathOverrides.sessionArtifacts ?? "";
-        this._systemData = pathOverrides.systemData ?? "";
+        this._projectRoot = process.cwd();
+        this._sessionArtifactsOverride = "";
+        this._systemData = "";
         this._createdAt = new Date().toISOString();
         this._initConversation();
         this._toolExecutors = this._buildToolExecutors();
@@ -318,26 +317,10 @@ export class Session {
         this._appendEntry(createSystemPrompt(this._nextLogId("system_prompt"), systemPrompt), false);
     }
     /**
-     * Apply resolved user settings (thresholds + max_output_tokens).
+     * Effective context length for a given ModelConfig, scaled by context ratio.
      */
-    _applySettings(s) {
-        this._thresholds = { ...s.thresholds };
-        const hysteresis = computeHysteresisThresholds(s.thresholds);
-        this._hintResetNone = hysteresis.hintResetNone / 100;
-        this._hintResetLevel1 = hysteresis.hintResetLevel1 / 100;
-        this._settingsMaxOutputTokens = s.maxOutputTokens;
-        // Apply to current primary agent's model config
-        this._applyMaxOutputTokensOverride(this.primaryAgent.modelConfig);
-    }
-    /**
-     * Effective maxTokens for a given ModelConfig, taking settings override into account.
-     * Clamps to [4096, modelMaxOutputTokens].
-     */
-    _effectiveMaxTokens(mc) {
-        if (this._settingsMaxOutputTokens === undefined)
-            return mc.maxTokens;
-        const modelMax = getModelMaxOutputTokens(mc.model);
-        return Math.max(4096, Math.min(this._settingsMaxOutputTokens, modelMax ?? mc.maxTokens));
+    _effectiveContextLength(mc) {
+        return Math.round(mc.contextLength * this._contextRatio);
     }
     // ==================================================================
     // Message infrastructure
@@ -790,7 +773,6 @@ export class Session {
         const restoredThinkingPreference = meta.thinkingLevel ?? "default";
         const restoredCachePreference = meta.cacheHitEnabled ?? true;
         this._resetTransientState();
-        this._applyMaxOutputTokensOverride(restoredModelConfig);
         this.primaryAgent.replaceModelConfig(restoredModelConfig);
         this._persistedModelSelection = this._buildPersistedModelSelection({
             modelConfigName: restoredSelection.selectedConfigName,
@@ -969,6 +951,12 @@ export class Session {
     get skills() {
         return this._skills;
     }
+    get mcpManager() {
+        return this._mcpManager;
+    }
+    async ensureMcpReady() {
+        await this._ensureMcp();
+    }
     /** Read-only access to disabled skill names. */
     get disabledSkills() {
         return this._disabledSkills;
@@ -1145,7 +1133,6 @@ export class Session {
      */
     switchModel(modelConfigName) {
         const newModelConfig = this.config.getModel(modelConfigName);
-        this._applyMaxOutputTokensOverride(newModelConfig);
         this.primaryAgent.replaceModelConfig(newModelConfig);
         this._persistedModelSelection = this._buildPersistedModelSelection({
             modelConfigName,
@@ -1156,16 +1143,6 @@ export class Session {
         this._thinkingLevel = this._resolveThinkingLevelForModel(newModelConfig.model, this._preferredThinkingLevel);
         this._cacheHitEnabled = this._preferredCacheHitEnabled;
     }
-    /**
-     * If settings.json specifies max_output_tokens, clamp the ModelConfig.maxTokens
-     * to [4096, modelMaxOutputTokens]. This mutates the ModelConfig in place.
-     */
-    _applyMaxOutputTokensOverride(mc) {
-        if (this._settingsMaxOutputTokens === undefined)
-            return;
-        const modelMax = getModelMaxOutputTokens(mc.model) ?? mc.maxTokens;
-        mc.maxTokens = Math.max(4096, Math.min(this._settingsMaxOutputTokens, modelMax));
-    }
     applyGlobalPreferences(preferences) {
         const prefs = createGlobalTuiPreferences(preferences);
         this._preferredThinkingLevel = prefs.thinkingLevel;
@@ -1258,10 +1235,10 @@ export class Session {
     _armShowContextAnnotations() {
         const mc = this.primaryAgent.modelConfig;
         const provider = this.primaryAgent._provider;
-        const effectiveMax = this._effectiveMaxTokens(mc);
+        const effectiveMax = mc.maxTokens;
         const budget = provider.budgetCalcMode === "full_context"
-            ? mc.contextLength
-            : mc.contextLength - effectiveMax;
+            ? this._effectiveContextLength(mc)
+            : this._effectiveContextLength(mc) - effectiveMax;
         const result = generateShowContext(this._log, this._lastInputTokens, budget);
         this._showContextRoundsRemaining = 1;
         this._showContextAnnotations = result.annotations;
@@ -2269,9 +2246,9 @@ export class Session {
         }
         const mc = this.primaryAgent.modelConfig;
         const provider = this.primaryAgent._provider;
-        const effectiveMax = this._effectiveMaxTokens(mc);
+        const effectiveMax = mc.maxTokens;
         const budget = provider.budgetCalcMode === "full_context"
-            ? mc.contextLength : mc.contextLength - effectiveMax;
+            ? this._effectiveContextLength(mc) : this._effectiveContextLength(mc) - effectiveMax;
         const result = generateShowContext(this._log, this._lastInputTokens, budget);
         this._showContextRoundsRemaining = 1;
         this._showContextAnnotations = result.annotations;
@@ -2875,10 +2852,10 @@ export class Session {
             return undefined;
         const mc = this.primaryAgent.modelConfig;
         const provider = this.primaryAgent._provider;
-        const effectiveMax = this._effectiveMaxTokens(mc);
+        const effectiveMax = mc.maxTokens;
         const budget = provider.budgetCalcMode === "full_context"
-            ? mc.contextLength
-            : mc.contextLength - effectiveMax;
+            ? this._effectiveContextLength(mc)
+            : this._effectiveContextLength(mc) - effectiveMax;
         if (budget <= 0)
             return undefined;
         const compactOutputRatio = this._thresholds.compact_output / 100;
@@ -2992,9 +2969,9 @@ export class Session {
             return;
         const mc = this.primaryAgent.modelConfig;
         const provider = this.primaryAgent._provider;
-        const effectiveMax = this._effectiveMaxTokens(mc);
+        const effectiveMax = mc.maxTokens;
         const budget = provider.budgetCalcMode === "full_context"
-            ? mc.contextLength : mc.contextLength - effectiveMax;
+            ? this._effectiveContextLength(mc) : this._effectiveContextLength(mc) - effectiveMax;
         if (budget <= 0)
             return;
         const ratio = this._lastInputTokens / budget;
@@ -3018,9 +2995,9 @@ export class Session {
     _updateHintStateAfterApiCall() {
         const mc = this.primaryAgent.modelConfig;
         const provider = this.primaryAgent._provider;
-        const effectiveMax = this._effectiveMaxTokens(mc);
+        const effectiveMax = mc.maxTokens;
         const budget = provider.budgetCalcMode === "full_context"
-            ? mc.contextLength : mc.contextLength - effectiveMax;
+            ? this._effectiveContextLength(mc) : this._effectiveContextLength(mc) - effectiveMax;
         if (budget <= 0)
             return;
         const ratio = this._lastInputTokens / budget;
@@ -3914,9 +3891,6 @@ export class Session {
                 "and conclusions.";
     }
     _getSubAgentModelConfig() {
-        const name = this.config.subAgentModelName;
-        if (name)
-            return this.config.getModel(name);
         return this.primaryAgent.modelConfig;
     }
     _buildSubAgentContext(includeImportantLog) {
@@ -4203,10 +4177,10 @@ export class Session {
     _buildSubAgentCompactCheck(agent) {
         const mc = agent.modelConfig;
         const provider = agent._provider;
-        const effectiveMax = this._effectiveMaxTokens(mc);
+        const effectiveMax = mc.maxTokens;
         const budget = provider.budgetCalcMode === "full_context"
-            ? mc.contextLength
-            : mc.contextLength - effectiveMax;
+            ? this._effectiveContextLength(mc)
+            : this._effectiveContextLength(mc) - effectiveMax;
         if (budget <= 0)
             return undefined;
         const compactOutputRatio = this._thresholds.compact_output / 100;