@codingame/monaco-vscode-api 37.6.0 → 38.0.0

package/vscode/src/vs/sessions/contrib/providers/agentHost/browser/baseAgentHostSessionsProvider.d.ts

@@ -2,17 +2,19 @@ import { CancellationToken } from "../../../../../base/common/cancellation.js";
 import { Emitter, Event } from "../../../../../base/common/event.js";
 import { IMarkdownString } from "../../../../../base/common/htmlContent.js";
 import { Disposable, DisposableMap, DisposableStore, IDisposable } from "../../../../../base/common/lifecycle.js";
-import { IObservable, ISettableObservable, ITransaction } from "../../../../../base/common/observable.js";
+import { IObservable, IReader, ISettableObservable, ITransaction } from "../../../../../base/common/observable.js";
 import { ThemeIcon } from "../../../../../base/common/themables.js";
 import { URI } from "../../../../../base/common/uri.js";
-import { AuthenticateParams, AuthenticateResult, IAgentSessionMetadata } from "../../../../../platform/agentHost/common/agent.js";
+import { AuthenticateParams, AuthenticateResult, type IAgentSessionChatMetadata, IAgentSessionMetadata } from "../../../../../platform/agentHost/common/agent.js";
 import { AgentMergeSessionOverrides, AgentMergeSessionState } from "../../../../../platform/agentHost/common/agentMerge.js";
 import { IAgentConnection } from "../../../../../platform/agentHost/common/agentService.js";
-import type { AgentHostUriMapper } from "../../../../../platform/agentHost/common/agentHostUri.js";
+import { type AgentHostUriMapper } from "../../../../../platform/agentHost/common/agentHostUri.js";
 import type { RemoteAgentHostConnectionStatus } from "../../../../../platform/agentHost/common/remoteAgentHostService.js";
 import { ChangesetKind } from "../../../../../platform/agentHost/common/changesetUri.js";
-import { ResolveSessionConfigResult, type SessionConfigPropertySchema } from "../../../../../platform/agentHost/common/state/protocol/commands.js";
-import { AgentCustomization, ChangesSummary, Customization, type CustomizationEnablement, ModelSelection, RootConfigState, RootState, SessionState, type Changeset } from "../../../../../platform/agentHost/common/state/protocol/state.js";
+import type { Implementation } from "../../../../../platform/agentHost/common/state/protocol/common/commands.js";
+import { type ISessionSandboxPolicy } from "../../../../../platform/agentHost/common/meta/agentSandboxPolicyMeta.js";
+import { ResolveSessionConfigResult, type SessionConfigPropertySchema, type SessionConfigValueItem } from "../../../../../platform/agentHost/common/state/protocol/commands.js";
+import { AgentCustomization, ChangesSummary, Customization, type CustomizationEnablement, ModelSelection, RootConfigState, RootState, SessionState } from "../../../../../platform/agentHost/common/state/protocol/state.js";
 import { AgentCapabilities, AgentInfo, SessionMeta, type ISessionGitState } from "../../../../../platform/agentHost/common/state/sessionState.js";
 import { IConfigurationService } from "../../../../../platform/configuration/common/configuration.service.js";
 import { IInstantiationService } from "../../../../../platform/instantiation/common/instantiation.js";
@@ -20,22 +22,41 @@ import { ILabelService } from "../../../../../platform/label/common/label.servic
 import { ILogService } from "../../../../../platform/log/common/log.service.js";
 import { IDialogService } from "../../../../../platform/dialogs/common/dialogs.service.js";
 import { IStorageService } from "../../../../../platform/storage/common/storage.service.js";
+import { IUriIdentityService } from "../../../../../platform/uriIdentity/common/uriIdentity.service.js";
 import { IWorkspaceTrustManagementService } from "../../../../../platform/workspace/common/workspaceTrust.service.js";
 import { IAgentCustomizationScope } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostActiveClientService";
 import { IAgentHostActiveClientService } from "../../../../../workbench/contrib/chat/browser/agentSessions/agentHost/agentHostActiveClientService.service.js";
 import { IChatWidgetService } from "../../../../../workbench/contrib/chat/browser/chat.service.js";
 import { IChatService } from "../../../../../workbench/contrib/chat/common/chatService/chatService.service.js";
-import { IChatSessionFileChange, IChatSessionFileChange2 } from "../../../../../workbench/contrib/chat/common/chatSessionsService.js";
 import { IChatSessionsService } from "../../../../../workbench/contrib/chat/common/chatSessionsService.service.js";
 import { IAutomationSessionTemplate } from "../../../../../workbench/contrib/chat/common/automations/automation.js";
 import { AutomationModelConfiguration } from "../../../automations/browser/automationModelConfiguration.js";
 import { ILanguageModelsService } from "../../../../../workbench/contrib/chat/common/languageModels.service.js";
 import { IAgentHostMcpServer, IAgentHostSessionsProvider, IAgentMergeClientState } from "../../../../common/agentHostSessionsProvider.js";
-import { ChatModelSource, ChatOriginKind, IChat, IGitHubInfo, ISession, ISessionAgentRef, ISessionArtifact, ISessionCapabilities, ISessionChangesSummary, ISessionChangeset, ISessionCreationReference, ISessionType, ISessionWorkspace, ISessionWorkspaceBrowseAction, ISideChatSelection, SessionRemoteConnectionStatus, SessionStatus, SessionTypeAuthRequirement } from "../../../../services/sessions/common/session.js";
+import { ChatModelSource, ChatOriginKind, IChat, IGitHubInfo, ISession, ISessionAgentRef, ISessionApplication, ISessionEnvironment, ISessionArtifact, ISessionCanvasDefinition, ISessionCapabilities, ISessionChangesSummary, ISessionCreationReference, ISessionPreparationProgress, ISessionType, ISessionWorkspace, ISessionWorkspaceBrowseAction, ISideChatSelection, SessionRemoteConnectionStatus, SessionStatus, SessionTypeAuthRequirement } from "../../../../services/sessions/common/session.js";
 import { ISessionsService } from "../../../../services/sessions/browser/sessionsService.service.js";
-import { IAutomationSessionConfiguration, IDeleteChatOptions, ISendRequestOptions, ISessionChangeEvent, ISessionModelPickerOptions, ISessionModelsSnapshot, ISessionsProviderCreateSessionOptions, ISessionWorktreeConfiguration } from "../../../../services/sessions/common/sessionsProvider.js";
+import { ISessionsRecentWorkspacesService } from "../../../../services/sessions/browser/sessionsRecentWorkspacesService.service.js";
+import { IAutomationSessionConfiguration, IDeleteChatOptions, ISendRequestOptions, ISessionChangeEvent, ISessionConfigurationSnapshot, ISessionModelPickerOptions, ISessionModelsSnapshot, ISessionPermissionOption, ISessionsProviderCreateSessionOptions, ISessionWorktreeConfiguration } from "../../../../services/sessions/common/sessionsProvider.js";
 import { IGitHubService } from "../../../github/browser/githubService.service.js";
 import { IPullRequestIconCache } from "../../../github/browser/pullRequestIconCache.service.js";
