glimmervoid 0.41.1 → 0.42.1

package/dist/chunks/{main-CRU5ahjl.js → main-ZpBLKI1h.js}

@@ -2,13 +2,13 @@ import { i as sanitizeOneLine, n as requireExecutableSpawnHelper, r as firstLine
 import { a as isMissingFileError, i as errorText$1, r as errorMessage, t as errorCode } from "./text-DoirglWV.js";
 import { a as sanitizeWorktreeName, i as safePathSegment, n as equalsIgnoringCaseOnWindows, r as isPathInside, t as caseFoldedPathKey } from "./paths-Bu4eH1Yd.js";
 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 { A as SIGN_URL_ENV, At as TeamReviewThreadCommentsResponse, B as MyPr, Bt as GH_SEGMENT, Ct as ReviewVerdict, Dt as TeamReviewResolveResponse, E as SESSION_DOC_BODY_CAP_BYTES, Et as TeamReviewCompareFiles, H as MyPrCheckContext, Ht as REPO_SLUG_RE, I as SshSignRequest, It as hasStandingViewerApproval, J as MyPrMergeRequest, Jt as BADGE_LABELS, K as MyPrLaneEntry, L as TASK_TITLE_CONTROL_CHARACTERS, Mt as TeamReviewThreadsRepository, Nt as canApproveAfterComment, O as SESSION_NAME_PATTERN, Ot as TeamReviewStateEntry, Pt as decisionAsIfApprovalRequired, Qt as STATES, R as TaskTitle, Rt as HEX_SHA_RE, S as ConversationQuestion, St as ReviewThreadId, U as MyPrCheckContextsResponse, Ut as repoParts, V as MyPrAutoRebase, Vt as NODE_ID_RE, W as MyPrKeepMergeableRequest, X as MyPrMergeStateResponse, Xt as MERGEABLE_LIVE_STATES, Yt as KILLABLE_STATES, Z as MyPrMergeWhenReadyRequest, Zt as RESTARTABLE_STATES, _ as CONVERSATION_TOOL_RESULT_HOOK_EVENT, bt as ReviewFinding, ct as CommitSha, dt as FindingSeverity, et as MyPrThreadNode, g as CONVERSATION_PERMISSION_HOOK_EVENT, gt as QueuedReview, h as CONVERSATION_APPROVAL_SUMMARY_MAX_CHARS, ht as PrDetail, j as SSH_SIGN_BODY_CAP_BYTES, jt as TeamReviewThreadResult, k as SESSION_NAME_RULE_TEXT, kt as TeamReviewStatus, lt as DECIDING_REVIEW_STATES, m as COHERENCE_HOOKS_INACTIVE, mt as PostingPlan, n as AGENT_URL_ENV, nt as MyPrsSnapshot, pt as GithubReviewState, q as MyPrMergeMethod, r as ASK_USER_QUESTION_TOOL_NAME, rt as MyPrsState, tt as MyPrThreadsResponse, ut as EarlierReview, vt as ReviewComment, w as RefinedTaskTitle, wt as TeamReviewActionRequest, xt as ReviewResult, yt as ReviewDraft, z as LinkedPr, zt as shortSha } from "./session-C8IpFmGQ.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-C6JGCTuy.js";
-import { a as permitsHelpCommand, r as describeSessionLimits } from "./session-routes-nySS7DUE.js";
-import { a as decideSpawnAllowance, c as describeRoleRefusal, d as projectMyPrs, f as projectReviews, i as decideAgentRequest, n as REFUSAL_REASON, o as deriveChildSessionName, s as describePushLanding, u as parseAgentVerb } from "./agent-api-core-CLxZAole.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-DHDEMTLI.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-CP4J2B39.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-D_iXgYTZ.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";
 import { t as HOOK_URL_ENV } from "./hook-relay-core-DA_bz2KA.js";
 import { t as HOOK_VIA_GUARDRAILS_PROXY_ENV } from "./guardrails-proxy-core-BI3rdY-m.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-CxYqTNbe.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-C9Jj9iDo.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-CyDflXHy.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-Br2PY4Tg.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-DJqeCtR3.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-CWIHOfVo.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-CaW0mpwr.js";
-import { n as configFileViewOf, u as readSettingsForAgent } from "./settings-readout-core-CX7DmEuG.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-DcmhRuRc.js";
+import { n as configFileViewOf, u as readSettingsForAgent } from "./settings-readout-core-2XunjdBA.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";
@@ -2040,6 +2040,7 @@ function projectSessionCard(source, { id, name }) {
 		guardrailsReleased: source.isGuardrailsReleased === true,
 		resumeSessionId: source.resumeSessionId || null,
 		...source.isWorkspace ? { workspace: true } : {},
+		...source.remoteWorkspace ? { remoteWorkspace: source.remoteWorkspace } : {},
 		...source.linkedPrs?.length ? { linkedPrs: source.linkedPrs } : {},
 		...source.ownerId ? { ownerId: source.ownerId } : {}
 	};
@@ -2065,6 +2066,7 @@ function projectSessionSnapshots(source) {
 		ownerId: source.ownerId ?? null,
 		isWorktree: source.isWorktree,
 		isWorkspace: source.isWorkspace,
+		remoteWorkspace: source.remoteWorkspace ?? null,
 		isGuarded: source.isGuarded === true,
 		isGuardrailsReleased: source.isGuardrailsReleased === true,
 		resumeSessionId: source.resumeSessionId,
@@ -2082,6 +2084,7 @@ function projectSessionSnapshots(source) {
 		mergeReason: source.mergeReason,
 		worktreeNotice: source.worktreeNotice,
 		failureReason: source.failureReason ?? null,
+		unseenOutcome: source.unseenOutcome ?? null,
 		effectiveBase: source.effectiveBase ?? null,
 		linkedPrs: source.linkedPrs,
 		coherenceHooks: source.coherenceHooks ?? null,
@@ -2561,6 +2564,7 @@ function createAgentApiWiring({ config, agentSessions, listAllSessions, listBoar
 	const parentsWithChannelCleanup = /* @__PURE__ */ new WeakSet();
 	const sessionsWithOperatorWatch = /* @__PURE__ */ new WeakSet();
 	const lastOperatorInputAtBySession = /* @__PURE__ */ new WeakMap();
+	const childIdsToDiscard = /* @__PURE__ */ new Set();
 	function forgetLink(childId) {
 		const link = linksByChildId.get(childId);
 		if (link) for (const timer of link.retryTimersBySide.values()) clearTimeoutFn(timer);
@@ -2695,6 +2699,45 @@ function createAgentApiWiring({ config, agentSessions, listAllSessions, listBoar
 			parent.off("teardown", closeChildWithParent);
 		};
 	}
+	async function keepOrDiscardChildWorktree(child, worktree, isParentRemoved) {
+		const isDiscardRequested = childIdsToDiscard.delete(child.id);
+		if (!worktree) return false;
+		if (isDiscardRequested || isParentRemoved) {
+			await child.discardWorktree();
+			return false;
+		}
+		return !await child.discardWorktreeIfClean();
+	}
+	async function settleChildWorktree(parentId, child, childName, startAttempt, worktreeAtStart) {
+		try {
+			await startAttempt.catch(() => {});
+			await child._awaitPendingReaps();
+			const worktree = child.getWorktreeCarry();
+			const registeredParent = listAllSessions().find((session) => session.id === parentId);
+			const isKept = await keepOrDiscardChildWorktree(child, worktree, !registeredParent);
+			if (registeredParent && worktree && isKept) {
+				logger.warn(`[${AGENT_LANE_TAG} ${childName}] kept a worktree with unpushed work: ${worktree.worktreeDir}`);
+				registeredParent.noteAttention(describeKeptChildAttention(childName, worktree));
+				post(child.id, "toParent", {
+					author: "glimmervoid",
+					text: describeChildEndNote(childName, {
+						kind: "kept",
+						worktree
+					}),
+					at: now()
+				});
+				return;
+			}
+			const kind = worktree || worktreeAtStart ? "discarded" : "none";
+			post(child.id, "toParent", {
+				author: "glimmervoid",
+				text: describeChildEndNote(childName, { kind }),
+				at: now()
+			});
+		} catch (error) {
+			logger.warn(`[${AGENT_LANE_TAG} ${childName}] could not settle the worktree: ${errorMessage(error)}`);
+		}
+	}
 	function post(childId, side, entry) {
 		const channel = channelsByChildId.get(childId);
 		if (!channel) return;
@@ -2796,6 +2839,8 @@ function createAgentApiWiring({ config, agentSessions, listAllSessions, listBoar
 			unguarded: !parent.isGuarded
 		};
 		let child = null;
+		let worktreeAtStart = null;
+		let startAttempt = Promise.resolve();
 		let released = false;
 		let detachFromParent = () => {};
 		const releaseChildSlot = () => {
@@ -2808,6 +2853,7 @@ function createAgentApiWiring({ config, agentSessions, listAllSessions, listBoar
 				id,
 				session: name
 			});
+			if (child) settleChildWorktree(parent.id, child, name, startAttempt, worktreeAtStart);
 		};
 		const abandonChild = (reason) => {
 			logger.warn(`[${AGENT_LANE_TAG} ${name}] ${reason}`);
@@ -2843,7 +2889,7 @@ function createAgentApiWiring({ config, agentSessions, listAllSessions, listBoar
 			});
 			spawned.on("exit", releaseChildSlot);
 			spawned.on("teardown", releaseChildSlot);
-			await spawnGate.run(() => {
+			startAttempt = spawnGate.run(() => {
 				if (spawned._destroyed) return void 0;
 				broadcastControl({
 					type: "session-added",
@@ -2854,7 +2900,9 @@ function createAgentApiWiring({ config, agentSessions, listAllSessions, listBoar
 				});
 				return spawned.start();
 			});
+			await startAttempt;
 			if (!spawned.hasLivePty) return abandonChild("the child never reached a live terminal");
+			worktreeAtStart = spawned.getWorktreeCarry();
 			return {
 				ok: true,
 				sessionId: id,
@@ -2981,7 +3029,7 @@ function createAgentApiWiring({ config, agentSessions, listAllSessions, listBoar
 				error: outcome.error
 			}
 		};
-		const note = `this session owns ${outcome.name} until the task is done: glimmervoid read ${outcome.sessionId} reads its messages, glimmervoid send ${outcome.sessionId} <text> steers it, and glimmervoid close ${outcome.sessionId} ends it`;
+		const note = `this session owns ${outcome.name} until the task is done: glimmervoid read ${outcome.sessionId} reads its messages, glimmervoid send ${outcome.sessionId} <text> steers it, and glimmervoid close ${outcome.sessionId} ends it and discards its worktree, refusing while it holds work that is not on the integration branch unless you add --discard`;
 		return {
 			status: 200,
 			body: {
@@ -3050,11 +3098,16 @@ function createAgentApiWiring({ config, agentSessions, listAllSessions, listBoar
 			}
 		};
 	}
-	function close(session, { child }) {
+	async function close(session, { child, discard = false }) {
 		const owned = findChildOf(session, child);
 		if (!owned.ok) return refusal(404, owned.error);
 		const childSession = agentSessions.get(owned.channel.childId);
-		if (!childSession) return refusal(409, `${owned.channel.childName} has already ended`);
+		const alreadyEnded = refusal(409, `${owned.channel.childName} has already ended`);
+		if (!childSession) return alreadyEnded;
+		const worktree = childSession.getWorktreeCarry();
+		if (!discard && worktree && await childSession.hasUnmergedWork()) return refusal(409, describeUnpushedCloseRefusal(owned.channel.childName, owned.channel.childId, worktree));
+		if (agentSessions.get(owned.channel.childId) !== childSession) return alreadyEnded;
+		if (discard) childIdsToDiscard.add(childSession.id);
 		childSession.destroy();
 		return {
 			status: 200,
@@ -4113,7 +4166,7 @@ function explainNotification(to, gate, event, opts) {
 		};
 	}
 	if (to === STATES.RUNNING) {
-		if (event === "user_input" || Boolean(opts && opts.signal === "resume") || !opts || !opts.hookSeen) {
+		if (event === "user_input" || !opts || !opts.hookSeen) {
 			gate.reset();
 			return {
 				category: null,
@@ -5371,10 +5424,10 @@ function createSessionEventWiring(dependencies) {
 		session.on("agent-attention", ({ note }) => {
 			pendingAgentNote = pendingAgentNote === null ? note : `${pendingAgentNote} | ${note}`;
 		});
-		session.on("user-prompt", () => {
+		session.on("user-prompt", ({ isSelfWake }) => {
 			markTurnWorking();
 			pendingAgentNote = null;
-			notifyGate.reset();
+			if (!isSelfWake) notifyGate.reset();
 			releaseDeferredAcknowledge();
 		});
 		session.on("waiting-input-acknowledged", () => dependencies.notificationManager.acknowledge(session.id));
@@ -5405,6 +5458,7 @@ function createSessionEventWiring(dependencies) {
 		relay("wakeup-change", "session-wakeup");
 		session.on("wakeup-change", persistWasWorking);
 		relay("prompt-kind-change", "session-prompt");
+		relay("unseen-outcome-change", "session-unseen");
 		relay("conversation-change", "session-conversation");
 		session.on("merge-status", ({ mergeStatus, reason, parked }) => {
 			dependencies.broadcastControl({
@@ -6569,6 +6623,18 @@ function formatTouchedRanges(ranges) {
 	return (Array.isArray(ranges) ? ranges : []).map((range) => range.start === range.end ? `${range.start}` : `${range.start}-${range.end}`).join(", ");
 }
 //#endregion
+//#region shared/fnv-hash.ts
+var FNV_OFFSET_BASIS = 2166136261;
+var FNV_PRIME = 16777619;
+function fnv1a32(text) {
+	let hash = FNV_OFFSET_BASIS;
+	for (let index = 0; index < text.length; index += 1) {
+		hash ^= text.charCodeAt(index);
+		hash = Math.imul(hash, FNV_PRIME) >>> 0;
+	}
+	return hash;
+}
+//#endregion
 //#region server/visions/core/visions-dispatch-core.ts
 var DEFAULT_QUIET_MS = 3e4;
 var DEFAULT_COOLDOWN_MS = 3e5;
@@ -6647,12 +6713,7 @@ function resolveVisionsConfig(raw) {
 }
 function hashText$1(text) {
 	const value = typeof text === "string" ? text : "";
-	let hash = 2166136261;
-	for (let index = 0; index < value.length; index += 1) {
-		hash ^= value.charCodeAt(index);
-		hash = Math.imul(hash, 16777619) >>> 0;
-	}
-	return `${value.length.toString(36)}-${hash.toString(36)}`;
+	return `${value.length.toString(36)}-${fnv1a32(value).toString(36)}`;
 }
 function createDispatchState(dispatchTimes = []) {
 	return {
@@ -12813,11 +12874,13 @@ function seedTaskTitleSources({ persistedTitle, resumeSessionId, customTitle, in
 		customTitle
 	};
 }
+var envelopePattern = (tag) => new RegExp(`<${tag}\\b[^>]*>[\\s\\S]*?</${tag}\\s*>`, "gi");
+var TASK_NOTIFICATION_ENVELOPE_PATTERN = envelopePattern("task-notification");
 var PROMPT_ENVELOPE_PATTERNS = [
-	"pasted_content",
-	"system-reminder",
-	"task-notification"
-].map((tag) => new RegExp(`<${tag}\\b[^>]*>[\\s\\S]*?</${tag}\\s*>`, "gi"));
+	envelopePattern("pasted_content"),
+	envelopePattern("system-reminder"),
+	TASK_NOTIFICATION_ENVELOPE_PATTERN
+];
 var MIN_SUBSTANTIVE_WORDS = 3;
 var CONTINUATION_PROMPTS = new Set([
 	"yes please continue",
@@ -12837,6 +12900,10 @@ function cleanTaskPrompt(prompt) {
 	for (const pattern of PROMPT_ENVELOPE_PATTERNS) cleanedPrompt = cleanedPrompt.replace(pattern, " ");
 	return cleanedPrompt.replace(/\s+/g, " ").trim();
 }
+function isSelfWakePrompt(prompt) {
+	if (typeof prompt !== "string") return false;
+	return prompt.replace(TASK_NOTIFICATION_ENVELOPE_PATTERN, " ").trim() === "" && prompt.trim() !== "";
+}
 function isSubstantivePrompt(prompt) {
 	if (typeof prompt !== "string") return false;
 	const cleanedPrompt = cleanTaskPrompt(prompt);
@@ -14469,6 +14536,13 @@ var ENTRY_HOOKS = {
 		session.emit("session-done", { name: session.name });
 	}
 };
+var UNSEEN_OUTCOME_ON_ENTRY = /* @__PURE__ */ new Map([
+	[STATES.COMPLETE, "finished"],
+	[STATES.FAILED, "failed"],
+	[STATES.INITIALIZING, null],
+	[STATES.DORMANT, null],
+	[STATES.DONE, null]
+]);
 var EXIT_HOOKS = { [STATES.WAITING](session) {
 	session.emit("attention-cleared", { name: session.name });
 } };
@@ -18349,6 +18423,7 @@ var Session = class extends EventEmitter {
 	state;
 	stateSince;
 	failureReason;
+	unseenOutcome;
 	ephemeral;
 	agentId;
 	usageVendor;
@@ -18456,6 +18531,7 @@ var Session = class extends EventEmitter {
 		this.state = STATES.DORMANT;
 		this.stateSince = Date.now();
 		this.failureReason = null;
+		this.unseenOutcome = null;
 		this._receivedFirstOutput = false;
 		this._killPollTimer = null;
 		this._killReapTimer = null;
@@ -18696,13 +18772,8 @@ var Session = class extends EventEmitter {
 	get recentTaskPrompts() {
 		return [...this._recentTaskPrompts];
 	}
-	setPendingTaskTitle(prompt) {
-		this._taskTitleSources.pendingPromptTitle = extractPromptTaskTitle(prompt);
-		this._updateTaskTitle();
-	}
 	applyTaskTitleRefinement(refinement) {
 		if (refinement.action === "replace") this._taskTitleSources.refinedTitle = refinement.title;
-		this._taskTitleSources.pendingPromptTitle = null;
 		this._updateTaskTitle();
 	}
 	_updateTaskTitle() {
@@ -18829,7 +18900,8 @@ var Session = class extends EventEmitter {
 			this.emit("user-prompt", {
 				state: this.state,
 				stateSince: this.stateSince,
-				ts: Date.now()
+				ts: Date.now(),
+				isSelfWake: isSelfWakePrompt(raw.payload?.prompt)
 			});
 		}
 		if (raw && raw.signal === "ready" && raw.source === "hook") this.backgroundTracking.applyBackgroundTasks(raw.payload);
@@ -19153,6 +19225,9 @@ var Session = class extends EventEmitter {
 	get isWorkspace() {
 		return this.worktreeLifecycle.snapshot().isWorkspace;
 	}
+	get remoteWorkspace() {
+		return this._getRemoteLaunch()?.workspace ?? null;
+	}
 	getWorktreeCarry() {
 		return this.worktreeLifecycle.getCarry();
 	}
@@ -19274,6 +19349,7 @@ var Session = class extends EventEmitter {
 			ownerId: this.ownerId,
 			isWorktree: this.isWorktree,
 			isWorkspace: this.isWorkspace,
+			remoteWorkspace: this.remoteWorkspace,
 			isGuarded: this.isGuarded,
 			isGuardrailsReleased: this.isGuardrailsReleased,
 			resumeSessionId: this._resumeSessionId,
@@ -19291,6 +19367,7 @@ var Session = class extends EventEmitter {
 			mergeReason: this.mergeReason,
 			worktreeNotice: this.worktreeNotice,
 			failureReason: this.failureReason,
+			unseenOutcome: this.unseenOutcome,
 			effectiveBase: this.worktreeLifecycle.snapshot().effectiveBase,
 			linkedPrs: this.linkedPrs,
 			coherenceHooks: this.coherenceHooks,
@@ -19335,6 +19412,8 @@ var Session = class extends EventEmitter {
 		this.state = to;
 		if (event === "spawn_fail") this.failureReason = describeSpawnFailure(detail);
 		if (to === STATES.INITIALIZING) this.failureReason = null;
+		const unseenOutcomeOnEntry = UNSEEN_OUTCOME_ON_ENTRY.get(to);
+		if (unseenOutcomeOnEntry !== void 0 && !isCompactionRestoreEvent(event)) this._setUnseenOutcome(unseenOutcomeOnEntry);
 		if (to === STATES.IDLE || to === STATES.COMPLETE) this._observeCompaction("settled");
 		const entryHook = ENTRY_HOOKS[to];
 		if (entryHook && !isCompactionRestoreEvent(event)) entryHook(this);
@@ -19983,6 +20062,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();
@@ -20002,6 +20085,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);
@@ -20182,9 +20270,16 @@ var Session = class extends EventEmitter {
 		this._armTimer("_killPollTimer", KILL_POLL_INTERVAL_MS, poll);
 	}
 	dismiss() {
-		if (!DISMISSIBLE_STATES.has(this.state)) return false;
+		const hadUnseenOutcome = this.unseenOutcome !== null;
+		this._setUnseenOutcome(null);
+		if (!DISMISSIBLE_STATES.has(this.state)) return hadUnseenOutcome;
 		return this.transition("user_dismiss");
 	}
+	_setUnseenOutcome(nextUnseenOutcome) {
+		if (this.unseenOutcome === nextUnseenOutcome) return;
+		this.unseenOutcome = nextUnseenOutcome;
+		this.emit("unseen-outcome-change", { unseenOutcome: nextUnseenOutcome });
+	}
 	_teardownPending() {
 		return this._pendingRestart || this._finishing;
 	}
@@ -29594,7 +29689,9 @@ var GLIMMERVOID_WORKSPACE_RE = /^gv-[0-9a-f]{12}$/;
 var IDLE_STOP_STATES = /* @__PURE__ */ new Set([
 	STATES.IDLE,
 	STATES.COMPLETE,
-	STATES.DORMANT
+	STATES.DORMANT,
+	STATES.FAILED,
+	STATES.DONE
 ]);
 var CODER_ENVIRONMENT_DEFAULTS = Object.freeze({
 	idleStopMinutes: 30,
@@ -29679,19 +29776,24 @@ function shouldIdleStop({ sessionState, idleSinceMs, nowMs, idleStopMinutes }) {
 	if (!IDLE_STOP_STATES.has(sessionState) || idleSinceMs === null) return false;
 	return nowMs - idleSinceMs >= idleStopMinutes * 6e4;
 }
-function planReconcile({ workspaces, mappings, busyWorkspaces, nowMs, deleteAfterStoppedDays }) {
+function planReconcile({ workspaces, mappings, busyWorkspaces, ownedWorkspaces, nowMs, deleteAfterStoppedDays }) {
 	const mappedNames = new Set(mappings.map((mapping) => mapping.workspace));
 	const listedNames = new Set(workspaces.map((workspace) => workspace.name));
 	const presentMappings = mappings.filter((mapping) => !busyWorkspaces.has(mapping.workspace)).filter((mapping) => listedNames.has(mapping.workspace));
-	const unmapped = workspaces.filter((workspace) => !mappedNames.has(workspace.name) && !busyWorkspaces.has(workspace.name) && workspace.status !== "deleting");
+	const unmapped = workspaces.filter((workspace) => !mappedNames.has(workspace.name) && !busyWorkspaces.has(workspace.name) && workspace.status !== "deleting" && ownedWorkspaces.has(workspace.name));
 	const isStale = (workspace) => workspace.stoppedAtMs !== null && nowMs - workspace.stoppedAtMs >= deleteAfterStoppedDays * DAY_MS;
 	return {
 		resume: presentMappings.filter((mapping) => mapping.wasActive),
 		stop: presentMappings.filter((mapping) => !mapping.wasActive),
 		delete: unmapped.filter(isStale).map((workspace) => workspace.name),
-		keptUnmapped: unmapped.filter((workspace) => !isStale(workspace)).map((workspace) => workspace.name)
+		stopUnmapped: unmapped.filter((workspace) => workspace.status === "running").map((workspace) => workspace.name)
 	};
 }
+function retainedOwnedWorkspaces({ ownedWorkspaces, workspaces, mappings, busyWorkspaces }) {
+	const listedNames = new Set(workspaces.map((workspace) => workspace.name));
+	const mappedNames = new Set(mappings.map((mapping) => mapping.workspace));
+	return new Set([...ownedWorkspaces].filter((workspace) => listedNames.has(workspace) || mappedNames.has(workspace) || busyWorkspaces.has(workspace)));
+}
 function failedProvisionCleanup({ didCreate, didStart }) {
 	if (didCreate) return "delete";
 	if (didStart) return "stop";
@@ -29711,14 +29813,48 @@ function remoteCheckoutDirectory({ checkoutRoot, workspace }) {
 }
 function coderErrorDetail(stderr) {
 	if (typeof stderr !== "string") return null;
-	const errorLine = stderr.split("\n").map((line) => line.trim()).findLast((line) => line.startsWith("error:"));
-	if (!errorLine) return null;
-	return errorLine.slice(6).trim().slice(0, CODER_ERROR_DETAIL_LIMIT) || null;
+	const lines = stderr.split("\n").map((line) => line.trim());
+	const errorLineIndex = lines.findLastIndex((line) => line.startsWith("error:"));
+	if (errorLineIndex === -1) return null;
+	return lines.slice(errorLineIndex).filter(Boolean).join(" ").slice(6).trim().slice(0, CODER_ERROR_DETAIL_LIMIT) || null;
+}
+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})`;
 }
 //#endregion
 //#region server/coder/coder-env-poller.ts
-function createCoderEnvPoller({ listWorkspaces, stopWorkspace, deleteWorkspace, sessionsForIdleCheck, mappings, busyWorkspaces, isReconcilePending, deleteAfterStoppedDays, onReconciled, now = Date.now, log = console, ...loopOptions }) {
+function createCoderEnvPoller({ listWorkspaces, stopWorkspace, deleteWorkspace, sessionsForIdleCheck, mappings, busyWorkspaces, ownedWorkspaces, isReconcilePending, deleteAfterStoppedDays, onReconciled, now = Date.now, log = console, ...loopOptions }) {
 	const stoppedIdlePeriods = /* @__PURE__ */ new Map();
+	async function mutateUnmappedWorkspace(mutate, workspace) {
+		try {
+			await mutate(workspace);
+		} catch (error) {
+			log.warn(`[coder-env] ${errorMessage(error)}; skipping ${workspace}`);
+		}
+	}
 	async function runTick() {
 		try {
 			const workspaces = parseGlimmervoidWorkspaces(await listWorkspaces());
@@ -29726,20 +29862,24 @@ function createCoderEnvPoller({ listWorkspaces, stopWorkspace, deleteWorkspace,
 			if (loop.isStopped()) return;
 			const workspaceByName = new Map(workspaces.map((workspace) => [workspace.name, workspace]));
 			const stoppedThisTick = /* @__PURE__ */ new Set();
+			const plan = planReconcile({
+				workspaces,
+				mappings: mappings(),
+				busyWorkspaces: busyWorkspaces(),
+				ownedWorkspaces: ownedWorkspaces(),
+				nowMs: now(),
+				deleteAfterStoppedDays: deleteAfterStoppedDays()
+			});
+			for (const workspace of plan.delete) {
+				if (loop.isStopped()) return;
+				await mutateUnmappedWorkspace(deleteWorkspace, workspace);
+			}
+			for (const workspace of plan.stopUnmapped) {
+				if (loop.isStopped()) return;
+				log.warn(`[coder-env] stopping unmapped workspace ${workspace}`);
+				await mutateUnmappedWorkspace(stopWorkspace, workspace);
+			}
 			if (isReconcilePending()) {
-				const staleAfterDays = deleteAfterStoppedDays();
-				const plan = planReconcile({
-					workspaces,
-					mappings: mappings(),
-					busyWorkspaces: busyWorkspaces(),
-					nowMs: now(),
-					deleteAfterStoppedDays: staleAfterDays
-				});
-				if (plan.keptUnmapped.length > 0) log.warn(`[coder-env] keeping unmapped workspaces until stopped for ${staleAfterDays} days: ${plan.keptUnmapped.join(", ")}`);
-				for (const workspace of plan.delete) {
-					if (loop.isStopped()) return;
-					await deleteWorkspace(workspace);
-				}
 				for (const mapping of plan.stop) {
 					if (loop.isStopped()) return;
 					const status = workspaceByName.get(mapping.workspace)?.status;
@@ -29792,15 +29932,55 @@ function createCoderEnvPoller({ listWorkspaces, stopWorkspace, deleteWorkspace,
 }
 //#endregion
 //#region server/coder/coder-env-wiring.ts
-function createCoderEnvWiring({ config, persistMapping, onReconciled = () => {}, runCoder: executeCoder, env = process.env, platform = process.platform, fetch: fetchReady = globalThis.fetch, createPoller = createCoderEnvPoller, now = Date.now, log = console, ...pollerDeps }) {
+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;
+	let unavailableReason = CODER_UNAVAILABLE_REASON;
+	const signedOutErrors = /* @__PURE__ */ new WeakSet();
 	let hasReconciled = false;
 	const operationCountByWorkspace = /* @__PURE__ */ new Map();
 	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();
+	function currentMappings() {
+		return config.projects.flatMap((project) => project.id && project.environment ? [{
+			projectId: project.id,
+			workspace: project.environment.workspace,
+			wasActive: project.wasActive === true
+		}] : []);
+	}
+	function busyWorkspaces() {
+		return new Set(operationCountByWorkspace.keys());
+	}
+	function saveOwned() {
+		const save = ownedSaveChain.then(() => saveOwnedWorkspaces([...ownedWorkspaces]));
+		ownedSaveChain = save.catch(() => {});
+		return save;
+	}
+	async function pruneOwned(workspaces) {
+		const retained = retainedOwnedWorkspaces({
+			ownedWorkspaces,
+			workspaces,
+			mappings: currentMappings(),
+			busyWorkspaces: busyWorkspaces()
+		});
+		if (retained.size === ownedWorkspaces.size) return;
+		ownedWorkspaces = retained;
+		try {
+			await saveOwned();
+		} catch (error) {
+			log.warn(`[coder-env] could not save owned Coder workspaces: ${errorMessage(error)}`);
+		}
+	}
 	async function runCoder(args, { timeoutMs, input = "", env: commandEnv }) {
 		try {
 			const options = {
@@ -29820,10 +30000,21 @@ function createCoderEnvWiring({ config, persistMapping, onReconciled = () => {},
 				maxBuffer: 16777216
 			});
 		} catch (error) {
-			const detail = coderErrorDetail(error instanceof Error && "stderr" in error ? error.stderr : null);
-			throw new Error(detail ? `Coder ${args[0]} failed: ${detail}` : `Coder ${args[0]} failed`);
+			const stderr = error instanceof Error && "stderr" in error ? error.stderr : null;
+			const detail = coderErrorDetail(stderr);
+			const failure = detail ? `Coder ${args[0]} failed: ${detail}` : `Coder ${args[0]} failed`;
+			if (!isCoderSignedOutError(stderr)) throw new Error(failure);
+			throw markSignedOut(failure);
 		}
 	}
+	function markSignedOut(failure) {
+		binaryProbe = null;
+		isCoderAvailable = false;
+		unavailableReason = coderNotSignedInReason(failure);
+		const signedOutError = new Error(unavailableReason);
+		signedOutErrors.add(signedOutError);
+		return signedOutError;
+	}
 	function command(args, timeoutMs = 3e4) {
 		return runCoder(args, { timeoutMs });
 	}
@@ -29840,33 +30031,53 @@ function createCoderEnvWiring({ config, persistMapping, onReconciled = () => {},
 			"-o",
 			"json"
 		])).stdout;
-		recordListing(listingJson);
+		const workspaces = recordListing(listingJson);
+		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");
 	}
 	async function probeBinary() {
 		try {
 			await command(["version"], 5e3);
-			isCoderAvailable = true;
-			return true;
 		} catch {
+			unavailableReason = CODER_UNAVAILABLE_REASON;
 			log.warn("[coder-env] coder binary is unavailable");
 			return false;
 		}
+		try {
+			await command(["whoami"], 15e3);
+		} catch (error) {
+			if (!(error instanceof Error && signedOutErrors.has(error))) unavailableReason = `${CODER_UNAVAILABLE_REASON}: ${errorMessage(error)}`;
+			log.warn(`[coder-env] ${errorMessage(error)}`);
+			return false;
+		}
+		isCoderAvailable = true;
+		return true;
 	}
 	async function ensureAvailable() {
 		if (!isConfigured()) return false;
@@ -29910,12 +30121,9 @@ function createCoderEnvWiring({ config, persistMapping, onReconciled = () => {},
 					"--yes"
 				]);
 			},
-			mappings: () => config.projects.flatMap((project) => project.id && project.environment ? [{
-				projectId: project.id,
-				workspace: project.environment.workspace,
-				wasActive: project.wasActive === true
-			}] : []),
-			busyWorkspaces: () => new Set(operationCountByWorkspace.keys()),
+			mappings: currentMappings,
+			busyWorkspaces,
+			ownedWorkspaces: () => ownedWorkspaces,
 			isReconcilePending: () => !hasReconciled,
 			deleteAfterStoppedDays: () => Math.max(...(config.coder?.environments ?? []).map((environment) => resolveCoderEnvironment(environment).deleteAfterStoppedDays)),
 			onReconciled: async (plan) => {
@@ -29961,8 +30169,16 @@ function createCoderEnvWiring({ config, persistMapping, onReconciled = () => {},
 	}
 	async function waitForReady(workspaceName, environment) {
 		const startedAtMs = now();
+		let consecutiveListFailures = 0;
 		for (;;) {
-			const workspace = (await listWorkspaces()).find((candidate) => candidate.name === workspaceName);
+			const workspace = (await listWorkspaces().then((listed) => {
+				consecutiveListFailures = 0;
+				return listed;
+			}, (listError) => {
+				consecutiveListFailures += 1;
+				if (consecutiveListFailures >= 3) throw listError;
+				return [];
+			})).find((candidate) => candidate.name === workspaceName);
 			let isReadyUrlUp = null;
 			if (environment.readyUrl) {
 				isReadyUrlUp = false;
@@ -30004,7 +30220,7 @@ function createCoderEnvWiring({ config, persistMapping, onReconciled = () => {},
 				cleanup,
 				workspace,
 				"--yes"
-			]);
+			], 12e5);
 		} catch {
 			if (await isWorkspaceListed(workspace)) reasons.push(`Coder cleanup ${cleanup} failed for ${workspace}`);
 		}
@@ -30014,10 +30230,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,
@@ -30038,8 +30251,14 @@ function createCoderEnvWiring({ config, persistMapping, onReconciled = () => {},
 		};
 		if (!await ensureAvailable()) return {
 			ok: false,
-			reason: "Coder environments are unavailable on this host"
+			reason: unavailableReason
 		};
+		return freshMapping({
+			environmentName,
+			branch
+		});
+	}
+	function freshMapping({ environmentName, branch }) {
 		const workspace = workspaceNameFromHex(randomBytes(6).toString("hex"));
 		if (workspace === null) return {
 			ok: false,
@@ -30055,6 +30274,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({
@@ -30083,7 +30370,7 @@ function createCoderEnvWiring({ config, persistMapping, onReconciled = () => {},
 		try {
 			const environment = resolveEnvironment(mapping.name);
 			if (!environment) throw new Error(`Unknown Coder environment: ${mapping.name}`);
-			if (!await ensureAvailable()) throw new Error("Coder environments are unavailable on this host");
+			if (!await ensureAvailable()) throw new Error(unavailableReason);
 			const createArgs = coderCreateArgs({
 				workspace,
 				template: environment.template,
@@ -30095,8 +30382,14 @@ function createCoderEnvWiring({ config, persistMapping, onReconciled = () => {},
 				checkoutRoot: environment.checkoutRoot,
 				workspace
 			});
+			ownedWorkspaces.add(workspace);
+			await saveOwned().catch((saveError) => {
+				throw new Error(`Could not record Coder workspace ${workspace} as owned by this host: ${errorMessage(saveError)}`);
+			});
 			didCreate = true;
-			await command(createArgs, 12e5);
+			await command(createArgs, 12e5).catch(async (createError) => {
+				if (!(await listWorkspaces().catch(() => [])).some((candidate) => candidate.name === workspace)) throw createError;
+			});
 			await waitForReady(workspace, environment);
 			await checkSharing(workspace);
 			const nodeVersion = await command([
@@ -30170,7 +30463,7 @@ function createCoderEnvWiring({ config, persistMapping, onReconciled = () => {},
 		};
 		if (!await ensureAvailable()) return {
 			ok: false,
-			reason: "Coder environments are unavailable on this host"
+			reason: unavailableReason
 		};
 		return whileWorkspaceBusy(mapping.workspace, () => startWorkspace({
 			mapping,
@@ -30211,7 +30504,7 @@ function createCoderEnvWiring({ config, persistMapping, onReconciled = () => {},
 		if (!mapping) return { ok: true };
 		if (!await ensureAvailable()) return {
 			ok: false,
-			reason: "Coder environments are unavailable on this host"
+			reason: unavailableReason
 		};
 		return whileWorkspaceBusy(mapping.workspace, async () => {
 			try {
@@ -30230,12 +30523,94 @@ 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;
 		if (!/^[0-7]{3,4}$/.test(fileMode)) throw new Error("Invalid remote file mode");
 		if (!path.posix.isAbsolute(remotePath)) throw new Error("Remote upload path must be absolute");
-		if (!await ensureAvailable()) throw new Error("Coder environments are unavailable on this host");
+		if (!await ensureAvailable()) throw new Error(unavailableReason);
 		await runCoder([
 			"ssh",
 			workspace,
@@ -30259,10 +30634,13 @@ function createCoderEnvWiring({ config, persistMapping, onReconciled = () => {},
 		availableEnvironments,
 		reserve,
 		provision,
+		renew,
 		resume,
 		release,
+		settleRemoval,
 		uploadFile,
-		workspaceStatus
+		workspaceStatus,
+		describeRemoteExit
 	};
 }
 var DEFAULT_INTERVAL_MS$1 = 216e5;
@@ -30879,6 +31257,12 @@ function createBranchGcWiring({ config, gitWorkspace, liveSessionIds, liveWorktr
 	};
 }
 //#endregion
+//#region shared/contracts/coder-owned-workspaces.ts
+var CoderOwnedWorkspaces = z.object({
+	version: z.literal(1),
+	workspaces: z.array(z.string().regex(/^gv-[0-9a-f]{12}$/))
+});
+//#endregion
 //#region shared/display-text.ts
 var SECONDS_PER_MINUTE = 60;
 var HOURS_PER_DAY = 24;
@@ -34793,9 +35177,6 @@ function createTaskTitleRefiner({ getConfig, spawnLane, renameSession, nowFn = (
 	function canRefine(session) {
 		return !isStopped && !session._destroyed && !session.ephemeral && !session.customTitle && settings().enabled;
 	}
-	function clearPending(session) {
-		session.setPendingTaskTitle(null);
-	}
 	function clearRecheck(session) {
 		const state = statesBySession.get(session);
 		if (!state?.recheckTimer) return;
@@ -34830,11 +35211,8 @@ function createTaskTitleRefiner({ getConfig, spawnLane, renameSession, nowFn = (
 		for (const [session, request] of queuedBySession) {
 			queuedBySession.delete(session);
 			if (session.taskTitlePromptRevision !== request.revision) continue;
-			if (!canRefine(session)) {
-				clearPending(session);
-				continue;
-			}
-			if (session.state !== STATES.IDLE && session.state !== STATES.COMPLETE) {
+			if (!canRefine(session)) continue;
+			if (request.currentTitle !== null && session.state !== STATES.IDLE && session.state !== STATES.COMPLETE) {
 				scheduleRecheck(session);
 				continue;
 			}
@@ -34889,7 +35267,6 @@ function createTaskTitleRefiner({ getConfig, spawnLane, renameSession, nowFn = (
 		clearRecheck(session);
 		if (!canRefine(session)) {
 			queuedBySession.delete(session);
-			clearPending(session);
 			return;
 		}
 		const decision = decisionFor(session);
@@ -34917,13 +35294,9 @@ function createTaskTitleRefiner({ getConfig, spawnLane, renameSession, nowFn = (
 			detach
 		};
 		statesBySession.set(session, state);
-		function onPrompt({ prompt }) {
+		function onPrompt() {
 			state.substantivePromptsSinceRefinement++;
-			if (!canRefine(session)) {
-				clearPending(session);
-				return;
-			}
-			session.setPendingTaskTitle(prompt);
+			if (session.refinedTaskTitle === null) onTurnEnd(session);
 		}
 		function onReset() {
 			clearRecheck(session);
@@ -34937,7 +35310,6 @@ function createTaskTitleRefiner({ getConfig, spawnLane, renameSession, nowFn = (
 			clearRecheck(session);
 			queuedBySession.delete(session);
 			if (active?.request.session === session) active.controller.abort();
-			clearPending(session);
 		}
 		function detach() {
 			session.off("task-prompt", onPrompt);
@@ -34956,10 +35328,7 @@ function createTaskTitleRefiner({ getConfig, spawnLane, renameSession, nowFn = (
 	}
 	async function stop() {
 		isStopped = true;
-		for (const [session, state] of statesBySession) {
-			state.detach();
-			clearPending(session);
-		}
+		for (const state of statesBySession.values()) state.detach();
 		queuedBySession.clear();
 		active?.controller.abort();
 		await active?.settled;
@@ -46132,8 +46501,29 @@ function createBackendLanes(dependencies) {
 		log: logger
 	});
 	const laneTelemetry = telemetry;
+	const coderOwnedWorkspacesPath = path.join(glimmervoidHomeDir$1(), "coder-owned-workspaces.json");
 	const coderEnv = createCoderEnvWiring({
 		config,
+		loadOwnedWorkspaces: () => {
+			const outcome = loadJsonStateFileSync({
+				filePath: coderOwnedWorkspacesPath,
+				fsSync: fs,
+				parse: (raw) => CoderOwnedWorkspaces.safeParse(raw).data?.workspaces ?? null,
+				quarantine: false,
+				includeNotDir: false
+			});
+			if (outcome.status === "loaded") return outcome.value;
+			if (outcome.status === "missing") return [];
+			logger.warn(`[coder-env] ignoring ${coderOwnedWorkspacesPath}: ${errorMessage(jsonStateLoadError(outcome))}`);
+			return [];
+		},
+		saveOwnedWorkspaces: (workspaces) => writeJsonAtomic(coderOwnedWorkspacesPath, {
+			version: 1,
+			workspaces
+		}, {
+			mode: 384,
+			mkdir: true
+		}),
 		persistMapping: (projectId, mapping) => persistSessionField(configStore, config, projectId, "environment", mapping),
 		sessionsForIdleCheck: () => {
 			const environmentsByName = new Map((config.coder?.environments ?? []).map((environment) => [environment.name, resolveCoderEnvironment(environment)]));
@@ -48919,6 +49309,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({
@@ -50566,6 +50957,12 @@ function requestValidationErrorReply(msg, message) {
 			ok: false,
 			error: message
 		}),
+		"remove-session": () => ({
+			type: "remove-session-result",
+			requestId,
+			ok: false,
+			error: message
+		}),
 		"delete-hook": () => ({
 			type: "delete-hook-result",
 			requestId,
@@ -50761,9 +51158,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;
@@ -50783,17 +51227,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,
@@ -50852,22 +51291,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);
@@ -52106,14 +52569,12 @@ function registerControlHandlers(controlWss, deps) {
 			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;