glimmervoid 0.42.0 → 0.42.2

package/dist/chunks/{main-DZzDU4Q4.js → main-Ywst1s6Z.js}

@@ -4,9 +4,9 @@ import { a as sanitizeWorktreeName, i as safePathSegment, n as equalsIgnoringCas
 import { a as packageRoot, n as cliPath, o as relayPath, r as clientDir, s as resolvePackageBin, t as bundled } from "./runtime-paths-BkeftE60.js";
 import { $t as STATES, A as SIGN_URL_ENV, At as TeamReviewStatus, B as LinkedPr, Bt as shortSha, Ct as ReviewThreadId, Dt as TeamReviewCompareFiles, E as SESSION_DOC_BODY_CAP_BYTES, Ft as decisionAsIfApprovalRequired, G as MyPrKeepMergeableRequest, H as MyPrAutoRebase, Ht as NODE_ID_RE, I as SshSignRequest, J as MyPrMergeMethod, L as TASK_TITLE_CONTROL_CHARACTERS, Lt as hasStandingViewerApproval, Mt as TeamReviewThreadResult, Nt as TeamReviewThreadsRepository, O as SESSION_NAME_PATTERN, Ot as TeamReviewResolveResponse, Pt as canApproveAfterComment, Q as MyPrMergeWhenReadyRequest, Qt as RESTARTABLE_STATES, R as TaskTitle, S as ConversationQuestion, St as ReviewResult, Tt as TeamReviewActionRequest, U as MyPrCheckContext, Ut as REPO_SLUG_RE, V as MyPr, Vt as GH_SEGMENT, W as MyPrCheckContextsResponse, Wt as repoParts, Xt as KILLABLE_STATES, Y as MyPrMergeRequest, Yt as BADGE_LABELS, Z as MyPrMergeStateResponse, Zt as MERGEABLE_LIVE_STATES, _ as CONVERSATION_TOOL_RESULT_HOOK_EVENT, _t as QueuedReview, bt as ReviewDraft, dt as EarlierReview, ft as FindingSeverity, g as CONVERSATION_PERMISSION_HOOK_EVENT, gt as PrDetail, h as CONVERSATION_APPROVAL_SUMMARY_MAX_CHARS, ht as PostingPlan, it as MyPrsState, j as SSH_SIGN_BODY_CAP_BYTES, jt as TeamReviewThreadCommentsResponse, k as SESSION_NAME_RULE_TEXT, kt as TeamReviewStateEntry, lt as CommitSha, m as COHERENCE_HOOKS_INACTIVE, mt as GithubReviewState, n as AGENT_URL_ENV, nt as MyPrThreadsResponse, q as MyPrLaneEntry, r as ASK_USER_QUESTION_TOOL_NAME, rt as MyPrsSnapshot, tt as MyPrThreadNode, ut as DECIDING_REVIEW_STATES, w as RefinedTaskTitle, wt as ReviewVerdict, xt as ReviewFinding, yt as ReviewComment, zt as HEX_SHA_RE } from "./session-3eSP3t1i.js";
 import { n as execFileAsync, o as spawn, r as execFileSync, t as execFile } from "./child-process-safe-D4hyVIXj.js";
-import { At as planTitle, C as GithubPrsFrame, Ct as PLAN_HOOK_EVENT, D as WorkflowsSettings, Dt as PlanDecision, E as WorkflowLabelName, Et as PLAN_TOOL_NAME, Ft as IssuesSearchResponse, It as IssuesState, L as KEEP_MERGEABLE_TIMEOUT_MINUTES_RANGE, Lt as IssuesStatus, Mt as GithubIssueResponse, Nt as IssueKey, Ot as PlanRevision, Pt as IssueUpdate, Rt as issuePullRequestStateFromGithub, S as GithubPrLightSearchNode, St as PLAN_BODY_CAP_BYTES, T as WorkflowCommentBody, Tt as PLAN_RESULT_HOOK_EVENT, _ as MergedPrListing, _t as TraceCheckpoint, b as GithubPrDetailNode, bt as ChangeMap, c as pullRequestKeyFromReference, d as BenchmarkId, f as BenchmarkJudgement, g as CommitComparison, gt as MAX_RAW_LINE_CHARS, h as BenchmarkSuite, ht as SessionSetup, i as DIFF_ANNOTATION_NOTE_MAX_CHARS, jt as GithubIssuePullRequestsRepository, k as WorkflowsState, kt as parseExitPlanModeHookPayload, l as BenchmarkActionRequest, m as BenchmarkStatus, mt as UpdateJournal, n as ClientMessage, p as BenchmarkRun, rt as USAGE_INTEGER_RANGES, t as CONTROL_FRAME_MAX_BYTES, u as BenchmarkCase, v as MinedPrReviewData, vt as TraceRecord, w as comparablePrKey, wt as PLAN_HOOK_OUTPUT_MAX_CHARS, x as GithubPrKey, xt as changeMapFactId, y as PrCheckoutCaseInput, yt as CoherenceJournalOutput } from "./control-messages-88sdxt-U.js";
+import { At as GithubIssueResponse, C as comparablePrKey, Ct as PLAN_RESULT_HOOK_EVENT, Dt as parseExitPlanModeHookPayload, E as WorkflowsSettings, Et as PlanRevision, F as KEEP_MERGEABLE_TIMEOUT_MINUTES_RANGE, Ft as IssuesStatus, It as issuePullRequestStateFromGithub, Mt as IssueUpdate, Nt as IssuesSearchResponse, O as WorkflowsState, Ot as planTitle, Pt as IssuesState, S as GithubPrsFrame, St as PLAN_HOOK_OUTPUT_MAX_CHARS, T as WorkflowLabelName, Tt as PlanDecision, _ as MinedPrReviewData, _t as CoherenceJournalOutput, b as GithubPrKey, bt as PLAN_BODY_CAP_BYTES, c as BenchmarkActionRequest, d as BenchmarkJudgement, f as BenchmarkRun, ft as UpdateJournal, g as MergedPrListing, gt as TraceRecord, h as CommitComparison, ht as TraceCheckpoint, jt as IssueKey, kt as GithubIssuePullRequestsRepository, l as BenchmarkCase, m as BenchmarkSuite, mt as MAX_RAW_LINE_CHARS, n as ClientMessage, p as BenchmarkStatus, pt as SessionSetup, s as pullRequestKeyFromReference, t as CONTROL_FRAME_MAX_BYTES, tt as USAGE_INTEGER_RANGES, u as BenchmarkId, v as PrCheckoutCaseInput, vt as ChangeMap, w as WorkflowCommentBody, wt as PLAN_TOOL_NAME, x as GithubPrLightSearchNode, xt as PLAN_HOOK_EVENT, y as GithubPrDetailNode, yt as changeMapFactId } from "./control-messages-Dgap3JRR.js";
 import { a as permitsHelpCommand, r as describeSessionLimits } from "./session-routes-B2oSzmQn.js";
-import { a as decideSpawnAllowance, c as describeKeptChildAttention, d as describeUnpushedCloseRefusal, h as projectReviews, i as decideAgentRequest, l as describePushLanding, m as projectMyPrs, n as REFUSAL_REASON, o as deriveChildSessionName, p as parseAgentVerb, s as describeChildEndNote, u as describeRoleRefusal } from "./agent-api-core-PwO7fPoc.js";
+import { a as decideSpawnAllowance, c as describeKeptChildAttention, d as describeUnpushedCloseRefusal, h as projectReviews, i as decideAgentRequest, l as describePushLanding, m as projectMyPrs, n as REFUSAL_REASON, o as deriveChildSessionName, p as parseAgentVerb, s as describeChildEndNote, u as describeRoleRefusal } from "./agent-api-core-DFYLP1bF.js";
 import { n as glimmervoidHomeDir, t as decideConfigPath } from "./config-path-core-DFt-TemS.js";
 import { i as parseCommandLine, n as warnWhenGitIsTooOld } from "./git-version-DqagvnAZ.js";
 import { n as checkGuardrailsDependencies, t as allowGuardedSpawn } from "./guardrails-deps-BjPzk1rE.js";
@@ -21,13 +21,13 @@ import { n as DEFAULT_MAX_MS, r as nextBackoffMs, t as DEFAULT_BASE_MS } from ".
 import { n as unrefTimer, t as DEFAULT_TIMER_FNS } from "./timer-deps-u2DAQLok.js";
 import { n as shellQuote } from "./hook-command-core-qTNK-xMF.js";
 import { C as parseCgroupBytes, S as memoryReserveBytes, T as parseMemAvailableBytes, _ as createSpawnGate, a as jsonStateLoadError, b as cgroupLimitBytes, c as loadedJsonValue, d as writeJsonAtomicSync, f as writeTextAtomic, g as createSerialQueue, h as createMemoryAdmission, i as createJsonStateWriter, m as createKeyedSerialQueue, n as appendJsonLines, o as loadJsonStateFile, p as writeTextAtomicSync, r as createJsonStateStore, s as loadJsonStateFileSync, t as appendJsonLine, u as writeJsonAtomic, v as isQueueAdmissionTimeout, w as parseCgroupV2Path, x as headroomFromReadings, y as cgroupAncestorPaths } from "./json-file-DFCTvPjj.js";
-import { $ as DEFAULT_BRANCH_GC_PREFIXES, B as buildExceptionProperties, F as TELEMETRY_BATCH_URL, G as exceptionFingerprint, H as decideIsDevInstall, I as TELEMETRY_FLAGS_URL, J as resolveProjectToken, K as nodeMajorVersion, L as adapterBucket, P as FIRST_RUN_NOTICE, R as buildAiGenerationEvents, U as decideRemoteTelemetryState, V as classifySessionExit, W as decideTelemetryConsent, Z as stableConfigKey, a as generateProjectId, at as worktreeIntegrationTips, b as validateSettingsBlock, ct as isSameDirectoryPath, d as assetForPlatform, et as matchedPrefix, f as decideRtkInstall, g as verifyDigest, h as isRtkBinaryName, i as ensureProjectIds, it as usablePrefixes, m as installTargetPath, n as DEFAULT_CONFIG, nt as planWorktreeGc, o as glimmervoidHomeDir$1, ot as canonicalizePath, p as findEscapingArchiveMember, q as parsePosthogReleaseId, r as createConfigStore, rt as sessionIdFromBranch, st as comparableDirectoryPath, t as ABORT_CONFIG_SAVE, tt as planBranchGc, v as mergeSettingsBlock, y as settingsBlockSpecFor, z as buildBrowserExceptionProperties } from "./config-store-BxCW2IwK.js";
-import { E as USAGE_VENDOR_KEYS, T as USAGE_COST_MODES, _ as PersistedTaskTitle, a as parseDataClientMessage, b as configIssueMessage, c as PendingCrashReport, d as TelemetryState, g as ConfigUpdate, i as parseDataAttachHistory, l as TELEMETRY_EVENT_SCHEMAS, m as BrowserConfig, n as HookEnvelope, o as DashboardTelemetryReport, r as DEEP_HISTORY_SCROLLBACK_LINES, t as HTTP_URL_RE, v as RUNTIME_CONFIG_SCALAR_KEYS, y as TASK_TITLE_SOURCE_PRIORITY } from "./contracts-LXlDbl4R.js";
-import { A as dedupeCodexFiles, B as shouldPersistWarehouse, C as shortSha$1, D as codexSessionIdFromPath, E as codexRootCandidates, F as passOutcome, H as claudeCode, I as projectDirCandidates, L as resolveProjectsDirs, M as grokHomes, N as grokRootCandidates, O as continuationDelayMs, P as isUsageFile, R as scopedClaudeRoots, S as parseResolvedSha, T as codexHomes, V as splitLines$1, _ as isCheckFresh, a as describeAgentResolvability, b as parseRegistryDeprecation, c as isKnownAgentId, d as resolveAdapter, f as setCustomAgents, g as decideUpdateStatus, h as decideInstallFlavor, i as customAgentFingerprint, j as expandTilde, k as decideFileRead, l as listAgentIds, m as readHostCodexVersion, n as cachedAgentResolvability, o as getAdapter, p as codex, r as commandFor, s as hookProfileOf, t as DEFAULT_AGENT_ID, u as resetCommandCache, v as normalizeSha, w as codexFallbackRoots, x as parseRegistryLatest, y as normalizeUpdateChannel, z as shouldEvaluateDespiteIoFailures } from "./adapters-D2u85MEH.js";
+import { $ as DEFAULT_BRANCH_GC_PREFIXES, B as buildExceptionProperties, F as TELEMETRY_BATCH_URL, G as exceptionFingerprint, H as decideIsDevInstall, I as TELEMETRY_FLAGS_URL, J as resolveProjectToken, K as nodeMajorVersion, L as adapterBucket, P as FIRST_RUN_NOTICE, R as buildAiGenerationEvents, U as decideRemoteTelemetryState, V as classifySessionExit, W as decideTelemetryConsent, Z as stableConfigKey, a as generateProjectId, at as worktreeIntegrationTips, b as validateSettingsBlock, ct as isSameDirectoryPath, d as assetForPlatform, et as matchedPrefix, f as decideRtkInstall, g as verifyDigest, h as isRtkBinaryName, i as ensureProjectIds, it as usablePrefixes, m as installTargetPath, n as DEFAULT_CONFIG, nt as planWorktreeGc, o as glimmervoidHomeDir$1, ot as canonicalizePath, p as findEscapingArchiveMember, q as parsePosthogReleaseId, r as createConfigStore, rt as sessionIdFromBranch, st as comparableDirectoryPath, t as ABORT_CONFIG_SAVE, tt as planBranchGc, v as mergeSettingsBlock, y as settingsBlockSpecFor, z as buildBrowserExceptionProperties } from "./config-store-DOGtTJ1d.js";
+import { T as USAGE_VENDOR_KEYS, _ as PersistedTaskTitle, a as parseDataClientMessage, b as configIssueMessage, c as PendingCrashReport, d as TelemetryState, g as ConfigUpdate, i as parseDataAttachHistory, l as TELEMETRY_EVENT_SCHEMAS, m as BrowserConfig, n as HookEnvelope, o as DashboardTelemetryReport, r as DEEP_HISTORY_SCROLLBACK_LINES, t as HTTP_URL_RE, v as RUNTIME_CONFIG_SCALAR_KEYS, w as USAGE_COST_MODES, y as TASK_TITLE_SOURCE_PRIORITY } from "./contracts-Ds_eevZs.js";
+import { A as dedupeCodexFiles, B as shouldPersistWarehouse, C as shortSha$1, D as codexSessionIdFromPath, E as codexRootCandidates, F as passOutcome, H as claudeCode, I as projectDirCandidates, L as resolveProjectsDirs, M as grokHomes, N as grokRootCandidates, O as continuationDelayMs, P as isUsageFile, R as scopedClaudeRoots, S as parseResolvedSha, T as codexHomes, V as splitLines$1, _ as isCheckFresh, a as describeAgentResolvability, b as parseRegistryDeprecation, c as isKnownAgentId, d as resolveAdapter, f as setCustomAgents, g as decideUpdateStatus, h as decideInstallFlavor, i as customAgentFingerprint, j as expandTilde, k as decideFileRead, l as listAgentIds, m as readHostCodexVersion, n as cachedAgentResolvability, o as getAdapter, p as codex, r as commandFor, s as hookProfileOf, t as DEFAULT_AGENT_ID, u as resetCommandCache, v as normalizeSha, w as codexFallbackRoots, x as parseRegistryLatest, y as normalizeUpdateChannel, z as shouldEvaluateDespiteIoFailures } from "./adapters-Bga1N6Ie.js";
 import { t as HOOK_TOOLS } from "./hook-tools-Dl7-r2Eb.js";
 import { a as formatSshPublicKey, c as orderAgentSockets, i as commitSigningShimText, l as parseSshPublicKey, n as NO_AGENT_HOLDS_KEY, o as isForwardedAgentDirName, r as agentListsKey, s as isSignableGitObject, t as COMMIT_SIGNING_SHIM_NAME } from "./ssh-signing-core-CRhVVWNW.js";
-import { a as configSiblingPath, c as defaultPairingsPath, d as decideDeviceAuth, f as deviceNameFromUserAgent, l as defaultSeenPath, n as normalizeRemoteConfig, o as createPairingsStore, p as hashSecret, r as validateRemoteConfig, s as createSeenStore, t as decideBindHost, u as DEFAULT_DEVICE_MAX_AGE_MS } from "./remote-config-Ce5nN0zL.js";
-import { n as configFileViewOf, u as readSettingsForAgent } from "./settings-readout-core-CWAhwZKN.js";
+import { a as configSiblingPath, c as defaultPairingsPath, d as decideDeviceAuth, f as deviceNameFromUserAgent, l as defaultSeenPath, n as normalizeRemoteConfig, o as createPairingsStore, p as hashSecret, r as validateRemoteConfig, s as createSeenStore, t as decideBindHost, u as DEFAULT_DEVICE_MAX_AGE_MS } from "./remote-config-DeWURqqr.js";
+import { n as configFileViewOf, u as readSettingsForAgent } from "./settings-readout-core-C2mOk9Yz.js";
 import { _ as escapeMarkup, g as createLaneLog, n as createVisionsSetup } from "./visions-setup-DB2P8JUL.js";
 import { t as getRtkPath } from "./rtk-resolver-BDHi6RMv.js";
 import { createRequire } from "node:module";
@@ -3874,7 +3874,6 @@ function createBackendShutdown(dependencies) {
 		stoppers.add("telegram-outbox", () => dependencies.telegramOutbox.idle());
 		destroySessions([
 			dependencies.visionsSessions,
-			dependencies.changeMapSessions,
 			dependencies.taskTitleSessions ?? /* @__PURE__ */ new Map(),
 			dependencies.benchmarkSessions ?? /* @__PURE__ */ new Map()
 		], pendingReaps);
@@ -20062,6 +20061,10 @@ var Session = class extends EventEmitter {
 		this._output.push(data);
 		if (this.listenerCount("data") > 0) this.emit("data", data);
 	}
+	_isExitHeadedForFailure(event) {
+		if (this.state === STATES.FAILED) return false;
+		return TRANSITIONS[this.state]?.[event] === STATES.FAILED;
+	}
 	_handleSpawnedPtyExit(guardrailsLaunch, exitCode, signal) {
 		this._disposeGuardrailsLaunch(guardrailsLaunch);
 		this._stopConversationBridge();
@@ -20081,6 +20084,11 @@ var Session = class extends EventEmitter {
 		if (pid) this._exitReap = this._reapTreeOnce(pid);
 		const { event, detail } = decideExitTransition(this.state, exitCode, signal, this._receivedFirstOutput);
 		const reason = detail.reason || null;
+		const pendingRemoteExitReason = this._isExitHeadedForFailure(event) ? this._getRemoteLaunch()?.describeExit().catch(() => null) : void 0;
+		if (pendingRemoteExitReason) {
+			const remoteExitReason = await pendingRemoteExitReason;
+			if (remoteExitReason && this._isExitHeadedForFailure(event)) this.failureReason = remoteExitReason;
+		}
 		this.transition(event, detail);
 		if (this._recorder) {
 			this._recorder.writeFooter("pty_exit", exitCode);
@@ -29812,6 +29820,26 @@ function coderErrorDetail(stderr) {
 function isCoderSignedOutError(stderr) {
 	return typeof stderr === "string" && stderr.includes("You are signed out or your session has expired");
 }
+function remoteWorkRefusal({ uncommittedStatus, unpushedLog, stashList, branch, workspace }) {
+	if (uncommittedStatus.trim()) return `Branch ${branch} in Coder workspace ${workspace} has uncommitted changes`;
+	if (unpushedLog.trim()) return `Branch ${branch} in Coder workspace ${workspace} has commits that are not pushed`;
+	if (stashList.trim()) return `Branch ${branch} in Coder workspace ${workspace} has stashed changes`;
+	return null;
+}
+var describeStoppedExit = (workspace) => `Coder workspace ${workspace} stopped, by its idle stop or its stop-after limit. Restart to start it again.`;
+var describeDeletedExit = (workspace) => `Coder workspace ${workspace} was deleted. Restart to get a fresh workspace.`;
+var REMOTE_EXIT_REASON_BY_STATUS = {
+	stopped: describeStoppedExit,
+	stopping: describeStoppedExit,
+	deleting: describeDeletedExit,
+	gone: describeDeletedExit,
+	failed: (workspace) => `Coder workspace ${workspace} failed. Restart to get a fresh workspace.`
+};
+function remoteExitReason({ workspace, status }) {
+	const describeExit = status === null ? void 0 : REMOTE_EXIT_REASON_BY_STATUS[status];
+	if (describeExit) return describeExit(workspace);
+	return `The connection to Coder workspace ${workspace} was lost. Restart to reconnect.`;
+}
 function coderNotSignedInReason(failure) {
 	return `The coder CLI on this host is not signed in. Run coder login, then try again. (${failure})`;
 }
@@ -29904,6 +29932,10 @@ function createCoderEnvPoller({ listWorkspaces, stopWorkspace, deleteWorkspace,
 //#endregion
 //#region server/coder/coder-env-wiring.ts
 var CODER_UNAVAILABLE_REASON = "Coder environments are unavailable on this host";
+var REMOTE_SESSIONS_OFF_REFUSAL = {
+	ok: false,
+	reason: "Remote Coder sessions are off. Turn on Remote Coder sessions (experimental) in Settings."
+};
 function createCoderEnvWiring({ config, persistMapping, onReconciled = () => {}, loadOwnedWorkspaces, saveOwnedWorkspaces, runCoder: executeCoder, env = process.env, platform = process.platform, fetch: fetchReady = globalThis.fetch, createPoller = createCoderEnvPoller, now = Date.now, log = console, ...pollerDeps }) {
 	let binaryProbe = null;
 	let isCoderAvailable = false;
@@ -29914,6 +29946,7 @@ function createCoderEnvWiring({ config, persistMapping, onReconciled = () => {},
 	const lastSeenStatusByWorkspace = /* @__PURE__ */ new Map();
 	const provisionByProject = /* @__PURE__ */ new Map();
 	const failedProvisionByProject = /* @__PURE__ */ new Map();
+	const renewalByProject = /* @__PURE__ */ new Map();
 	const setTimeoutFn = pollerDeps.setTimeoutFn ?? DEFAULT_TIMER_FNS.setTimeoutFn;
 	let ownedWorkspaces = /* @__PURE__ */ new Set([...loadOwnedWorkspaces(), ...currentMappings().map((mapping) => mapping.workspace)]);
 	let ownedSaveChain = Promise.resolve();
@@ -30001,18 +30034,29 @@ function createCoderEnvWiring({ config, persistMapping, onReconciled = () => {},
 		if (workspaces !== null) await pruneOwned(workspaces);
 		return listingJson;
 	}
-	async function listWorkspaces() {
+	async function listWorkspaces(timeoutMs) {
 		const workspaces = recordListing((await command([
 			"list",
 			"-o",
 			"json"
-		])).stdout);
+		], timeoutMs)).stdout);
 		if (workspaces === null) throw new Error("Invalid Coder workspace listing");
 		return workspaces;
 	}
 	function workspaceStatus(workspace) {
 		return lastSeenStatusByWorkspace.get(workspace) ?? null;
 	}
+	async function describeRemoteExit(workspace) {
+		const workspaces = await listWorkspaces(1e4).catch(() => null);
+		if (workspaces === null) return remoteExitReason({
+			workspace,
+			status: null
+		});
+		return remoteExitReason({
+			workspace,
+			status: workspaces.find((candidate) => candidate.name === workspace)?.status ?? "gone"
+		});
+	}
 	function isConfigured() {
 		return Boolean(config.coder?.environments?.length) && (platform === "linux" || platform === "darwin");
 	}
@@ -30185,10 +30229,7 @@ function createCoderEnvWiring({ config, persistMapping, onReconciled = () => {},
 		};
 	}
 	async function reserve({ projectId, environmentName, branch, liveCount }) {
-		if (config.remoteSessions !== true) return {
-			ok: false,
-			reason: "Remote Coder sessions are off. Turn on Remote Coder sessions (experimental) in Settings."
-		};
+		if (config.remoteSessions !== true) return REMOTE_SESSIONS_OFF_REFUSAL;
 		const environment = resolveEnvironment(environmentName);
 		if (!environment) return {
 			ok: false,
@@ -30211,6 +30252,12 @@ function createCoderEnvWiring({ config, persistMapping, onReconciled = () => {},
 			ok: false,
 			reason: unavailableReason
 		};
+		return freshMapping({
+			environmentName,
+			branch
+		});
+	}
+	function freshMapping({ environmentName, branch }) {
 		const workspace = workspaceNameFromHex(randomBytes(6).toString("hex"));
 		if (workspace === null) return {
 			ok: false,
@@ -30226,6 +30273,74 @@ function createCoderEnvWiring({ config, persistMapping, onReconciled = () => {},
 			}
 		};
 	}
+	function renew(request) {
+		if (config.remoteSessions !== true) return Promise.resolve(REMOTE_SESSIONS_OFF_REFUSAL);
+		const inFlightRenewal = renewalByProject.get(request.projectId);
+		if (inFlightRenewal) return inFlightRenewal;
+		const renewal = renewUnclaimed(request);
+		renewalByProject.set(request.projectId, renewal);
+		renewal.finally(() => renewalByProject.delete(request.projectId));
+		return renewal;
+	}
+	async function renewUnclaimed({ projectId, repoRemoteUrl, baseBranch, liveCount }) {
+		if (provisionByProject.has(projectId)) return {
+			ok: true,
+			renewed: false
+		};
+		const mapping = config.projects.find((project) => project.id === projectId)?.environment;
+		if (!mapping) return {
+			ok: false,
+			reason: `Project ${projectId} has no Coder workspace mapping`
+		};
+		if (!failedProvisionByProject.has(projectId) && await isWorkspaceListed(mapping.workspace) && workspaceStatus(mapping.workspace) !== "failed") return {
+			ok: true,
+			renewed: false
+		};
+		const environment = resolveEnvironment(mapping.name);
+		if (!environment) return {
+			ok: false,
+			reason: `Unknown Coder environment: ${mapping.name}`
+		};
+		const limitReason = liveLimitRefusal({
+			liveCount,
+			maxLive: environment.maxLive,
+			environmentName: mapping.name
+		});
+		if (limitReason) return {
+			ok: false,
+			reason: limitReason
+		};
+		if (!await ensureAvailable()) return {
+			ok: false,
+			reason: unavailableReason
+		};
+		const fresh = freshMapping({
+			environmentName: mapping.name,
+			branch: mapping.branch
+		});
+		if (!fresh.ok) return fresh;
+		try {
+			await saveMapping(projectId, fresh.mapping);
+		} catch (error) {
+			return {
+				ok: false,
+				reason: `Could not save the new Coder workspace mapping: ${errorMessage(error)}`
+			};
+		}
+		failedProvisionByProject.delete(projectId);
+		provision({
+			projectId,
+			mapping: fresh.mapping,
+			repoRemoteUrl,
+			baseBranch
+		}).then((provisioned) => {
+			if (!provisioned.ok) log.warn(`[coder-env] fresh Coder workspace for project ${projectId} failed: ${provisioned.reason}`);
+		});
+		return {
+			ok: true,
+			renewed: true
+		};
+	}
 	function provision({ projectId, mapping, repoRemoteUrl, baseBranch }) {
 		const savedMapping = config.projects.find((candidate) => candidate.id === projectId)?.environment;
 		if (JSON.stringify(savedMapping) !== JSON.stringify(mapping)) return Promise.resolve({
@@ -30407,6 +30522,88 @@ function createCoderEnvWiring({ config, persistMapping, onReconciled = () => {},
 			}
 		});
 	}
+	async function uncheckedRemoteWorkReason(mapping) {
+		const environment = resolveEnvironment(mapping.name);
+		if (!environment) throw new Error(`Unknown Coder environment: ${mapping.name}`);
+		if (!await ensureAvailable()) throw new Error(unavailableReason);
+		const status = (await listWorkspaces()).find((candidate) => candidate.name === mapping.workspace)?.status ?? "gone";
+		if (status === "gone") return null;
+		if (status !== "running") throw new Error(`Coder workspace ${mapping.workspace} is ${status}`);
+		const checkoutDirectory = remoteCheckoutDirectory({
+			checkoutRoot: environment.checkoutRoot,
+			workspace: mapping.workspace
+		});
+		const uncommittedStatus = (await command([
+			"ssh",
+			mapping.workspace,
+			"--",
+			remoteCommand([
+				"git",
+				"--no-optional-locks",
+				"-C",
+				checkoutDirectory,
+				"status",
+				"--porcelain"
+			])
+		])).stdout;
+		const unpushedLog = (await command([
+			"ssh",
+			mapping.workspace,
+			"--",
+			remoteCommand([
+				"git",
+				"-C",
+				checkoutDirectory,
+				"log",
+				"--branches",
+				"HEAD",
+				"--not",
+				"--remotes",
+				"--oneline"
+			])
+		])).stdout;
+		const stashList = (await command([
+			"ssh",
+			mapping.workspace,
+			"--",
+			remoteCommand([
+				"git",
+				"-C",
+				checkoutDirectory,
+				"stash",
+				"list"
+			])
+		])).stdout;
+		return remoteWorkRefusal({
+			uncommittedStatus,
+			unpushedLog,
+			stashList,
+			branch: mapping.branch,
+			workspace: mapping.workspace
+		});
+	}
+	async function remoteWorkReason(mapping) {
+		try {
+			return await whileWorkspaceBusy(mapping.workspace, () => uncheckedRemoteWorkReason(mapping));
+		} catch (error) {
+			return `Could not check remote work on ${mapping.branch} in Coder workspace ${mapping.workspace}: ${errorMessage(error)}`;
+		}
+	}
+	async function settleRemoval({ projectId, discardRemoteWork }) {
+		await provisionByProject.get(projectId);
+		const mapping = config.projects.find((project) => project.id === projectId)?.environment;
+		if (!mapping) return { ok: true };
+		const keptWorkReason = discardRemoteWork ? null : await remoteWorkReason(mapping);
+		if (keptWorkReason) return {
+			ok: false,
+			reason: keptWorkReason,
+			canDiscardRemoteWork: true
+		};
+		release({ projectId }).then((released) => {
+			if (!released.ok) log.warn(`[coder-env] ${released.reason}; the orphan sweep will stop ${mapping.workspace}`);
+		});
+		return { ok: true };
+	}
 	async function uploadFile({ workspace, remotePath, contents, mode }) {
 		if (workspaceNameFromHex(workspace.slice(3)) !== workspace) throw new Error("Invalid Coder workspace name");
 		const fileMode = typeof mode === "number" ? mode.toString(8) : mode;
@@ -30436,10 +30633,13 @@ function createCoderEnvWiring({ config, persistMapping, onReconciled = () => {},
 		availableEnvironments,
 		reserve,
 		provision,
+		renew,
 		resume,
 		release,
+		settleRemoval,
 		uploadFile,
-		workspaceStatus
+		workspaceStatus,
+		describeRemoteExit
 	};
 }
 var DEFAULT_INTERVAL_MS$1 = 216e5;
@@ -34590,319 +34790,6 @@ function createIngestLane({ config = null, broadcast = null, logger = console, l
 	};
 }
 //#endregion
-//#region server/change-map/core/change-narrative-core.ts
-var FACT_GROUPS = [
-	"files",
-	"subsystems",
-	"coChangeGaps",
-	"hotspots",
-	"blastRadius",
-	"untestedFiles",
-	"collisions",
-	"links"
-];
-function narrativeFacts(map) {
-	return { repos: map.repos.map((repo) => ({
-		name: repo.name,
-		base: repo.base,
-		totalCounts: Object.fromEntries(FACT_GROUPS.map((group) => [group, repo[group].length])),
-		files: capFacts(repo.files, compareFactIds),
-		subsystems: capFacts(repo.subsystems, compareFactIds).map(capSubsystemPaths),
-		coChangeGaps: capFacts(repo.coChangeGaps, compareFactIds),
-		hotspots: capFacts(repo.hotspots, compareFactIds),
-		blastRadius: capFacts(repo.blastRadius, compareBlastRadius),
-		untestedFiles: capFacts(repo.untestedFiles, compareFactIds),
-		collisions: capFacts(repo.collisions, compareFactIds),
-		links: capFacts(repo.links, compareLinks)
-	})).sort((left, right) => left.name.localeCompare(right.name)) };
-}
-function capFacts(facts, compare) {
-	return [...facts].sort(compare).slice(0, 20);
-}
-function capSubsystemPaths(subsystem) {
-	return {
-		...subsystem,
-		paths: subsystem.paths.slice(0, 20),
-		pathCount: subsystem.paths.length
-	};
-}
-function compareFactIds(left, right) {
-	return left.factId.localeCompare(right.factId);
-}
-function compareBlastRadius(left, right) {
-	return right.transitiveDependentCount - left.transitiveDependentCount || compareFactIds(left, right);
-}
-function compareLinks(left, right) {
-	return right.changedImporterCount - left.changedImporterCount || right.importerCount - left.importerCount || compareFactIds(left, right);
-}
-function factsHashInput(map) {
-	return JSON.stringify(narrativeFacts(map), (_key, value) => {
-		if (!value || typeof value !== "object" || Array.isArray(value)) return value;
-		return Object.fromEntries(Object.entries(value).sort(([left], [right]) => {
-			if (left < right) return -1;
-			if (left > right) return 1;
-			return 0;
-		}));
-	});
-}
-function hasNarratableFacts(map) {
-	return map.repos.some((repo) => repo.files.length > 0);
-}
-function knownNarrativeFactIds(map) {
-	const knownFactIds = /* @__PURE__ */ new Set();
-	for (const repo of narrativeFacts(map).repos) for (const group of FACT_GROUPS) for (const fact of repo[group]) knownFactIds.add(fact.factId);
-	return knownFactIds;
-}
-function buildNarrativePrompt({ facts, resultPath }) {
-	const deliveryLines = resultPath ? ["Use no tools except Write to the exact result file path below.", "Write"] : ["Answer with the JSON as your final message and write no files.", "Return"];
-	return [
-		"The facts below are your only source of truth. Read nothing else.",
-		deliveryLines[0],
-		`${deliveryLines[1]} JSON { "claims": [{ "text": string, "factIds": string[] }] } with at most 12 claims.`,
-		"Each claim must be one or two plain-English sentences about how a change connects to the codebase or what risk it carries.",
-		"Every claim must cite one or more factIds copied exactly from the facts. Do not invent facts or identifiers.",
-		"When links are present, lead with how a change in one repository reaches another through them.",
-		`Each fact list and subsystem path list holds at most 20 entries; totalCounts and pathCount give the full sizes.`,
-		`Keep each claim within 600 characters.`,
-		...resultPath ? [`Result file: ${resultPath}`] : [],
-		`Facts JSON: ${JSON.stringify(facts)}`
-	].join("\n");
-}
-function validateNarrative({ raw, knownFactIds, factsHash, model }) {
-	if (!raw || typeof raw !== "object" || Array.isArray(raw)) return null;
-	const offeredClaims = "claims" in raw ? raw.claims : null;
-	if (!Array.isArray(offeredClaims)) return null;
-	const claims = [];
-	for (const offeredClaim of offeredClaims) {
-		if (!offeredClaim || typeof offeredClaim !== "object" || Array.isArray(offeredClaim)) continue;
-		const text = "text" in offeredClaim ? offeredClaim.text : null;
-		const factIds = "factIds" in offeredClaim ? offeredClaim.factIds : null;
-		if (typeof text !== "string" || text.length > 600) continue;
-		if (!Array.isArray(factIds)) continue;
-		const cleanText = text.replaceAll(String.fromCharCode(8212), "-").replaceAll(String.fromCharCode(8211), "-").replaceAll(String.fromCharCode(8230), "...").trim();
-		if (!cleanText || cleanText.length > 600) continue;
-		const citedFactIds = [...new Set(factIds.filter((factId) => typeof factId === "string" && knownFactIds.has(factId)))];
-		if (citedFactIds.length === 0) continue;
-		claims.push({
-			text: cleanText,
-			factIds: citedFactIds
-		});
-		if (claims.length >= 12) break;
-	}
-	if (claims.length === 0) return null;
-	return {
-		factsHash,
-		model,
-		claims
-	};
-}
-//#endregion
-//#region server/change-map/change-narrator.ts
-var MAX_CACHED_HASHES = 64;
-var PROMPT_FILE$2 = "change-narrative-prompt.txt";
-var RESULT_FILE$2 = "change-narrative-result.json";
-var SCHEMA_FILE = "change-narrative-schema.json";
-var BOOTSTRAP_PROMPT$1 = `Read ${PROMPT_FILE$2} and follow its instructions`;
-var CODEX_BOOTSTRAP_PROMPT = `Read ${PROMPT_FILE$2} in your cwd and answer only with the JSON`;
-var CODEX_OUTPUT_SCHEMA = {
-	type: "object",
-	additionalProperties: false,
-	required: ["claims"],
-	properties: { claims: {
-		type: "array",
-		maxItems: 12,
-		items: {
-			type: "object",
-			additionalProperties: false,
-			required: ["text", "factIds"],
-			properties: {
-				text: { type: "string" },
-				factIds: {
-					type: "array",
-					items: { type: "string" }
-				}
-			}
-		}
-	} }
-};
-async function codexLaunch(workDir, resultPath, codexModel) {
-	const schemaPath = path.join(workDir, SCHEMA_FILE);
-	await fsp.writeFile(schemaPath, JSON.stringify(CODEX_OUTPUT_SCHEMA), "utf8");
-	return {
-		promptResultPath: null,
-		bootstrapPrompt: CODEX_BOOTSTRAP_PROMPT,
-		agent: "codex",
-		extraArgs: [
-			"exec",
-			"--ephemeral",
-			"--skip-git-repo-check",
-			"--output-schema",
-			schemaPath,
-			"-o",
-			resultPath,
-			...codexModel ? ["-m", codexModel] : []
-		],
-		model: null
-	};
-}
-function claudeLaunch(resultPath, model) {
-	return {
-		promptResultPath: resultPath,
-		bootstrapPrompt: BOOTSTRAP_PROMPT$1,
-		agent: void 0,
-		extraArgs: [],
-		model
-	};
-}
-function makeNarrationWorkDir() {
-	return fsp.mkdtemp(path.join(os.tmpdir(), "glimmervoid-change-narrative-"));
-}
-async function spawnNarrationWithSession({ map, factsHash, engine, model, codexModel, timeoutSeconds }, spawn, nowFn) {
-	const workDir = await makeNarrationWorkDir();
-	const promptPath = path.join(workDir, PROMPT_FILE$2);
-	const resultPath = path.join(workDir, RESULT_FILE$2);
-	const controller = new AbortController();
-	const timeout = setTimeout(() => controller.abort(), timeoutSeconds * 1e3);
-	timeout.unref();
-	try {
-		const launch = engine === "codex" ? await codexLaunch(workDir, resultPath, codexModel) : claudeLaunch(resultPath, model);
-		await fsp.writeFile(promptPath, buildNarrativePrompt({
-			facts: narrativeFacts(map),
-			resultPath: launch.promptResultPath
-		}), "utf8");
-		await spawn({
-			id: `change-narrative:${nowFn()}:${crypto.randomUUID()}`,
-			name: "Change map narrative",
-			cwd: workDir,
-			prompt: launch.bootstrapPrompt,
-			agent: launch.agent,
-			extraArgs: launch.extraArgs,
-			model: launch.model,
-			signal: controller.signal
-		});
-		if (controller.signal.aborted) return null;
-		return validateNarrative({
-			raw: await readLaneResultFile(resultPath),
-			knownFactIds: knownNarrativeFactIds(map),
-			factsHash,
-			model
-		});
-	} finally {
-		clearTimeout(timeout);
-		await fsp.rm(workDir, {
-			recursive: true,
-			force: true
-		});
-	}
-}
-function createChangeNarrator({ getConfig, spawnNarration, spawnLane = createLaneSpawn({ laneName: "change-map" }), nowFn = () => Date.now() }) {
-	const runNarration = spawnNarration ?? ((request) => spawnNarrationWithSession(request, spawnLane, nowFn));
-	const cachedByHash = /* @__PURE__ */ new Map();
-	const queuedBySessionId = /* @__PURE__ */ new Map();
-	let active = null;
-	function narratorSettings() {
-		const parsed = BrowserConfig.shape.changeMap.safeParse(getConfig().changeMap);
-		if (!parsed.success) return null;
-		return parsed.data?.narrator ?? null;
-	}
-	function cache(factsHash, narrative) {
-		cachedByHash.delete(factsHash);
-		cachedByHash.set(factsHash, narrative);
-		if (cachedByHash.size <= MAX_CACHED_HASHES) return;
-		const oldestHash = cachedByHash.keys().next().value;
-		if (oldestHash) cachedByHash.delete(oldestHash);
-	}
-	function start(request) {
-		const callbacksBySessionId = /* @__PURE__ */ new Map([[request.sessionId, request.onSettled]]);
-		active = {
-			factsHash: request.factsHash,
-			callbacksBySessionId
-		};
-		Promise.resolve().then(() => runNarration(request)).then((narrative) => finish(request.factsHash, narrative), () => finish(request.factsHash, null));
-	}
-	function startNext() {
-		if (active) return;
-		for (const [sessionId, request] of queuedBySessionId) {
-			queuedBySessionId.delete(sessionId);
-			if (!narratorSettings()?.enabled || cachedByHash.has(request.factsHash)) {
-				request.onSettled();
-				continue;
-			}
-			start(request);
-			break;
-		}
-	}
-	function finish(factsHash, narrative) {
-		if (!active || active.factsHash !== factsHash) return;
-		const callbacks = [...active.callbacksBySessionId.values()];
-		cache(factsHash, narrative);
-		active = null;
-		startNext();
-		for (const callback of callbacks) callback();
-	}
-	function narrationFor(map, onSettled, { mayStart = true } = {}) {
-		const config = narratorSettings();
-		if (!config?.enabled || !hasNarratableFacts(map)) {
-			queuedBySessionId.delete(map.sessionId);
-			return {
-				narrative: null,
-				narratorState: "disabled"
-			};
-		}
-		const engine = config.engine ?? "claude";
-		const configuredModel = config.model?.trim() || "";
-		const model = configuredModel || (engine === "claude" ? "haiku" : "codex default");
-		const factsHash = crypto.createHash("sha256").update(JSON.stringify([
-			factsHashInput(map),
-			engine,
-			configuredModel
-		])).digest("hex");
-		if (cachedByHash.has(factsHash)) {
-			queuedBySessionId.delete(map.sessionId);
-			const narrative = cachedByHash.get(factsHash) ?? null;
-			return {
-				narrative,
-				narratorState: narrative ? "ready" : "failed"
-			};
-		}
-		if (active?.factsHash === factsHash) {
-			active.callbacksBySessionId.set(map.sessionId, onSettled);
-			queuedBySessionId.delete(map.sessionId);
-			return {
-				narrative: null,
-				narratorState: "pending"
-			};
-		}
-		if (!mayStart) return {
-			narrative: null,
-			narratorState: queuedBySessionId.has(map.sessionId) ? "pending" : "disabled"
-		};
-		const request = {
-			map,
-			factsHash,
-			sessionId: map.sessionId,
-			onSettled,
-			engine,
-			model,
-			codexModel: engine === "codex" ? configuredModel || null : null,
-			timeoutSeconds: config.timeoutSeconds ?? 90
-		};
-		if (active) {
-			queuedBySessionId.set(map.sessionId, request);
-			return {
-				narrative: null,
-				narratorState: "pending"
-			};
-		}
-		start(request);
-		return {
-			narrative: null,
-			narratorState: "pending"
-		};
-	}
-	return { narrationFor };
-}
-//#endregion
 //#region server/task-title-refiner.ts
 var PROMPT_FILE$1 = "task-title-prompt.txt";
 var RESULT_FILE$1 = "task-title-result.json";
@@ -46275,7 +46162,6 @@ function createBackendLanes(dependencies) {
 		reviewSessions,
 		investigationSessions,
 		visionsSessions,
-		changeMapSessions,
 		taskTitleSessions,
 		benchmarkSessions
 	];
@@ -46556,21 +46442,6 @@ function createBackendLanes(dependencies) {
 			...notice
 		});
 	});
-	const changeMapSessions = /* @__PURE__ */ new Map();
-	const changeMapNarrator = createChangeNarrator({
-		getConfig: () => configStore.config,
-		spawnLane: createLaneSpawn({
-			sessions: changeMapSessions,
-			closeSessionDataClients,
-			hookRouter,
-			getHookPort,
-			spawnGate,
-			recordLane,
-			replayBufferKB: config.replayBufferKB,
-			laneName: "change-map",
-			guardrailsRefusal
-		})
-	});
 	const taskTitleSessions = /* @__PURE__ */ new Map();
 	const taskTitleRefiner = createTaskTitleRefiner({
 		getConfig: () => configStore.config,
@@ -46758,13 +46629,11 @@ function createBackendLanes(dependencies) {
 		branchGc,
 		coderActivity,
 		coderEnv,
-		changeMapNarrator,
 		taskTitleRefiner,
 		taskTitleSessions,
 		current,
 		currentIngest,
 		currentVisions,
-		changeMapSessions,
 		gitWorkspace,
 		gitWorkspaceSync,
 		githubStore,
@@ -49108,6 +48977,7 @@ function createSessionFactory(dependencies) {
 			}),
 			nodePath: environment?.nodePath ?? "node",
 			ensureRunning: async () => coderEnv ? coderEnv.resume({ projectId }) : refusal,
+			describeExit: async () => coderEnv ? coderEnv.describeRemoteExit(mapping.workspace) : null,
 			uploadFile: async (file) => {
 				if (!coderEnv) throw new Error(refusal.reason);
 				await coderEnv.uploadFile({
@@ -49189,34 +49059,6 @@ function createSessionFactory(dependencies) {
 	};
 }
 //#endregion
-//#region server/core/diff-annotations-core.ts
-var DIFF_ANNOTATION_HEADER = "Operator review notes on the current worktree diff:";
-var DIFF_ANNOTATION_CLOSING = "Address each note, then reply with what changed.";
-var REMOVED_LINE_MARKER = "(removed line)";
-function sortAnnotations(list) {
-	return [...list].sort((left, right) => {
-		if (left.path !== right.path) return left.path < right.path ? -1 : 1;
-		if (left.line !== right.line) return left.line - right.line;
-		if (left.side === right.side) return 0;
-		return left.side < right.side ? -1 : 1;
-	});
-}
-function formatDiffAnnotationMessage(annotations) {
-	const entries = sortAnnotations(annotations).flatMap((annotation) => {
-		const note = scrubForPaste(annotation.note, DIFF_ANNOTATION_NOTE_MAX_CHARS);
-		const path = scrubForPaste(annotation.path, 400);
-		if (!note || !path) return [];
-		const marker = annotation.side === "old" ? ` ${REMOVED_LINE_MARKER}` : "";
-		return [`- ${path}:${annotation.line} (${annotation.section})${marker} ${note}`];
-	});
-	if (entries.length === 0) return "";
-	return [
-		DIFF_ANNOTATION_HEADER,
-		...entries,
-		DIFF_ANNOTATION_CLOSING
-	].join("\n");
-}
-//#endregion
 //#region server/github/core/github-issues-core.ts
 var GITHUB_ISSUE_BODY_MAX_CHARS = 12e3;
 function fencedBody(body) {
@@ -50204,7 +50046,7 @@ function changedFilesOf(scope) {
 		isCommitted: false
 	}));
 }
-function createChangeMapService({ sessions, narrator = null, onNarrationSettled = () => {}, runGit = runGitAsync, nowFn = Date.now }) {
+function createChangeMapService({ sessions, runGit = runGitAsync, nowFn = Date.now }) {
 	const specifierCache = createFileFactCache(extractImportSpecifiers, []);
 	const pythonSpecifierCache = createFileFactCache(extractPythonImportSpecifiers, []);
 	const tsconfigCache = createFileFactCache((text) => ({ config: parseTsconfigJsonc(text) }), { config: null });
@@ -50355,7 +50197,7 @@ function createChangeMapService({ sessions, narrator = null, onNarrationSettled
 			};
 		}
 	}
-	async function assemble(session, mayStartNarration) {
+	async function assemble(session) {
 		forgetEndedSiblings();
 		const scopes = await session.getChangeScopes();
 		const inputsByRoot = /* @__PURE__ */ new Map();
@@ -50436,44 +50278,31 @@ function createChangeMapService({ sessions, narrator = null, onNarrationSettled
 				for (const repo of repos) repo.links = [];
 			}
 		}
-		const factsOnly = {
+		return ChangeMap.parse({
 			sessionId: session.id,
 			sig: hashText(JSON.stringify(scopes)),
 			generatedAt: nowFn(),
-			repos,
-			narrative: null,
-			narratorState: "disabled"
-		};
-		const narration = narrator ? narrator.narrationFor(factsOnly, () => onNarrationSettled(session.id), { mayStart: mayStartNarration }) : null;
-		return ChangeMap.parse(narration ? {
-			...factsOnly,
-			...narration
-		} : factsOnly);
+			repos
+		});
 	}
-	function startAssembly(session, mayStartNarration) {
-		const running = assemble(session, mayStartNarration).finally(() => {
+	function startAssembly(session) {
+		const running = assemble(session).finally(() => {
 			if (runningBySessionId.get(session.id) === running) runningBySessionId.delete(session.id);
 		});
 		runningBySessionId.set(session.id, running);
 		return running;
 	}
-	function build(session, { mayStartNarration = true } = {}) {
+	function build(session) {
 		const queued = queuedBySessionId.get(session.id);
-		if (queued) {
-			queued.mayStartNarration ||= mayStartNarration;
-			return queued.promise;
-		}
+		if (queued) return queued;
 		const running = runningBySessionId.get(session.id);
-		if (!running) return startAssembly(session, mayStartNarration);
-		const followUp = {
-			mayStartNarration,
-			promise: running.then(ignoreOutcome, ignoreOutcome).then(() => {
-				queuedBySessionId.delete(session.id);
-				return startAssembly(session, followUp.mayStartNarration);
-			})
-		};
+		if (!running) return startAssembly(session);
+		const followUp = running.then(ignoreOutcome, ignoreOutcome).then(() => {
+			queuedBySessionId.delete(session.id);
+			return startAssembly(session);
+		});
 		queuedBySessionId.set(session.id, followUp);
-		return followUp.promise;
+		return followUp;
 	}
 	return { build };
 }
@@ -50755,14 +50584,14 @@ function requestValidationErrorReply(msg, message) {
 			ok: false,
 			error: message
 		}),
-		"delete-hook": () => ({
-			type: "delete-hook-result",
+		"remove-session": () => ({
+			type: "remove-session-result",
 			requestId,
 			ok: false,
 			error: message
 		}),
-		"send-diff-annotations": () => ({
-			type: "send-diff-annotations-result",
+		"delete-hook": () => ({
+			type: "delete-hook-result",
 			requestId,
 			ok: false,
 			error: message
@@ -50834,25 +50663,8 @@ function registerControlHandlers(controlWss, deps) {
 			issue: null,
 			error: "Issues polling is not running."
 		}
-	}), issueProjectRepos = null, serverBuild = () => null, getUsageSessions = null, getUsageReport = null, requestUsageReport = null, getPlanLimits = null, controlReplayLog = null, getRtkInstallStatus = () => null, telegramDelivery = null, resolveRtkPath = () => getRtkPath(), conversationFs = fs, conversationGit = runGitForConversationHistory, conversationProjectsDir = claudeProjectsDir(process.env, os.homedir()), readTracePage = null, readPlanRevision = null, decidePlanReview = null, sessionDocs = null, coherenceFeed = null, changeMapNarrator = null, coderEnv = null, remoteRepoGit = null, agentConnect = null } = deps;
-	const changeMaps = createChangeMapService({
-		sessions,
-		narrator: changeMapNarrator,
-		onNarrationSettled: (sessionId) => {
-			broadcastChangeMap(sessionId).catch((error) => {
-				console.warn(`[control] change-map broadcast failed: id=${sessionId}: ${errorMessage(error)}`);
-			});
-		}
-	});
-	async function broadcastChangeMap(sessionId) {
-		const session = sessions.get(sessionId);
-		if (!session) return;
-		broadcastControl({
-			type: "change-map",
-			id: session.id,
-			map: await changeMaps.build(session, { mayStartNarration: false })
-		});
-	}
+	}), issueProjectRepos = null, serverBuild = () => null, getUsageSessions = null, getUsageReport = null, requestUsageReport = null, getPlanLimits = null, controlReplayLog = null, getRtkInstallStatus = () => null, telegramDelivery = null, resolveRtkPath = () => getRtkPath(), conversationFs = fs, conversationGit = runGitForConversationHistory, conversationProjectsDir = claudeProjectsDir(process.env, os.homedir()), readTracePage = null, readPlanRevision = null, decidePlanReview = null, sessionDocs = null, coherenceFeed = null, coderEnv = null, remoteRepoGit = null, agentConnect = null } = deps;
+	const changeMaps = createChangeMapService({ sessions });
 	function buildSettingsPayload$1() {
 		return buildSettingsPayload({
 			configStore,
@@ -50950,9 +50762,56 @@ function registerControlHandlers(controlWss, deps) {
 		console.log(`[control] Added session via UI: ${name}${skipPerms ? " (skip permissions)" : " (permission prompts)"}${remote ? ` (Coder environment ${remote.environment.name})` : ""}`);
 		return created.project;
 	}
-	function liveWorkspaceCount(environmentName) {
+	async function remoteRepoSource(projectPath) {
+		if (!remoteRepoGit) return {
+			ok: false,
+			error: "Coder environments are unavailable on this host"
+		};
+		const repoRemoteUrl = await remoteRepoGit.originUrl({ projectPath });
+		if (!repoRemoteUrl) return {
+			ok: false,
+			error: `${projectPath} has no origin remote, so a Coder workspace cannot clone it.`
+		};
+		const baseBranch = configuredIntegrationBranch(config) ?? await remoteRepoGit.detectDefaultBranch({ projectPath });
+		if (!baseBranch) return {
+			ok: false,
+			error: `Could not find the default branch of ${projectPath} on origin.`
+		};
+		return {
+			ok: true,
+			repoRemoteUrl,
+			baseBranch
+		};
+	}
+	async function restartSession(msg, ws, restart) {
+		const sess = findSession(msg);
+		if (!sess) return;
+		const project = config.projects.find((candidate) => candidate.id === sess.id);
+		if (sess.state !== STATES.FAILED || !project?.environment || !coderEnv) {
+			restart(sess);
+			return;
+		}
+		const source = await remoteRepoSource(project.path);
+		if (!source.ok) {
+			sendError(ws, source.error, { id: sess.id });
+			return;
+		}
+		const renewal = await coderEnv.renew({
+			projectId: project.id,
+			repoRemoteUrl: source.repoRemoteUrl,
+			baseBranch: source.baseBranch,
+			liveCount: liveWorkspaceCount(project.environment.name, project.id)
+		});
+		if (!renewal.ok) {
+			sendError(ws, renewal.reason, { id: sess.id });
+			return;
+		}
+		restart(sess);
+	}
+	function liveWorkspaceCount(environmentName, excludedProjectId) {
 		return config.projects.filter((project) => {
 			if (project.environment?.name !== environmentName) return false;
+			if (project.id === excludedProjectId) return false;
 			const session = sessions.get(project.id);
 			return session !== void 0 && session.state !== STATES.DORMANT;
 		}).length;
@@ -50972,17 +50831,12 @@ function registerControlHandlers(controlWss, deps) {
 			refuseAddSession(msg, ws, { error: "Coder environments are unavailable on this host" });
 			return;
 		}
-		const projectPath = path.resolve((msg.path || "").trim());
-		const repoRemoteUrl = await remoteRepoGit.originUrl({ projectPath });
-		if (!repoRemoteUrl) {
-			refuseAddSession(msg, ws, { error: `${projectPath} has no origin remote, so a Coder workspace cannot clone it.` });
-			return;
-		}
-		const baseBranch = configuredIntegrationBranch(config) ?? await remoteRepoGit.detectDefaultBranch({ projectPath });
-		if (!baseBranch) {
-			refuseAddSession(msg, ws, { error: `Could not find the default branch of ${projectPath} on origin.` });
+		const source = await remoteRepoSource(path.resolve((msg.path || "").trim()));
+		if (!source.ok) {
+			refuseAddSession(msg, ws, { error: source.error });
 			return;
 		}
+		const { repoRemoteUrl, baseBranch } = source;
 		const id = generateProjectId();
 		const reserved = await coderEnv.reserve({
 			projectId: id,
@@ -51041,22 +50895,46 @@ function registerControlHandlers(controlWss, deps) {
 		if (sess.state !== STATES.DORMANT) return;
 		sess.start();
 	}
-	function handleRemoveSession(msg, ws) {
+	async function removeSession(msg) {
 		const sess = findSession(msg);
-		if (!sess) {
-			sendError(ws, "Session not found");
-			return;
-		}
+		if (!sess) return {
+			ok: false,
+			error: "Session not found"
+		};
 		if (agentSessions.get(sess.id) === sess) {
 			sess.destroy();
 			console.log(`[control] Removed spawned session via UI: ${sess.name}`);
-			return;
+			return { ok: true };
+		}
+		if (config.projects.some((project) => project.id === sess.id && project.environment) && coderEnv) {
+			sess.killSession();
+			const settlement = await coderEnv.settleRemoval({
+				projectId: sess.id,
+				discardRemoteWork: msg.discardRemoteWork === true
+			});
+			if (!settlement.ok) return {
+				ok: false,
+				error: settlement.reason,
+				canDiscardRemoteWork: settlement.canDiscardRemoteWork
+			};
 		}
 		const freshConfig = configStore.save((cfg) => {
 			cfg.projects = cfg.projects.filter((p) => p.id !== sess.id);
 		});
 		if (freshConfig) applyConfigReload(freshConfig);
 		console.log(`[control] Removed session via UI: ${sess.name}`);
+		return { ok: true };
+	}
+	async function handleRemoveSession(msg, ws) {
+		const removal = await removeSession(msg);
+		if (msg.requestId) {
+			replyTo(ws, msg, "remove-session-result", removal.ok ? {
+				ok: true,
+				error: null
+			} : removal);
+			return;
+		}
+		if (!removal.ok) sendError(ws, removal.error);
 	}
 	function handleRenameSession(msg, ws) {
 		const sess = findSession(msg);
@@ -52063,33 +51941,6 @@ function registerControlHandlers(controlWss, deps) {
 			error: res.error || null
 		});
 	}
-	function handleSendDiffAnnotations(msg, ws) {
-		const reply = (payload) => replyTo(ws, msg, "send-diff-annotations-result", {
-			ok: false,
-			error: null,
-			...payload
-		});
-		const session = findSession(msg);
-		if (!session) {
-			reply({ error: "Session not found" });
-			return;
-		}
-		const text = formatDiffAnnotationMessage(msg.annotations ?? []);
-		if (!text) {
-			reply({ error: "No review notes to send" });
-			return;
-		}
-		const pasted = session.pasteTextWhenReady(text);
-		if (!pasted.ok) {
-			reply({ error: `Could not write to "${session.name}" (${pasted.reason})` });
-			return;
-		}
-		session.noteOperatorDraft();
-		reply({
-			ok: true,
-			pending: pasted.deferred === true
-		});
-	}
 	async function handleRequestUsageReport(msg, ws) {
 		if (!requestUsageReport) {
 			ws.send(JSON.stringify({
@@ -52289,20 +52140,17 @@ function registerControlHandlers(controlWss, deps) {
 		"request-hooks-report": handleRequestHooksReport,
 		"save-hook": handleSaveHook,
 		"delete-hook": handleDeleteHook,
-		"send-diff-annotations": handleSendDiffAnnotations,
 		"kill": (msg) => {
 			const s = findSession(msg);
 			if (s) s.killSession();
 		},
 		"start-session": handleStartSession,
-		"restart": (msg) => {
-			const s = findSession(msg);
-			if (s) s.restart({ fresh: msg.fresh === true });
-		},
-		"force-restart": (msg) => {
-			const s = findSession(msg);
-			if (s) s.forceRestart({ fresh: msg.fresh === true });
-		},
+		"restart": (msg, ws) => restartSession(msg, ws, (s) => {
+			s.restart({ fresh: msg.fresh === true });
+		}),
+		"force-restart": (msg, ws) => restartSession(msg, ws, (s) => {
+			s.forceRestart({ fresh: msg.fresh === true });
+		}),
 		"dismiss": (msg) => {
 			const session = findSession(msg);
 			if (!session) return;
@@ -52360,8 +52208,6 @@ function registerControlHandlers(controlWss, deps) {
 					sig: null,
 					generatedAt: Date.now(),
 					repos: [],
-					narrative: null,
-					narratorState: "disabled",
 					error: `Change map could not be built: ${errorMessage(error)}`
 				};
 			});
@@ -52818,7 +52664,6 @@ function createBackendControl(dependencies) {
 		decidePlanReview: dependencies.decidePlanReview,
 		sessionDocs: dependencies.sessionDocs,
 		coherenceFeed: dependencies.coherenceFeed,
-		changeMapNarrator: dependencies.changeMapNarrator,
 		coderEnv: laneAssembly.coderEnv,
 		remoteRepoGit: laneAssembly.gitWorkspace,
 		agentConnect: dependencies.agentConnect
@@ -56633,7 +56478,7 @@ function createBackend(httpServer, options = {}) {
 		logger: console,
 		renameSessionFromTaskTitle
 	});
-	const { allLiveSessions, branchGc, coderActivity, changeMapSessions, gitWorkspace: assembledGitWorkspace, gitWorkspaceSync, posthog, recordLane, spawnGate, tapIngestForSession, teamReview, myPrs, issues, traceChangeBroadcast, traceWiring, uploadsWiring, usage, visionsSessions, visionsSetup } = laneAssembly;
+	const { allLiveSessions, branchGc, coderActivity, gitWorkspace: assembledGitWorkspace, gitWorkspaceSync, posthog, recordLane, spawnGate, tapIngestForSession, teamReview, myPrs, issues, traceChangeBroadcast, traceWiring, uploadsWiring, usage, visionsSessions, visionsSetup } = laneAssembly;
 	gitWorkspace = assembledGitWorkspace;
 	agentApi = createAgentApiWiring({
 		config,
@@ -56821,7 +56666,6 @@ function createBackend(httpServer, options = {}) {
 		reviewSessions,
 		investigationSessions,
 		visionsSessions,
-		changeMapSessions,
 		taskTitleSessions: laneAssembly.taskTitleSessions,
 		benchmarkSessions: laneAssembly.benchmarkSessions,
 		branchGc,
@@ -56897,7 +56741,6 @@ function createBackend(httpServer, options = {}) {
 		decidePlanReview: laneAssembly.planReview?.decide ?? null,
 		sessionDocs,
 		coherenceFeed,
-		changeMapNarrator: laneAssembly.changeMapNarrator,
 		serverBuild: () => serverBuild,
 		telemetry,
 		logger: console