@code-yeongyu/senpi 2026.7.14 → 2026.7.16-3

package/dist/core/agent-session.js

@@ -31,6 +31,7 @@ import { createToolHtmlRenderer } from "./export-html/tool-renderer.js";
 import { ExecuteToolError, ExtensionRunner, wrapRegisteredTools, } from "./extensions/index.js";
 import { emitSessionShutdownEvent } from "./extensions/runner.js";
 import { filterContextExcludedMessages } from "./messages.js";
+import { ModelRegistry } from "./model-registry.js";
 import { getModelNarrowingPatterns, resolveModelScope } from "./model-resolver.js";
 import { expandPromptTemplate } from "./prompt-templates.js";
 import { buildSessionContext, CURRENT_SESSION_VERSION, getLatestCompactionEntry, } from "./session-manager.js";
@@ -56,6 +57,14 @@ export function parseSkillBlock(text) {
         userMessage: match[4]?.trim() || undefined,
     };
 }
+// ============================================================================
+// Types
+// ============================================================================
+function withoutDeletedHeaders(headers) {
+    return headers
+        ? Object.fromEntries(Object.entries(headers).filter((entry) => entry[1] !== null))
+        : undefined;
+}
 class CompactionRejectedError extends Error {
     constructor(rejectionCause) {
         super(rejectionCause === "cancelled-by-extension" ? "Compaction cancelled" : "Compaction rejected");
@@ -63,6 +72,12 @@ class CompactionRejectedError extends Error {
         this.rejectionCause = rejectionCause;
     }
 }
+class MissingModelAccessError extends Error {
+    constructor() {
+        super("AgentSession requires modelRuntime or modelRegistry");
+        this.name = "MissingModelAccessError";
+    }
+}
 function estimateMessagesTokens(messages) {
     let tokens = 0;
     for (const message of messages) {
@@ -148,7 +163,12 @@ export class AgentSession {
         this._resourceLoader = config.resourceLoader;
         this._customTools = config.customTools ?? [];
         this._cwd = config.cwd;
-        this._modelRegistry = config.modelRegistry;
+        const modelRuntime = config.modelRuntime ?? config.modelRegistry?.modelRuntime;
+        if (!modelRuntime) {
+            throw new MissingModelAccessError();
+        }
+        this._modelRuntime = modelRuntime;
+        this._modelRegistry = config.modelRegistry ?? new ModelRegistry(modelRuntime);
         this._extensionRunnerRef = config.extensionRunnerRef;
         this._initialActiveToolNames = config.initialActiveToolNames;
         this._allowedToolNames = config.allowedToolNames ? new Set(config.allowedToolNames) : undefined;
@@ -169,22 +189,33 @@ export class AgentSession {
             includeAllExtensionTools: true,
         });
     }
-    /** Model registry for API key resolution and model discovery */
+    get modelRuntime() {
+        return this._modelRuntime;
+    }
     get modelRegistry() {
         return this._modelRegistry;
     }
     async _getRequiredRequestAuth(model) {
-        const result = await this._modelRegistry.getApiKeyAndHeaders(model);
-        if (!result.ok) {
-            if (result.error.startsWith("No API key found")) {
+        let result;
+        try {
+            result = await this._modelRuntime.getAuth(model);
+        }
+        catch (error) {
+            const cause = error instanceof Error ? error.cause : undefined;
+            if (cause instanceof Error && cause.message === "authHeader requires a resolved API key") {
                 throw new Error(formatNoApiKeyFoundMessage(model.provider));
             }
-            throw new Error(result.error);
+            throw error;
         }
-        if (result.apiKey) {
-            return { apiKey: result.apiKey, headers: result.headers, extraBody: result.extraBody, env: result.env };
+        if (result?.auth.apiKey) {
+            return {
+                apiKey: result.auth.apiKey,
+                headers: withoutDeletedHeaders(result.auth.headers),
+                extraBody: this._modelRuntime.getCompatibilityRequestConfig(model).extraBody,
+                env: result.env,
+            };
         }
-        const isOAuth = this._modelRegistry.isUsingOAuth(model);
+        const isOAuth = this._modelRuntime.isUsingOAuth(model.provider);
         if (isOAuth) {
             throw new Error(`Authentication failed for "${model.provider}". ` +
                 `Credentials may have expired or network is unavailable. ` +
@@ -196,10 +227,21 @@ export class AgentSession {
         if (this.agent.streamFn === streamSimple) {
             return this._getRequiredRequestAuth(model);
         }
-        const result = await this._modelRegistry.getApiKeyAndHeaders(model);
-        return result.ok
-            ? { apiKey: result.apiKey, headers: result.headers, extraBody: result.extraBody, env: result.env }
-            : {};
+        const compatibility = this._modelRuntime.getCompatibilityRequestConfig(model);
+        try {
+            const result = await this._modelRuntime.getAuth(model);
+            return result
+                ? {
+                    apiKey: result.auth.apiKey,
+                    headers: withoutDeletedHeaders(result.auth.headers),
+                    extraBody: compatibility.extraBody,
+                    env: result.env,
+                }
+                : { extraBody: compatibility.extraBody };
+        }
+        catch {
+            return { extraBody: compatibility.extraBody };
+        }
     }
     /**
      * Install tool hooks once on the Agent instance.
@@ -888,7 +930,7 @@ export class AgentSession {
         this._favoriteModels = favoriteModels;
     }
     _getCurrentFavoriteModels() {
-        const availableById = new Map(this._modelRegistry.getAvailable().map((model) => [`${model.provider}/${model.id}`, model]));
+        const availableById = new Map(this._modelRuntime.getAvailableSnapshot().map((model) => [`${model.provider}/${model.id}`, model]));
         const narrowedModelIds = this._scopedModels.length > 0
             ? new Set(this._scopedModels.map((scoped) => `${scoped.model.provider}/${scoped.model.id}`))
             : undefined;
@@ -1055,8 +1097,10 @@ export class AgentSession {
             if (!this.model) {
                 throw new Error(formatNoModelSelectedMessage());
             }
-            if (!this._modelRegistry.hasConfiguredAuth(this.model)) {
-                const isOAuth = this._modelRegistry.isUsingOAuth(this.model);
+            const hasConfiguredAuth = this._modelRuntime.hasConfiguredAuth(this.model.provider) ||
+                (await this._modelRuntime.checkAuth(this.model.provider)) !== undefined;
+            if (!hasConfiguredAuth) {
+                const isOAuth = this._modelRuntime.isUsingOAuth(this.model.provider);
                 if (isOAuth) {
                     throw new Error(`Authentication failed for "${this.model.provider}". ` +
                         `Credentials may have expired or network is unavailable. ` +
@@ -1527,7 +1571,7 @@ export class AgentSession {
      * @throws Error if no auth is configured for the model
      */
     async setModel(model) {
-        if (!this._modelRegistry.hasConfiguredAuth(model)) {
+        if (!(await this._modelRuntime.checkAuth(model.provider))) {
             throw new Error(`No API key for ${model.provider}/${model.id}`);
         }
         const previousModel = this.model;
@@ -1822,6 +1866,7 @@ export class AgentSession {
     }
     async _executeCompaction(request) {
         const finishCompactionWork = this._sessionWorkBarrier.begin();
+        const agentMessagesAtStart = request.agentMessagesAtStart ?? this.agent.state.messages.slice();
         try {
             if (!this.model) {
                 throw new Error(formatNoModelSelectedMessage());
@@ -1880,7 +1925,12 @@ export class AgentSession {
                 throw new Error("Compaction entry was not saved");
             }
             const sessionContext = this.sessionManager.buildSessionContext();
-            this.agent.state.messages = sessionContext.messages;
+            const currentAgentMessages = this.agent.state.messages;
+            const hasUnchangedPrefix = agentMessagesAtStart.every((message, index) => currentAgentMessages[index] === message);
+            const messagesAppendedDuringCompaction = hasUnchangedPrefix
+                ? currentAgentMessages.slice(agentMessagesAtStart.length)
+                : [];
+            this.agent.state.messages = [...sessionContext.messages, ...messagesAppendedDuringCompaction];
             compactionResult.estimatedTokensAfter = estimateMessagesTokens(sessionContext.messages);
             this._incrementMessageRevision();
             await this._extensionRunner.emit({
@@ -1977,7 +2027,7 @@ export class AgentSession {
         // to a larger-context model (e.g. codex) - the overflow error from the old model
         // shouldn't trigger compaction for the new model.
         const sameModel = this.model &&
-            isSameOverflowSource(assistantMessage, this.model, this._modelRegistry.getUpstreamModelId(this.model));
+            isSameOverflowSource(assistantMessage, this.model, this._modelRuntime.getCompatibilityRequestConfig(this.model).upstreamModelId);
         // Skip compaction checks if this assistant message is older than the latest
         // compaction boundary. This prevents a stale pre-compaction usage/error
         // from retriggering compaction on the first prompt after compaction.
@@ -2128,6 +2178,7 @@ export class AgentSession {
      */
     async _runAutoCompaction(reason, willRetry) {
         const finishCompactionWork = this._sessionWorkBarrier.begin();
+        const agentMessagesAtStart = this.agent.state.messages.slice();
         this._emit({ type: "compaction_start", reason });
         const autoCompactionController = new AbortController();
         this._autoCompactionAbortController = autoCompactionController;
@@ -2144,8 +2195,8 @@ export class AgentSession {
                 });
                 return false;
             }
-            const authResult = await this._modelRegistry.getApiKeyAndHeaders(this.model);
-            if (this.agent.streamFn === streamSimple && (!authResult.ok || !authResult.apiKey)) {
+            const authResult = await this._modelRuntime.getAuth(this.model);
+            if (this.agent.streamFn === streamSimple && !authResult?.auth.apiKey) {
                 if (reason === "overflow")
                     this._overflowRecoveryAttempted = false;
                 this._emit({
@@ -2170,7 +2221,7 @@ export class AgentSession {
                 });
                 return false;
             }
-            const execution = await this._executeCompaction({ reason, willRetry });
+            const execution = await this._executeCompaction({ reason, willRetry, agentMessagesAtStart });
             if (!execution.accepted) {
                 if (reason === "overflow")
                     this._overflowRecoveryAttempted = false;
@@ -2317,7 +2368,7 @@ export class AgentSession {
         if (!currentModel) {
             return;
         }
-        const refreshedModel = this._modelRegistry.find(currentModel.provider, currentModel.id);
+        const refreshedModel = this._modelRuntime.getModel(currentModel.provider, currentModel.id);
         if (!refreshedModel || refreshedModel === currentModel) {
             return;
         }
@@ -2387,7 +2438,7 @@ export class AgentSession {
             refreshTools: () => this._refreshToolRegistry(),
             getCommands,
             setModel: async (model) => {
-                if (!this.modelRegistry.hasConfiguredAuth(model))
+                if (!this._modelRuntime.hasConfiguredAuth(model.provider))
                     return false;
                 await this.setModel(model);
                 return true;
@@ -2471,11 +2522,11 @@ export class AgentSession {
             getSystemPromptOptions: () => this._baseSystemPromptOptions,
         }, {
             registerProvider: (name, config) => {
-                this._modelRegistry.registerProvider(name, config);
+                this._modelRuntime.registerProvider(name, config);
                 this._refreshCurrentModelFromRegistry();
             },
             unregisterProvider: (name) => {
-                this._modelRegistry.unregisterProvider(name);
+                this._modelRuntime.unregisterProvider(name);
                 this._refreshCurrentModelFromRegistry();
             },
         });
@@ -2598,11 +2649,11 @@ export class AgentSession {
         await this.settingsManager.reload();
         this.syncQueueModesFromSettings();
         resetApiProviders();
-        this._modelRegistry.refresh();
+        await this._modelRuntime.reloadConfig();
         this.setScopedModels(await resolveModelScope(getModelNarrowingPatterns({
             legacyEnabledPatterns: this.settingsManager.getEnabledModels(),
-        }), this._modelRegistry));
-        this.setFavoriteModels(await resolveModelScope(this.settingsManager.getFavoriteModels() ?? [], this._modelRegistry));
+        }), this._modelRuntime));
+        this.setFavoriteModels(await resolveModelScope(this.settingsManager.getFavoriteModels() ?? [], this._modelRuntime));
         await this._resourceLoader.reload();
         this._buildRuntime({
             activeToolNames: this.getActiveToolNames(),
@@ -2965,7 +3016,7 @@ export class AgentSession {
             let summaryDetails;
             if (options.summarize && entriesToSummarize.length > 0 && !extensionSummary) {
                 const model = this.model;
-                const { apiKey, headers, extraBody, env } = await this._getRequiredRequestAuth(model);
+                const { apiKey, headers, extraBody, env } = await this._getCompactionRequestAuth(model);
                 const branchSummarySettings = this.settingsManager.getBranchSummarySettings();
                 const result = await generateBranchSummary(entriesToSummarize, {
                     model,