+interface IAgentHostSessionDiscoveryMetadata {
+    readonly summary?: string;
+    readonly modifiedTime?: number;
+    /** Repository-less discovery intent; an actual host project still takes precedence. */
+    readonly workspaceless?: boolean;
+    /** `null` is a discovery-owned absent project; `undefined` leaves the project to the host. */
+    readonly project?: IAgentSessionMetadata["project"] | null;
+    readonly initiator?: Implementation;
+}
+/** The folder a chat's Agent Merge settings belong to; see {@link AgentHostSessionAdapter.getAgentMergeFolder}. */
+interface IAgentMergeFolder {
+    /** Host-authored key of the folder. */
+    readonly folderKey: string | undefined;
+    /** Key of the session folder, whose settings earlier versions stored in their own keys. */
+    readonly sessionFolderKey: string | undefined;
+    /** Backend working directory of the folder, which the host keys its settings by. */
+    readonly workingDirectory: string | undefined;
+}
 /** Copilot CLI session type */
 export declare const CopilotCLISessionType: ISessionType;
 /**
@@ -73,12 +94,15 @@ export declare function resolveAgentAuthRequirement(agent: AgentInfo): SessionTy
  */
 export interface IAgentHostAdapterOptions {
     readonly icon: ThemeIcon;
+    readonly environment: string;
     /** Loading observable wired to the provider's authentication-pending state. */
     readonly loading: IObservable<boolean>;
     /** Builds the session workspace from session metadata; provider-specific (icon, providerLabel, requiresWorkspaceTrust). */
     readonly buildWorkspace: (project: IAgentSessionMetadata["project"], workingDirectories: readonly URI[] | undefined, gitHubInfo: IObservable<IGitHubInfo | undefined>, gitState: ISessionGitState | undefined) => ISessionWorkspace | undefined;
-    /** Optional URI mapping for diff entries (remote uses `toAgentHostUri`; local uses identity). */
+    /** Optional URI mapping for host-side file resources (remote uses `toAgentHostUri`; local uses identity). */
     readonly mapDiffUri?: AgentHostUriMapper;
+    /** Optional URI mapping for host-side working directories. */
+    readonly mapWorkingDirectoryUri?: AgentHostUriMapper;
     /**
      * GitHub service used to resolve the pull request that targets the
      * session's branch and refresh its live state. Optional so tests / hosts
@@ -99,12 +123,21 @@ export interface IAgentHostAdapterOptions {
      * host that no longer exists.
      */
     readonly readOnly?: IObservable<boolean>;
+    /** Keeps normally interactive chats draftable while their connection is unavailable. */
+    readonly allowOfflineDrafts?: IObservable<boolean>;
     /**
-     * Returns the agent connection for the session, if it exists.
+     * Returns the agent connection for the session, tracking replacements when a reader is provided.
      */
-    readonly getConnection: () => IAgentConnection | undefined;
+    readonly getConnection: (reader?: IReader) => IAgentConnection | undefined;
+    /**
+     * Maps a client chat resource of this provider to its backend chat channel URI,
+     * for operations that name a chat to the host.
+     */
+    readonly getBackendChatResource?: (chat: URI) => URI | undefined;
     /** Agent capability lookup shared by every adapter owned by this provider. */
     readonly agentCapabilities: IObservable<ReadonlyMap<string, AgentCapabilities | undefined> | undefined>;
+    /** Whether this provider can present server-published canvas channels for the agent. */
+    readonly supportsCanvasPresentation?: (agentProvider: string) => boolean;
     /**
      * The scheme the host addresses this session under, when it differs from the agent provider
      * (cloud sandbox: provider `copilot`, sessions `ahp-session:/<id>`). Defaults to the provider.
@@ -116,6 +149,14 @@ export interface IAgentHostAdapterOptions {
     readonly defaultChangesetKind?: ChangesetKind.Branch | ChangesetKind.Uncommitted | ChangesetKind.Session;
     /** Connection state from the backing remote provider, when there is one. */
     readonly connectionStatus?: IObservable<RemoteAgentHostConnectionStatus>;
+    /** Keeps reported activity separate from connection availability for remotely discoverable sessions. */
+    readonly preserveStatusWhenDisconnected?: boolean;
+    /** Overrides the host's external-session classification. */
+    readonly externalSessionState?: (resource: URI, store: DisposableStore) => IObservable<boolean>;
+    /** Uses the session title for the main conversation instead of the host's default chat label. */
+    readonly useSessionTitleForDefaultChat?: boolean;
+    /** Identifies provider placeholders that must not replace an existing display title. */
+    readonly isSessionTitlePlaceholder?: (title: string, session: URI) => boolean;
 }
 type AgentHostSessionStateMetadata = Pick<IAgentSessionMetadata, "project" | "workingDirectories" | "_meta">;
 type AgentHostSessionSummaryWorkspaceMetadata = {
@@ -130,6 +171,7 @@ type AgentHostSessionSummaryWorkspaceMetadata = {
 export declare function toSessionChatOriginKind(kind: string): ChatOriginKind;
 export declare class AgentHostSessionAdapter extends Disposable implements ISession {
     private readonly _options;
+    private readonly _acquireChatDetails;
     private readonly _gitHubService;
     private readonly _sessionsService;
     private readonly _pullRequestIconCache;
@@ -137,6 +179,10 @@ export declare class AgentHostSessionAdapter extends Disposable implements ISess
     readonly resource: URI;
     readonly providerId: string;
     readonly sessionType: string;
+    readonly harness: string;
+    readonly environment: string;
+    readonly application: IObservable<ISessionApplication>;
+    private readonly _legacyInitiator;
     readonly icon: ThemeIcon;
     readonly createdAt: Date;
     readonly workspace: ISettableObservable<ISessionWorkspace | undefined>;
@@ -148,11 +194,10 @@ export declare class AgentHostSessionAdapter extends Disposable implements ISess
     /** See {@link ISession.worktreePending}. */
     readonly worktreePending: IObservable<boolean>;
     readonly title: ISettableObservable<string>;
+    private _titleIsExplicit;
     readonly updatedAt: ISettableObservable<Date>;
     readonly status: ISettableObservable<SessionStatus>;
     readonly completedStateIcon: IObservable<ThemeIcon | undefined>;
-    readonly changes: IObservable<readonly (IChatSessionFileChange | IChatSessionFileChange2)[]>;
-    readonly changesets: ISettableObservable<readonly ISessionChangeset[] | undefined>;
     readonly modelId: ISettableObservable<string | undefined>;
     readonly modelSource: ISettableObservable<ChatModelSource | undefined>;
     modelSelection: ModelSelection | undefined;
@@ -169,14 +214,10 @@ export declare class AgentHostSessionAdapter extends Disposable implements ISess
     readonly mainChat: IObservable<IChat>;
     readonly chats: IObservable<readonly IChat[]>;
     /**
-     * Capabilities derived reactively from the connection's root state rather
-     * than snapshotted at construction time. The root state can still be loading
-     * when an adapter is built (the agent-host process may be starting), in which
-     * case the agent's advertised capabilities are not yet available; the derived
-     * re-emits (and drives the chat catalog / context keys) as soon as the root
-     * state arrives instead of being permanently frozen to the `false` defaults.
-     * `supportsRename`/`supportsDelete` are always supported for agent-host
-     * sessions.
+     * Capabilities combine provider-local policy with the connection's live root
+     * state. Advertised agent capabilities re-emit after hydration; provider-local
+     * capabilities remain available independently of root-state availability.
+     * `supportsRename`/`supportsDelete` are always supported.
      */
     readonly capabilities: IObservable<ISessionCapabilities>;
     /**
@@ -191,8 +232,6 @@ export declare class AgentHostSessionAdapter extends Disposable implements ISess
      * that chat's own last turn.
      */
     private readonly _sessionOutput;
-    /** Live workspace changes while the session's most recent chat has an active turn. */
-    private readonly _currentTurnChanges;
     /**
      * Independent title override for the default chat tab. `undefined` means the
      * default chat inherits the session title; a non-empty value means the user
@@ -207,15 +246,25 @@ export declare class AgentHostSessionAdapter extends Disposable implements ISess
      * (which may have been promoted by a running peer chat).
      */
     private readonly _defaultChatStatusOverride;
+    private readonly _defaultChatIsReadOverride;
+    private readonly _defaultChatBackendUri;
+    private readonly _defaultChatUpdatedAt;
+    private readonly _hasMultipleChats;
+    private readonly _aggregateChatResources;
+    private readonly _defaultChatWorkingDirectories;
+    /** GitHub info per folder, keyed by working-directory key and created on demand. */
+    private readonly _folderGitHubInfos;
     /** Whether this session was created with worktree isolation. */
     private readonly _worktreeIsolation;
     /** Interactivity of the default chat. Driven from the default chat's protocol summary. */
     private readonly _defaultChatInteractivity;
+    private readonly _defaultChatChangesSummary;
     private readonly _mainChatObs;
     private readonly _chatsObs;
     /** Additional (non-default) peer chats keyed by chatId. */
     private readonly _additionalChats;
     private readonly _sessionOutputCache;
+    private _chatOutputResources;
     /** Chat ids that have not yet sent their first request (presented as `Untitled`). */
     private readonly _newChatIds;
     /**
@@ -235,6 +284,8 @@ export declare class AgentHostSessionAdapter extends Disposable implements ISess
      */
     private _lastCatalogState;
     private readonly _chatCatalogCapabilitiesObserver;
+    private readonly _supportsChatArchive;
+    private readonly _supportsChatReadState;
     private readonly _rawId;
     private readonly _resourceScheme;
     readonly agentProvider: string;
@@ -245,13 +296,15 @@ export declare class AgentHostSessionAdapter extends Disposable implements ISess
      */
     readonly backendUri: URI;
     private _project;
+    /** Discovery-owned field baselines, persisted separately from authoritative host metadata. */
+    discoveryMetadata: IAgentHostSessionDiscoveryMetadata | undefined;
     private _workingDirectories;
     /** Working-directory set used to resolve session customizations. */
     get workingDirectories(): readonly URI[];
     private _agentBaseDir;
     private _meta;
     /** The latest session metadata used to build startup-cache presentation state. */
-    get sessionMeta(): SessionMeta | undefined;
+    get sessionMeta(): SessionMeta;
     /** Settable so authoritative session metadata can change the session kind in place. */
     private readonly _isQuickChat;
     /** Session-kind strategy (quick chat vs. workspace), derived from {@link _isQuickChat}. */
@@ -276,7 +329,8 @@ export declare class AgentHostSessionAdapter extends Disposable implements ISess
      */
     setChangesSummary(changes: ChangesSummary | undefined, tx?: ITransaction): boolean;
     readonly isActiveSessionObs: IObservable<boolean>;
-    constructor(metadata: IAgentSessionMetadata, providerId: string, resourceScheme: string, logicalSessionType: string, _options: IAgentHostAdapterOptions, chatCatalogLoading: IObservable<boolean>, _gitHubService: IGitHubService, _sessionsService: ISessionsService, _pullRequestIconCache: IPullRequestIconCache);
+    constructor(metadata: IAgentSessionMetadata, providerId: string, resourceScheme: string, logicalSessionType: string, _options: IAgentHostAdapterOptions, chatCatalogLoading: IObservable<boolean>, _acquireChatDetails: (sessionId: string) => IDisposable, _gitHubService: IGitHubService, _sessionsService: ISessionsService, _pullRequestIconCache: IPullRequestIconCache);
+    private _withChatDetails;
     /**
      * Reconcile the per-chat catalog from an AHP {@link SessionState}.
      *
@@ -294,7 +348,15 @@ export declare class AgentHostSessionAdapter extends Disposable implements ISess
      * degrade to `[defaultChat]`.
      */
     applyChatCatalog(state: SessionState): void;
+    applyChatMetadata(chats: readonly IAgentSessionChatMetadata[] | undefined, tx?: ITransaction): boolean;
+    supportsChatReadState(): boolean;
+    hasUnreadChat(): boolean;
+    getUnreadAggregateChats(): readonly IChat[];
+    private _markSessionUnreadForUnreadChat;
+    getCurrentChatMetadata(chats: readonly IAgentSessionChatMetadata[] | undefined): readonly IAgentSessionChatMetadata[] | undefined;
+    private _updateChatOutputResources;
     private _applyChatCatalog;
+    setDefaultChatRead(isRead: boolean, tx?: ITransaction): boolean;
     private _createAdditionalChat;
     /**
      * Maps a protocol parent-chat URI (from a Tool/Fork {@link ChatSummary.origin})
@@ -302,6 +364,9 @@ export declare class AgentHostSessionAdapter extends Disposable implements ISess
      * resource; peer chats carry their chatId in the resource fragment.
      */
     private _resolveParentChatResource;
+    setChatRead(chatResource: URI, isRead: boolean, tx?: ITransaction): boolean;
+    setLegacySessionReadState(isRead: boolean, tx?: ITransaction): boolean;
+    getBackendChatResource(chatResource: URI): URI | undefined;
     /** Mark a peer chat new so it shows as `Untitled` until its first request. */
     markChatAsNew(chatId: string): void;
     /** Clear the `new` flag after the chat's first request is sent. */
@@ -369,12 +434,14 @@ export declare class AgentHostSessionAdapter extends Disposable implements ISess
     setAdditionalChatTitle(chatId: string, title: string): void;
     private _toModelSelection;
     private _getAdditionalChat;
-    private _createChangesObs;
     /**
      * Update fields from a refreshed metadata snapshot. Returns `true` iff
      * any user-visible field changed.
      */
     update(metadata: IAgentSessionMetadata): boolean;
+    setTitleFromHost(title: string, tx?: ITransaction): boolean;
+    get titleIsExplicit(): boolean;
+    setTitleFromUser(title: string): void;
     /**
      * Sets the activity text from a `SessionSummaryChanged` notification.
      * Returns `true` iff the activity observable changed. Callers inside a
@@ -418,6 +485,8 @@ export declare class AgentHostSessionAdapter extends Disposable implements ISess
      * is not lost on the next save.
      */
     get project(): IAgentSessionMetadata["project"];
+    /** Refresh discovery-owned fields without overwriting fields changed by the host. */
+    updateDiscoveryMetadata(metadata: Pick<IAgentSessionMetadata, "summary" | "modifiedTime" | "project" | "_meta">, workspaceless?: boolean): boolean;
     /**
      * Assign a project to a session that was materialized without one, recomputing the workspace.
      * Refuses when the session already has a project.
@@ -433,8 +502,25 @@ export declare class AgentHostSessionAdapter extends Disposable implements ISess
      * assigned; workspace sessions build from project/git metadata.
      */
     private _computeWorkspace;
-    updateChangesets(changesetsMetadata: readonly Changeset[] | undefined): void;
-    private _createCurrentTurnChangesObservable;
+    /** Adds live pull request presentation (icon, state, title) to GitHub info. */
+    private _presentGitHubInfo;
+    /** Working-directory key of the session folder, the main chat's first folder. */
+    private _getSessionFolderKey;
+    private _getSessionFolderWorkingDirectory;
+    /**
+     * The folder whose Agent Merge settings `chat` uses — its first folder, or
+     * the session folder (the main chat's first folder) for the main chat or
+     * when omitted. `undefined` while a peer chat's folders are still loading,
+     * so its settings are never mistaken for the session folder's.
+     */
+    getAgentMergeFolder(chat: URI | undefined, reader?: IReader): IAgentMergeFolder | undefined;
+    /** Resolves the GitHub info each session folder reports from its own state. */
+    private _getFolderGitHubInfoResolver;
+    private _getChatScopeGitState;
+    private _createChatCurrentTurnChangesObservable;
+    /** Background shells come from the chat channel, which is only subscribed while the session is active. */
+    private _createChatBackgroundShellsObservable;
+    private _createChatCanvasesObservable;
 }
 /**
  * `kind` literal used on `ISession.mode` when the mode slot carries a
@@ -480,8 +566,16 @@ interface INewSessionConstructionContext {
      * present from the very first `resolveConfig`/`createSession`.
      */
     readonly initialConfigValues?: Record<string, unknown>;
+    readonly resolveInitialPermissionConfig?: (config: ResolveSessionConfigResult) => Record<string, unknown>;
+    readonly initialModeId?: string;
+    /** Pull request the backend session is created from; requires a host that supports pull request sessions. */
+    readonly initialPullRequestUrl?: string;
     /** Provider-owned Automation values restored before the first configuration resolution. */
     readonly initialSessionTemplate?: IAutomationSessionTemplate;
+    /** Model selected specifically for this draft. */
+    readonly initialModelId?: string;
+    /** Model-specific primitive values scoped specifically to this draft. */
+    readonly initialModelConfiguration?: Readonly<Record<string, string | number | boolean | null>>;
     /**
      * Optional property schemas to seed into the new session's config before its
      * first {@link NewSession.resolveConfig} round-trip. Carried over from the
@@ -506,6 +600,7 @@ interface INewSessionConstructionContext {
      * takes over ownership of the same `sessionId` key.
      */
     readonly onSessionState?: (sessionId: string, state: SessionState | undefined) => void;
+    readonly onSessionCreated: (backendSession: URI) => void;
     readonly activeClientScope: IAgentCustomizationScope;
 }
 /**
@@ -531,6 +626,7 @@ interface INewSessionConstructionContext {
  */
 declare class NewSession extends Disposable {
     private readonly _options;
+    private readonly _configurationService;
     readonly session: ISession;
     readonly sessionId: string;
     readonly agentProvider: string;
@@ -552,6 +648,7 @@ declare class NewSession extends Disposable {
     private readonly _worktreePending;
     private readonly _description;
     private readonly _isNewSessionRequestInProgress;
+    readonly preparationProgress: ISettableObservable<ISessionPreparationProgress | undefined, void>;
     private readonly _newSessionRequestActivities;
     private _newSessionRequestId;
     private readonly _isActiveSessionObs;
@@ -571,6 +668,7 @@ declare class NewSession extends Disposable {
     private _configOperation;
     private _unresolvedConfigValues;
     private readonly _explicitlySetConfigProperties;
+    private _branchLoad;
     /**
      * Monotonic counter for in-flight {@link resolveConfig} calls. Each call
      * increments the counter and only writes its result back if its sequence
@@ -578,6 +676,9 @@ declare class NewSession extends Disposable {
      * discards itself.
      */
     private _configRequestSeq;
+    private _hasResolvedConfig;
+    private _initialConfigError;
+    private _lastResolvedConfigSchema;
     /**
      * `true` while a `resolveConfig` round-trip is in flight. Distinct from
      * {@link ISession.loading} which also stays true when required config
@@ -594,6 +695,8 @@ declare class NewSession extends Disposable {
     private _connection;
     /** Held state subscription. Set after the wire `createSession` resolves. */
     private _subscription;
+    /** Held default-chat subscription used to publish the draft's changesets. */
+    private _chatSubscription;
     /**
      * `onDidChange` listener for {@link _subscription}. Forwards every
      * `SessionState` snapshot to the provider via {@link _onSessionState}
@@ -602,6 +705,7 @@ declare class NewSession extends Disposable {
      * in {@link graduate} (handoff) and {@link dispose} (close-without-send).
      */
     private readonly _stateListener;
+    private readonly _chatStateListener;
     /**
      * Autorun republishing active-client changes for this draft. Cleared in
      * {@link graduate} so the session handler's own reconciliation owns
@@ -609,14 +713,18 @@ declare class NewSession extends Disposable {
      */
     private readonly _activeClientPublisher;
     private readonly _onSessionState;
+    private readonly _onSessionCreated;
     private readonly _activeClientScope;
     private readonly _initialMetadata;
     private readonly _initialSessionTemplate;
+    private readonly _resolveInitialPermissionConfig;
+    private readonly _initialModeId;
+    private readonly _initialPullRequestUrl;
     readonly modelConfiguration: AutomationModelConfiguration;
     get initialMetadata(): Record<string, unknown> | undefined;
     private readonly _logService;
     private readonly _providerId;
-    constructor(ctx: INewSessionConstructionContext, _options: IAgentHostAdapterOptions, sessionsService: ISessionsService, languageModelsService: ILanguageModelsService);
+    constructor(ctx: INewSessionConstructionContext, _options: IAgentHostAdapterOptions, sessionsService: ISessionsService, languageModelsService: ILanguageModelsService, _configurationService: IConfigurationService);
     /** Re-reads the isolation pick from the cached config into {@link _worktreePending}. */
     private _syncWorktreePending;
     setSelectedModelId(modelId: string, source: ChatModelSource): void;
@@ -633,13 +741,18 @@ declare class NewSession extends Disposable {
     startRequest(activity: string | undefined): IDisposable;
     setLoading(loading: boolean): void;
     setTitle(title: string): void;
-    applySessionMeta(meta: SessionMeta | undefined): boolean;
+    /** Applies the session's Git and GitHub state; `sessionWorkingDirectory` is the backend URI of its first folder. */
+    applySessionMeta(meta: SessionMeta | undefined, sessionWorkingDirectory: string | undefined): boolean;
     getConfig(): ResolveSessionConfigResult | undefined;
+    getConfigForWrite(): ResolveSessionConfigResult | undefined;
     getConfigValues(): Record<string, unknown> | undefined;
     trackConfigResolution(promise: Promise<void>): Promise<void>;
     waitForConfigResolution(): Promise<void>;
     trackConfigOperation(operation: Promise<void>): void;
-    waitForConfigurationReady(): Promise<void>;
+    /** Whether the backend session may only be created with the resolved initial permissions, mode, or pull request. */
+    private get _requiresResolvedInitialConfig();
+    /** Explicit consumers can retry missing configuration; background prewarming only waits. */
+    waitForConfigurationReady(retryResolution?: () => Promise<void>): Promise<void>;
     private _clearConfigResolution;
     private _clearConfigOperation;
     /**
@@ -675,6 +788,7 @@ declare class NewSession extends Disposable {
      */
     resolveConfig(connection: IAgentConnection, strict?: boolean): Promise<boolean>;
     getConfigCompletions(connection: IAgentConnection, property: string, query: string | undefined): Promise<import("../../../../../platform/agentHost/common/state/protocol/commands.js").SessionConfigCompletionsResult>;
+    loadBranches(connection: IAgentConnection): Promise<readonly SessionConfigValueItem[]>;
     /**
      * Eagerly create the session on the agent host so the chat handler can
      * skip its legacy `createSession`-on-first-message round-trip.
@@ -735,12 +849,17 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
     protected readonly _storageService: IStorageService;
     protected readonly _dialogService: IDialogService;
     protected readonly _workspaceTrustManagementService: IWorkspaceTrustManagementService;
+    protected readonly _uriIdentityService: IUriIdentityService;
     abstract readonly id: string;
     abstract readonly label: string;
+    abstract readonly environment: ISessionEnvironment;
     abstract readonly icon: ThemeIcon;
     abstract readonly browseActions: readonly ISessionWorkspaceBrowseAction[];
     readonly usesCombinedNewSessionConfigPicker = true;
+    readonly supportsModelConfigurationForCreation = true;
+    readonly supportsPermissionsForCreation = true;
     readonly supportsAutomationSessionConfiguration = true;
+    getPermissionOptionForSession(sessionId: string): ISessionPermissionOption | undefined;
     get order(): number;
     get sessionTypes(): readonly ISessionType[];
     protected _sessionTypes: ISessionType[];
@@ -779,8 +898,9 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
      * `customizations` and `activeClient.customizations` for the picker.
      */
     protected readonly _lastSessionStates: Map<string, SessionState>;
-    /** Cache of adapted sessions, keyed by raw session ID. */
+    /** Cache of adapted sessions, keyed by exact backend resource. */
     protected readonly _sessionCache: Map<string, AgentHostSessionAdapter>;
+    private readonly _sessionKeysByResource;
     protected _refreshSessionWorkspaces(): void;
     /**
      * Storage key under which {@link _sessionCache} snapshots are persisted, or
@@ -791,11 +911,11 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
     private _sessionCacheStorageKey;
     /**
      * Snapshot of the source metadata for each adapter in {@link _sessionCache},
-     * keyed by raw session ID. Captured in {@link createAdapter}/{@link updateAdapter}
+     * keyed by exact backend resource. Captured in {@link createAdapter}/{@link updateAdapter}
      * and re-used by {@link _persistCache} to serialize sessions without having to
      * reconstruct every `IAgentSessionMetadata` field from observables.
      */
-    private readonly _metaByRawId;
+    private readonly _metadataBySession;
     /**
      * Set when {@link _sessionCache} has changed since the last persist. The
      * actual write happens on the next `onWillSaveState` signal from
@@ -811,31 +931,12 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
      */
     private readonly _downloadProgress;
     /**
-     * Temporary session that has been sent (first turn dispatched) but not yet
+     * Temporary sessions that have been sent (first turn dispatched) but not yet
      * committed by the backend session list. Shown in the session list until the
-     * server reports the backend session, at which point it is replaced via
+     * server reports each backend session, at which point it is replaced via
      * {@link _onDidReplaceSession}.
      */
-    protected _pendingSession: ISession | undefined;
-    /**
-     * Raw ids of backend sessions that an in-flight {@link _waitForNewSession}
-     * has already matched to its send, so a *concurrent* new-session send of
-     * the same scheme does not resolve to the same committed session. Each
-     * matched id is released by the owning send in its `finally`.
-     */
-    private readonly _committingSessionRawIds;
-    /**
-     * Own raw ids ({@link chatResource} path) of currently in-flight
-     * new-session sends. A send's committed backend session keeps the eager
-     * id it was created with, so {@link _waitForNewSession} matches a send to
-     * its OWN id first. The novelty fallback (for flows where the backend
-     * assigns a different id) must then never latch onto *another* in-flight
-     * send's own session — otherwise two concurrent same-scheme sends racing
-     * in a shared download/materialize window would swap sessions (each
-     * graduating onto the other's committed session). Populated at send start,
-     * cleared in the send's `finally`.
-     */
-    private readonly _inFlightNewSessionOwnIds;
+    protected readonly _pendingSessions: Map<string, ISession>;
     /**
      * In-flight new sessions — sessions being composed in the new-chat view
      * before their first message is sent, keyed by `sessionId`. See
@@ -851,7 +952,7 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
     private readonly _newSessions;
     /** The in-flight new session with the given id, if any. */
     protected _getNewSession(sessionId: string): NewSession | undefined;
-    private _getBackendSessionUri;
+    protected _getBackendSessionUri(sessionId: string): URI | undefined;
     protected _hasSession(sessionId: string): boolean;
     /**
      * Dispose every in-flight new session, firing each one's `disposeSession`
@@ -862,10 +963,17 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
     deleteNewSession(sessionId: string): void;
     protected _onNewSessionAbandoned(_sessionId: string, _reason: "discarded" | "sendFailed" | "providerDisposed"): void;
     protected _getSessionMetadata(sessionId: string): Record<string, unknown> | undefined;
-    protected _getSessionMetadataByRawId(rawId: string): Record<string, unknown> | undefined;
+    protected _getSessionMetadataByKey(rawId: string): Record<string, unknown> | undefined;
     /** Full resolved config (schema + values) for running sessions, keyed by session ID. */
     protected readonly _runningSessionConfigs: Map<string, ResolveSessionConfigResult>;
     private readonly _runningSessionConfigResolveSeq;
+    private readonly _runningModelConfigurations;
+    /**
+     * Model configuration a side chat inherited from its source chat's turn, keyed by chat
+     * resource. Per chat rather than per session so it cannot change the session's other chats;
+     * consumed by the chat's first committed request.
+     */
+    private readonly _carriedOverChatModelConfigurations;
     /**
      * Last authoritatively-resolved schemas for {@link SEEDED_CONFIG_SCHEMA_KEYS},
      * seeded into new drafts so their chips survive a workspace/agent switch. Lives
@@ -884,11 +992,16 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
      * state can be evicted on the agent host. Keyed by session ID.
      */
     protected readonly _sessionStateSubscriptions: DisposableMap<string, DisposableStore>;
+    protected readonly _connectionChanged: import("../../../../../base/common/observable.js").IObservableSignal<void>;
     private readonly _chatCatalogLoading;
     private readonly _agentMergeSessionStateSubscriptions;
     private readonly _agentMergeSessionStateIdleTimers;
+    /** Per session, then per chat (`''` for the session folder). */
     private readonly _agentMergeSessionStateObservables;
+    /** Number of observed Agent Merge state observables per session. */
     private readonly _observedAgentMergeSessionStates;
+    /** Every Agent Merge folder seen per session; see {@link _getAgentMergeValues}. */
+    private readonly _agentMergeFolders;
     /**
      * Idle-release timers paired with {@link _sessionStateSubscriptions}. Each
      * call to {@link _keepSessionStateAlive} resets the timer for `sessionId`;
@@ -897,6 +1010,7 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
      * refcount to the agent host.
      */
     private readonly _sessionStateIdleTimers;
+    private readonly _sessionChatDetailsReferences;
     private readonly _chatModelRetentionLeases;
     /**
      * Session ids whose views are currently visible in the Agents window. Their
@@ -926,15 +1040,17 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
     private _sessionRefreshRetryDelay;
     /** True while a {@link _refreshSessions} call is awaiting `listSessions()`. */
     private _sessionRefreshInFlight;
+    private _sessionRefreshGeneration;
     private readonly _activeSessionScope;
     private readonly _activeClientSyncCancellation;
     private _activeSessionScopeSessionType;
     private _activeSessionScopeRoots;
-    constructor(_chatSessionsService: IChatSessionsService, _chatService: IChatService, _chatWidgetService: IChatWidgetService, _languageModelsService: ILanguageModelsService, _baseConfigurationService: IConfigurationService, _logService: ILogService, _gitHubService: IGitHubService, _instantiationService: IInstantiationService, _sessionsService: ISessionsService, _activeClientService: IAgentHostActiveClientService, _storageService: IStorageService, _dialogService: IDialogService, _workspaceTrustManagementService: IWorkspaceTrustManagementService);
+    constructor(_chatSessionsService: IChatSessionsService, _chatService: IChatService, _chatWidgetService: IChatWidgetService, _languageModelsService: ILanguageModelsService, _baseConfigurationService: IConfigurationService, _logService: ILogService, _gitHubService: IGitHubService, _instantiationService: IInstantiationService, _sessionsService: ISessionsService, _activeClientService: IAgentHostActiveClientService, _storageService: IStorageService, _dialogService: IDialogService, _workspaceTrustManagementService: IWorkspaceTrustManagementService, recentWorkspacesService: ISessionsRecentWorkspacesService, _uriIdentityService: IUriIdentityService);
     /** Current connection (always present for local; may be undefined while disconnected for remote). */
     protected abstract get connection(): IAgentConnection | undefined;
     /** Provider-level authentication-pending observable used to derive `loading` for sessions. */
     protected abstract get authenticationPending(): IObservable<boolean>;
+    protected abstract registerBackendSession(backendSession: URI, provider: string): void;
     /** Connection state for remote-host sessions. */
     protected get remoteConnectionStatus(): IObservable<RemoteAgentHostConnectionStatus> | undefined;
     /**
@@ -942,7 +1058,7 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
      * the bits that are uniform across hosts (`icon`, `loading`,
      * `mapDiffUri`) from the corresponding hooks.
      */
-    protected abstract _adapterOptions(): Pick<IAgentHostAdapterOptions, "buildWorkspace" | "readOnly" | "defaultChangesetKind">;
+    protected abstract _adapterOptions(): Pick<IAgentHostAdapterOptions, "buildWorkspace" | "readOnly" | "defaultChangesetKind" | "preserveStatusWhenDisconnected" | "externalSessionState" | "useSessionTitleForDefaultChat" | "isSessionTitlePlaceholder" | "supportsCanvasPresentation">;
     /**
      * Hook to normalize a session's metadata before it is cached, keyed, or
      * persisted. The default is identity. Subclasses override this when the host
@@ -954,13 +1070,8 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
      */
     protected _adoptSessionMeta(meta: IAgentSessionMetadata): IAgentSessionMetadata;
     /**
-     * The backend (wire) session URI scheme for a given agent provider. Default is
-     * identity (scheme == provider), which holds for every host except the Copilot
-     * host used by cloud sandbox, whose sessions are addressed under
-     * `ahp-session:/<id>` while the agent provider is `copilot`. Subclasses
-     * override this so all backend `AgentSession.uri(...)` reconstructions on the
-     * adapter and provider use the host's real scheme. Must be a stable per-provider
-     * mapping.
+     * Creation addressing for a new draft, negotiated with its owning host.
+     * Committed sessions always use their exact advertised resource.
      */
     protected _backendSessionScheme(agentProvider: string): string;
     protected _logicalSessionTypeForBackendScheme(backendScheme: string): string;
@@ -969,6 +1080,8 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
     protected createAdapter(meta: IAgentSessionMetadata): AgentHostSessionAdapter;
     private _getChatCatalogLoading;
     protected updateAdapter(adapter: AgentHostSessionAdapter, meta: IAgentSessionMetadata): boolean;
+    /** Resolve host archive state before applying it to the client cache. */
+    protected _resolveArchivedState(_rawId: string, isArchived: boolean): boolean;
     /**
      * Computes the URI resource scheme used to route session URIs to this
      * provider's content provider for a given agent provider name. Local
@@ -1045,7 +1158,6 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
      */
     private _createDraftSession;
     private _resolveAutomationSessionTemplate;
-    private _normalizeAutomationSessionConfig;
     protected _resumeNewSessionAfterAuthenticationSettles(): void;
     private _startNewSessionBackend;
     /**
@@ -1067,10 +1179,10 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
     /** Localized "no agents" error message. Subclasses can override. */
     protected _noAgentsErrorMessage(): string;
     /**
-     * Initial session-config values applied to a brand-new agent-host session
-     * before its schema is resolved. Values are seeded from portable picks in
-     * the profile-scoped remembered session-config map and then normalized
-     * against policy/feature constraints.
+     * Initial session-config preferences held locally until schema discovery
+     * validates the advertised writable keys. Portable picks are seeded from a
+     * profile-scoped map. Isolation is seeded from the last session started for
+     * this workspace, falling back to `sessions.useWorktree`.
      *
      * The agent-host defaults are controlled by the single
      * `chat.defaultConfiguration` object setting (with `mode` and
@@ -1082,10 +1194,8 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
      * local-only `chat.permissions.default` setting is intentionally NOT
      * consulted here.
      *
-     * If enterprise policy disables global auto-approval
-     * (`chat.tools.global.autoApprove` policy value `false`), the approval seed
-     * is clamped to `default` so the agent host never starts in an elevated
-     * permission level the user is not allowed to pick.
+     * Approval seeds retain the user's preference until schema discovery decides
+     * whether host-reported policy or the legacy client restriction applies.
      *
      * The user's `git.branchPrefix` setting (resource-scoped to the workspace's
      * first folder) is seeded into the `worktreeBranchPrefix` slot so the agent
@@ -1093,9 +1203,23 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
      */
     protected _initialNewSessionConfig(workspace?: ISessionWorkspace): Record<string, unknown> | undefined;
     private _derivedNewSessionConfig;
+    private _getSensitiveEditLocations;
+    private _syncSensitiveEditLocations;
+    /**
+     * Re-reads the settings-derived config values of a draft before its first
+     * request. The Agents window loads the settings of the draft's folder only
+     * once the draft is active, so the values seeded at creation can miss them.
+     * The agent host merges the config it receives on first send into the values
+     * it got at creation, so a property whose setting is gone is cleared explicitly.
+     */
+    private _refreshSettingsDerivedNewSessionConfig;
     getAutomationModelConfiguration(sessionId: string): AutomationModelConfiguration | undefined;
     getAutomationSessionConfiguration(sessionId: string): Promise<IAutomationSessionConfiguration | undefined>;
+    getSessionSandboxPolicy(sessionId: string): ISessionSandboxPolicy | undefined;
+    getSessionSandboxEnabled(sessionId: string): boolean | undefined;
     getSessionConfig(sessionId: string): ResolveSessionConfigResult | undefined;
+    getNewSessionCancellationToken(sessionId: string): CancellationToken;
+    whenSessionConfigResolved(sessionId: string, token: CancellationToken): Promise<ResolveSessionConfigResult>;
     /**
      * Observable: `true` while a `resolveSessionConfig` round-trip is in
      * flight. Distinct from `session.loading` (which also covers the
@@ -1104,21 +1228,34 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
      */
     isSessionConfigResolving(sessionId: string): IObservable<boolean>;
     private _rememberSessionConfigValue;
+    private _getRememberedWorkspaceIsolation;
+    private _rememberWorkspaceIsolation;
+    private _forgetWorkspaceIsolations;
     setSessionConfigValue(sessionId: string, property: string, value: unknown): Promise<void>;
     trackSessionConfigOperation(sessionId: string, operation: Promise<void>): void;
     replaceSessionConfig(sessionId: string, values: Record<string, unknown>): Promise<void>;
-    getAgentMergeSessionState(sessionId: string): AgentMergeSessionState | undefined;
-    getAgentMergeClientStateObservable(sessionId: string): IObservable<IAgentMergeClientState | undefined>;
-    setAgentMergeEnabled(sessionId: string, enabled: boolean): Promise<void>;
-    setAgentMergeOverrides(sessionId: string, overrides: AgentMergeSessionOverrides | undefined): Promise<void>;
+    getAgentMergeSessionState(sessionId: string, chat?: URI): AgentMergeSessionState | undefined;
+    private _getAgentMergeSessionState;
+    /**
+     * The session's config values including every Agent Merge folder seen so far:
+     * a write of one folder is applied locally before the host merges it, so
+     * until then the local config holds only that folder. The host never removes
+     * a folder's settings, so earlier folders are still current.
+     */
+    private _getAgentMergeValues;
+    /** Records the Agent Merge folders of a session state; see {@link _getAgentMergeValues}. */
+    private _updateAgentMergeFolders;
+    getAgentMergeClientStateObservable(sessionId: string, chat?: URI): IObservable<IAgentMergeClientState | undefined>;
+    setAgentMergeEnabled(sessionId: string, enabled: boolean, chat?: URI): Promise<void>;
+    setAgentMergeOverrides(sessionId: string, overrides: AgentMergeSessionOverrides | undefined, chat?: URI): Promise<void>;
+    private _supportsPerFolderAgentMerge;
     private _writeAgentMergeClientState;
     private _resolveRunningSessionConfig;
-    getSessionConfigCompletions(sessionId: string, property: string, query?: string): Promise<import("../../../../../platform/agentHost/common/state/protocol/commands.js").SessionConfigValueItem[]>;
+    getSessionConfigCompletions(sessionId: string, property: string, query?: string): Promise<readonly SessionConfigValueItem[]>;
     getCreateSessionConfig(sessionId: string): Record<string, unknown> | undefined;
+    getNewSessionConfig(sessionId: string): Promise<ISessionConfigurationSnapshot | undefined>;
     setIsolationMode(sessionId: string, mode: string): Promise<void>;
     setWorktreeConfiguration(sessionId: string, configuration: ISessionWorktreeConfiguration): Promise<void>;
-    setWorktreeBranchTrack(sessionId: string, enabled: boolean): Promise<void>;
-    setWorktreeCreateNewBranch(sessionId: string, enabled: boolean): Promise<void>;
     setBranch(sessionId: string, branch: string): Promise<void>;
     private _setTransientNewSessionConfigValue;
     private _setTransientNewSessionConfigValues;
@@ -1130,6 +1267,8 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
     setRootConfigValue(property: string, value: unknown): Promise<void>;
     replaceRootConfig(values: Record<string, unknown>): Promise<void>;
     getModelsSnapshot(sessionId: string, desiredModelId?: string): ISessionModelsSnapshot;
+    getModelsSnapshotForCreation(_workspaceUri: URI, sessionTypeId: string, desiredModelId?: string): ISessionModelsSnapshot;
+    private _getModelsSnapshotForTarget;
     getModelPickerOptions(sessionId: string): ISessionModelPickerOptions;
     /**
      * Resolve a remembered model selection at send time: when it is conclusively
@@ -1145,15 +1284,25 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
     getCustomizations(sessionId: string): Customization[];
     getWorkingDirectory(sessionId: string): string | undefined;
     getBackendChatResource(chatResource: URI): URI | undefined;
+    getSessionContextReference(chatResource: URI): string | undefined;
     getWorkingDirectories(sessionId: string): readonly string[];
     getMcpServers(sessionId: string): readonly IAgentHostMcpServer[];
     setCustomizationEnablement(sessionId: string, customizationId: string, enablement: readonly CustomizationEnablement[]): void;
+    handleMcpRequest(channel: string, method: string, params: Record<string, unknown> | undefined): Promise<unknown>;
     getFeedbackAnnotationsChannel(sessionId: string): {
         readonly connection: IAgentConnection;
         readonly annotationsUri: URI;
     } | undefined;
     archiveSession(sessionId: string): Promise<void>;
+    importSession(sessionId: string): Promise<void>;
+    listCanvases(sessionId: string, chatResource: URI): Promise<readonly ISessionCanvasDefinition[]>;
+    openCanvas(sessionId: string, chatResource: URI, canvas: ISessionCanvasDefinition, instanceId: string): Promise<void>;
+    private _toSessionCanvasDefinition;
+    getSessionWorktreeDiskUsage(sessionId: string): Promise<number | undefined>;
     unarchiveSession(sessionId: string): Promise<void>;
+    archiveChat(sessionId: string, chatResource: URI): Promise<void>;
+    unarchiveChat(sessionId: string, chatResource: URI): Promise<void>;
+    private _setChatArchived;
     /**
      * Flips a session's archived state locally and dispatches the owning action
      * so the host persists it and fans it out to other windows.
@@ -1162,7 +1311,10 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
      * the change can never be recorded is worse than appearing not to archive.
      */
     protected _setSessionArchived(sessionId: string, isArchived: boolean): boolean;
+    protected _setSessionArchivedLocally(sessionId: string, isArchived: boolean): boolean;
     setSessionReadState(sessionId: string, isRead: boolean): Promise<void>;
+    setChatReadState(sessionId: string, chatResource: URI, isRead: boolean): Promise<boolean>;
+    private _setLegacySessionReadState;
     deleteSession(sessionId: string): Promise<void>;
     deleteSessions(sessionIds: readonly string[]): Promise<void>;
     renameChat(sessionId: string, chatUri: URI, title: string): Promise<void>;
@@ -1173,6 +1325,11 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
     private _createAdditionalChat;
     forkChat(sessionId: string, sourceChat: URI, turnId: string): Promise<IChat>;
     createSideChat(sessionId: string, sourceChat: URI, turnId: string, selection?: ISideChatSelection): Promise<IChat>;
+    /**
+     * The model a chat is actually running on per the host: its draft model, else the model of
+     * its active or most recent turn. `undefined` when the chat state is not hydrated.
+     */
+    private _readRunningChatModel;
     private _resolveBackendSourceChatUri;
     sendRequest(chatId: string, chatResource: URI, options: ISendRequestOptions): Promise<ISession>;
     /** Send the first request for an already-committed peer chat, then clear its `new` flag. */
@@ -1191,7 +1348,9 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
      * behavior is still driven off the per-property `sessionMutable` flag.
      */
     private _preserveNewSessionConfig;
-    protected _rawIdFromChatId(chatId: string): string | undefined;
+    private _preserveNewSessionModelSelection;
+    protected _sessionKeyFromChatId(chatId: string): string | undefined;
+    private _acquireSessionChatDetails;
     /**
      * Guesses which of a session's chats an operation meant, for APIs that are keyed by session id
      * alone and so cannot say.
@@ -1275,16 +1434,6 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
      * sync.
      */
     private _applySessionStateUpdate;
-    /**
-     * Seed the cached adapter's changeset catalogue from an AHP
-     * {@link SessionState}. The catalogue otherwise only flows in via the live
-     * `SessionChangesetsChanged` action, which the host emits only when entries
-     * are added or removed. On restore (e.g. after a reload) nothing mutates, so
-     * that action never fires and the catalogue would stay empty. The restored
-     * `SessionState` snapshot carries the persisted `changesets`, so apply it
-     * here to surface the catalogue immediately.
-     */
-    private _applyChangesetsFromState;
     /**
      * Rebase the cached running adapter's selected agent against the host's agent
      * list from an AHP {@link SessionState}, before the picker is notified. A
@@ -1307,6 +1456,12 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
      * owns its own config via `NewSession._config`.
      */
     private _handleNewSessionStateUpdate;
+    /**
+     * A folder draft works on the checked-out branch, so its branch value follows
+     * the branch switches its Git state reports, including checkouts made outside
+     * the branch picker. Checkouts from the picker already set the value.
+     */
+    private _syncFolderDraftBranch;
     /**
      * Cleanup sentinel from {@link NewSession.dispose}: drops the cached
      * `_lastSessionStates` entry the new session contributed. Fires
@@ -1335,23 +1490,25 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
      * immediately so {@link getSessions} returns them before the first
      * `listSessions()` round-trip resolves.
      *
-     * `legacyStorageKey`, when given, is removed so stale entries are discarded.
+     * `legacyStorageKeys`, when given, are removed so stale entries are discarded.
      */
-    protected _enableSessionCachePersistence(storageKey: string, legacyStorageKey?: string): void;
+    protected _enableSessionCachePersistence(storageKey: string, legacyStorageKeys?: string | readonly string[]): void;
     /**
      * Whether {@link _onDidChangeSessions} events should update the persistence
-     * bookkeeping ({@link _cacheDirty} + {@link _metaByRawId}). Default `true`;
+     * bookkeeping ({@link _cacheDirty} + {@link _metadataBySession}). Default `true`;
      * the remote provider overrides this to suspend tracking while its cached
      * sessions are unpublished (offline), so the on-disk snapshot survives.
      */
     protected _shouldTrackSessionCacheChanges(): boolean;
+    /** Allows providers to migrate or reject cached metadata before constructing adapters. */
+    protected _adoptCachedSessionMeta(meta: IAgentSessionMetadata): IAgentSessionMetadata | undefined;
     /** Load persisted session summaries into {@link _sessionCache}. */
     private _loadCachedSessions;
     /**
      * Persist the current {@link _sessionCache} to storage, capping at
      * {@link CACHED_SESSIONS_MAX_PER_HOST} most-recently-modified entries.
      * Mutable fields are read from each adapter's observables and overlaid on
-     * top of the original metadata snapshot captured in {@link _metaByRawId}.
+     * top of the original metadata snapshot captured in {@link _metadataBySession}.
      */
     private _persistCache;
     protected _ensureSessionCache(): void;
@@ -1379,15 +1536,8 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
      */
     protected _cancelSessionRefreshRetry(): void;
     /**
-     * Resolve the freshly-committed backend session for an in-flight send.
-     *
-     * The local agent host runs a single provider whose session cache holds
-     * **every** agent-host session type (codex, claude, copilot, …). A send
-     * therefore has to identify *its own* new session by both novelty (a raw id
-     * not present before the send) **and** type: `expectedScheme` is the
-     * `chatResource` scheme (e.g. `agent-host-codex`), so a session of another
-     * type that happens to appear mid-send — a slow codex send racing against a
-     * restored claude session, say — is never mistaken for this send's commit.
+     * Resolves the freshly committed backend session for an in-flight send.
+     * A committed session preserves the draft URI, preventing unrelated sessions from replacing it.
      */
     private _waitForNewSession;
     /**
@@ -1399,13 +1549,12 @@ export declare abstract class BaseAgentHostSessionsProvider extends Disposable i
     private _handleSessionAdded;
     private _handleSessionRemoved;
     protected _onBackendSessionRemoved(_rawId: string): void;
-    private _removeCachedSession;
+    protected _removeCachedSession(rawId: string, expected?: AgentHostSessionAdapter): AgentHostSessionAdapter | undefined;
     private _handleTitleChanged;
     private _handleIsArchivedChanged;
     private _handleIsReadChanged;
     private _handleSessionSummaryChanged;
     private _handleConfigChanged;
-    private _handleChangesetsChanged;
     private _handleSessionMetaChanged;
     /**
      * Optional URI mapper used when applying diff changes. Subclasses