@norman-else/dsh-claude 0.1.26 → 0.1.28

package/lib/client.js

@@ -12,6 +12,7 @@ window.__ModuleLoader__.load({
 		const TASK_TOOL_NAMES = /* @__PURE__ */ new Set(["Task", "Agent"]);
 		const CLAUDE_DOCTOR_PATH = "/plugins/dsh-claude/doctor";
 		const CLAUDE_UPDATE_CHECK_PATH = "/plugins/dsh-claude/update/check";
+		const CLAUDE_USAGE_PATH = "/plugins/dsh-claude/usage";
 		const CLAUDE_UPDATE_PATH = "/plugins/dsh-claude/update";
 		const CLAUDE_PROJECTION_PATH = "/plugins/dsh-claude/projection";
 		const CLAUDE_GLOBAL_SETTINGS_PATH = "/plugins/dsh-claude/settings/global";
@@ -713,6 +714,63 @@ window.__ModuleLoader__.load({
 			fontWeight: 700,
 			textAlign: "center"
 		};
+		const settingHint = {
+			display: "inline-grid",
+			placeItems: "center",
+			width: 14,
+			height: 14,
+			marginLeft: 6,
+			verticalAlign: "text-top",
+			borderRadius: "50%",
+			border: "1px solid currentColor",
+			color: "var(--dsw-alias-label-tertiary)",
+			fontSize: 9,
+			fontWeight: 600,
+			lineHeight: 1,
+			cursor: "help",
+			userSelect: "none"
+		};
+		const planUsageMeter = {
+			display: "flex",
+			alignItems: "center",
+			gap: 10,
+			minWidth: 0
+		};
+		const planUsageTrack = {
+			flex: "1 1 auto",
+			height: 6,
+			minWidth: 60,
+			borderRadius: 3,
+			background: "var(--dsw-alias-bg-layer-2)",
+			overflow: "hidden"
+		};
+		const planUsageFill = {
+			display: "block",
+			height: "100%",
+			borderRadius: 3,
+			transition: "width 200ms ease"
+		};
+		const planUsageMeta = {
+			flex: "0 0 auto",
+			fontSize: 12,
+			whiteSpace: "nowrap"
+		};
+		/** Bar colour, plus a matching text colour once a window is worth noticing.
+		*  Below the warning threshold the reading stays quiet: accent bar, muted text. */
+		function planUsageTone(utilization) {
+			if (utilization !== void 0 && utilization >= 90) return {
+				fill: "var(--dsw-alias-state-error-primary)",
+				text: "var(--dsw-alias-state-error-primary)"
+			};
+			if (utilization !== void 0 && utilization >= 75) return {
+				fill: "var(--dsw-alias-state-warning-primary, #d69e2e)",
+				text: "var(--dsw-alias-state-warning-primary, #d69e2e)"
+			};
+			return {
+				fill: utilization === void 0 ? "transparent" : "var(--dsw-static-blue-450)",
+				text: "var(--dsw-alias-label-tertiary)"
+			};
+		}
 		const settingsActions = {
 			display: "flex",
 			flexWrap: "wrap",
@@ -2317,8 +2375,11 @@ window.__ModuleLoader__.load({
 		  flex: none;
 		  display: grid;
 		  place-items: center;
-		  align-self: center;
-		  margin: 0 2px;
+		  /* Stay on the line-number row: a wrapped line makes the flex row taller, and
+		     centering would float the button into the middle of the wrapped block.
+		     The margin centers the 18px button inside the first 22px line box. */
+		  align-self: flex-start;
+		  margin: 2px 2px 0;
 		  padding: 0;
 		  border: none;
 		  border-radius: 4px;
@@ -2773,19 +2834,21 @@ window.__ModuleLoader__.load({
 		  background: var(--dsw-alias-bg-layer-2);
 		}
 		.dshClaudeRepositoryActionModalContent h2 {
-		  font-size: 24px;
-		  line-height: 32px;
+		  font-size: 18px;
+		  line-height: 26px;
 		}
 		.dshClaudeRepositoryActionModalContent > p {
-		  font-size: 18px;
-		  line-height: 28px;
+		  font-size: 14px;
+		  line-height: 22px;
 		}
-		.dshClaudeRepositoryActionModal input[type='checkbox'] {
-		  width: 18px;
-		  height: 18px;
+		.dshClaudeRepositoryActionModal input:is([type='checkbox'], [type='radio']) {
+		  width: 16px;
+		  height: 16px;
+		  margin: 0;
+		  accent-color: var(--dsw-static-blue-450);
 		}
 		.dshClaudeRepositoryActionModal textarea:focus,
-		.dshClaudeRepositoryActionModal input:not([type='checkbox']):focus {
+		.dshClaudeRepositoryActionModal input:not([type='checkbox'], [type='radio']):focus {
 		  outline: none;
 		  box-shadow: inset 0 0 0 1px var(--dsw-static-blue-450);
 		}
@@ -2804,8 +2867,8 @@ window.__ModuleLoader__.load({
 			gap: 16,
 			minWidth: 0,
 			color: "var(--dsw-alias-label-secondary)",
-			fontSize: 16,
-			lineHeight: "24px"
+			fontSize: 14,
+			lineHeight: "22px"
 		};
 		const diffModalMetaText = {
 			minWidth: 0,
@@ -2829,8 +2892,8 @@ window.__ModuleLoader__.load({
 			padding: "10px 14px",
 			borderBottom: "1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 16%, transparent))",
 			color: "var(--dsw-alias-label-secondary)",
-			fontSize: 15,
-			lineHeight: "22px"
+			fontSize: 13,
+			lineHeight: "20px"
 		};
 		const diffModalFilePath = {
 			minWidth: 0,
@@ -2844,32 +2907,32 @@ window.__ModuleLoader__.load({
 			flexDirection: "column",
 			gap: 8,
 			color: "var(--dsw-alias-label-secondary)",
-			fontSize: 16,
-			lineHeight: "24px",
+			fontSize: 14,
+			lineHeight: "22px",
 			fontWeight: 550
 		};
 		const diffModalTextarea = {
 			...settingTextInput,
 			minHeight: 140,
 			padding: "10px 14px",
-			fontSize: 16,
-			lineHeight: "24px",
+			fontSize: 14,
+			lineHeight: "22px",
 			resize: "vertical"
 		};
 		const diffModalTextInput = {
 			...settingTextInput,
 			minHeight: 44,
 			padding: "9px 14px",
-			fontSize: 16,
-			lineHeight: "24px"
+			fontSize: 14,
+			lineHeight: "22px"
 		};
 		const diffModalCheckbox = {
 			display: "flex",
 			alignItems: "center",
 			gap: 10,
 			color: "var(--dsw-alias-label-secondary)",
-			fontSize: 16,
-			lineHeight: "24px"
+			fontSize: 14,
+			lineHeight: "22px"
 		};
 		const diffModalFooter = {
 			display: "flex",
@@ -2877,28 +2940,28 @@ window.__ModuleLoader__.load({
 			gap: 12
 		};
 		const diffModalButton = {
-			minHeight: 42,
+			minHeight: 36,
 			padding: "8px 18px",
-			fontSize: 16,
-			lineHeight: "24px"
+			fontSize: 14,
+			lineHeight: "22px"
 		};
 		const diffModalStatus = {
 			margin: 0,
 			color: "var(--dsw-alias-label-secondary)",
-			fontSize: 16,
-			lineHeight: "24px"
+			fontSize: 14,
+			lineHeight: "22px"
 		};
 		const diffModalError = {
 			margin: "10px 0 0",
 			color: "var(--dsw-alias-state-error-primary)",
-			fontSize: 16,
-			lineHeight: "24px"
+			fontSize: 14,
+			lineHeight: "22px"
 		};
 		const diffModalSuccess = {
 			margin: 0,
 			color: "var(--dsw-alias-state-success-primary)",
-			fontSize: 16,
-			lineHeight: "24px"
+			fontSize: 14,
+			lineHeight: "22px"
 		};
 		//#endregion
 		//#region src/client/token-format.ts
@@ -4418,6 +4481,183 @@ window.__ModuleLoader__.load({
 				}) : null]
 			});
 		}
+		/** Fixed windows carry a translated label; server-named model buckets (e.g.
+		*  'Fable') arrive with their own `label` and are shown verbatim. */
+		const TRANSLATED_WINDOWS = /* @__PURE__ */ new Set([
+			"five_hour",
+			"seven_day",
+			"seven_day_opus",
+			"seven_day_sonnet"
+		]);
+		/** Per-setting label and the effect note that used to sit as a standalone
+		*  paragraph under the card; it now hangs off the label as a hover hint. */
+		const SETTING_COPY = {
+			outputStyle: {
+				label: "outputStyle",
+				hint: "globalSettingsNewSession"
+			},
+			worktreeBranchPrefix: {
+				label: "worktreeBranchPrefix",
+				hint: "worktreeBranchPrefixEffect"
+			},
+			maxProcesses: {
+				label: "maxProcessesSetting",
+				hint: "maxProcessesEffect"
+			},
+			idleTimeoutMinutes: {
+				label: "idleTimeoutSetting",
+				hint: "idleTimeoutEffect"
+			}
+		};
+		/** '?' badge that reveals a setting's effect note on hover or keyboard focus. */
+		function SettingHint({ text, label }) {
+			return /* @__PURE__ */ jsx(Tooltip, {
+				label: text,
+				side: "top",
+				delayMs: 150,
+				maxWidth: 320,
+				children: /* @__PURE__ */ jsx("span", {
+					role: "note",
+					tabIndex: 0,
+					"aria-label": `${label}: ${text}`,
+					style: settingHint,
+					children: "?"
+				})
+			});
+		}
+		function isPlanUsageReport(value) {
+			if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
+			const report = value;
+			return typeof report.available === "boolean" && typeof report.fetchedAt === "number" && Array.isArray(report.windows) && report.windows.every((entry) => typeof entry === "object" && entry !== null && typeof entry.id === "string");
+		}
+		/** Coarse duration for a reset countdown or a fetch age: minutes below an
+		*  hour, then hours, then days. Never negative — a passed reset reads '0m'. */
+		function durationLabel(milliseconds) {
+			const minutes = Math.max(0, Math.round(milliseconds / 6e4));
+			if (minutes < 60) return `${minutes}m`;
+			const hours = Math.floor(minutes / 60);
+			if (hours < 24) return minutes % 60 === 0 ? `${hours}h` : `${hours}h ${minutes % 60}m`;
+			return `${Math.floor(hours / 24)}d`;
+		}
+		function PlanUsageMeter({ window: usageWindow, t, now }) {
+			const used = usageWindow.utilization;
+			const tone = planUsageTone(used);
+			const resetsIn = usageWindow.resetsAt === void 0 ? void 0 : Date.parse(usageWindow.resetsAt);
+			return /* @__PURE__ */ jsxs("span", {
+				style: planUsageMeter,
+				children: [/* @__PURE__ */ jsx("span", {
+					style: planUsageTrack,
+					children: /* @__PURE__ */ jsx("span", { style: {
+						...planUsageFill,
+						width: `${used ?? 0}%`,
+						background: tone.fill
+					} })
+				}), /* @__PURE__ */ jsxs("span", {
+					style: {
+						...planUsageMeta,
+						color: tone.text
+					},
+					children: [used === void 0 ? "—" : t("planUsageUsed", { percent: Math.round(used) }), resetsIn === void 0 || !Number.isFinite(resetsIn) ? null : ` · ${t("planUsageResets", { age: durationLabel(resetsIn - now) })}`]
+				})]
+			});
+		}
+		/** Fetch the plan usage report; POST forces the backend to re-read it. */
+		async function loadPlanUsage(refresh) {
+			const response = await fetch(CLAUDE_USAGE_PATH, {
+				method: refresh ? "POST" : "GET",
+				credentials: "same-origin",
+				headers: { accept: "application/json" }
+			});
+			const payload = await response.json();
+			if (!response.ok) {
+				const message = typeof payload === "object" && payload !== null && "error" in payload && typeof payload.error === "string" ? payload.error : `HTTP ${response.status}`;
+				throw new Error(message);
+			}
+			if (!isPlanUsageReport(payload)) throw new Error("Invalid plan usage response");
+			return payload;
+		}
+		function PlanUsageCard({ t, load }) {
+			const [report, setReport] = useState();
+			const [busy, setBusy] = useState(false);
+			const [error, setError] = useState();
+			const request = useCallback(async (refresh) => {
+				setBusy(true);
+				setError(void 0);
+				try {
+					setReport(await load(refresh));
+				} catch (cause) {
+					setError(cause instanceof Error ? cause.message : String(cause));
+				} finally {
+					setBusy(false);
+				}
+			}, [load]);
+			useEffect(() => {
+				request(false);
+			}, [request]);
+			const now = Date.now();
+			return /* @__PURE__ */ jsxs("section", {
+				style: settingsCard,
+				children: [
+					/* @__PURE__ */ jsxs("div", {
+						style: settingsCardHeader,
+						children: [/* @__PURE__ */ jsxs("div", { children: [/* @__PURE__ */ jsx("h3", {
+							style: settingsSectionHeading,
+							children: t("planUsage")
+						}), /* @__PURE__ */ jsx("p", {
+							style: settingsBody,
+							children: t("planUsageBody")
+						})] }), /* @__PURE__ */ jsx("button", {
+							type: "button",
+							style: button,
+							disabled: busy,
+							onClick: () => {
+								request(true);
+							},
+							children: busy ? t("planUsageRefreshing") : t("planUsageRefresh")
+						})]
+					}),
+					report === void 0 ? /* @__PURE__ */ jsx("p", {
+						style: notice,
+						children: busy ? t("planUsageLoading") : t("planUsageNever")
+					}) : report.windows.length === 0 ? /* @__PURE__ */ jsx("p", {
+						style: notice,
+						children: report.fetchedAt === 0 ? t("planUsageNever") : t("planUsageUnavailable")
+					}) : /* @__PURE__ */ jsxs("div", {
+						style: diagnosticGrid,
+						children: [report.subscription === void 0 ? null : /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsx("span", {
+							style: diagnosticLabel,
+							children: t("planUsageSubscription")
+						}), /* @__PURE__ */ jsx("span", {
+							style: diagnosticValue,
+							children: report.subscription
+						})] }), report.windows.flatMap((usageWindow) => [/* @__PURE__ */ jsx("span", {
+							style: diagnosticLabel,
+							children: usageWindow.label ?? (TRANSLATED_WINDOWS.has(usageWindow.id) ? t(`planWindow_${usageWindow.id}`) : usageWindow.id)
+						}, `${usageWindow.id}-label`), /* @__PURE__ */ jsx(PlanUsageMeter, {
+							window: usageWindow,
+							t,
+							now
+						}, `${usageWindow.id}-meter`)])]
+					}),
+					report !== void 0 && report.fetchedAt > 0 ? /* @__PURE__ */ jsx("p", {
+						style: notice,
+						children: t("planUsageUpdated", { age: durationLabel(now - report.fetchedAt) })
+					}) : null,
+					error === void 0 ? null : /* @__PURE__ */ jsxs("p", {
+						role: "alert",
+						style: {
+							...notice,
+							color: "var(--dsw-alias-state-error-primary)"
+						},
+						children: [
+							t("planUsageError"),
+							": ",
+							error
+						]
+					})
+				]
+			});
+		}
 		function ClaudeCodeSettings({ t }) {
 			const [report, setReport] = useState();
 			const [error, setError] = useState();
@@ -4622,6 +4862,10 @@ window.__ModuleLoader__.load({
 							})
 						]
 					}),
+					/* @__PURE__ */ jsx(PlanUsageCard, {
+						t,
+						load: loadPlanUsage
+					}),
 					/* @__PURE__ */ jsxs("section", {
 						style: settingsCard,
 						children: [
@@ -4635,37 +4879,31 @@ window.__ModuleLoader__.load({
 							globalSettings === void 0 ? /* @__PURE__ */ jsx("p", {
 								style: notice,
 								children: t("globalSettingsLoading")
-							}) : globalSettings.settings.map((setting) => /* @__PURE__ */ jsxs("div", {
-								style: diagnosticGrid,
-								children: [/* @__PURE__ */ jsx("span", {
-									style: diagnosticLabel,
-									children: setting.key === "outputStyle" ? t("outputStyle") : setting.key === "worktreeBranchPrefix" ? t("worktreeBranchPrefix") : setting.key === "maxProcesses" ? t("maxProcessesSetting") : setting.key === "idleTimeoutMinutes" ? t("idleTimeoutSetting") : setting.key
-								}), setting.kind === "select" ? /* @__PURE__ */ jsx(GlobalSettingSelect, {
-									setting,
-									disabled: globalSettingsBusy,
-									onChange: (nextValue) => {
-										requestGlobalSettings({ [setting.key]: nextValue });
-									}
-								}) : /* @__PURE__ */ jsx(GlobalSettingText, {
-									setting,
-									disabled: globalSettingsBusy,
-									onChange: (nextValue) => {
-										requestGlobalSettings({ [setting.key]: nextValue });
-									}
-								})]
-							}, setting.key)),
-							globalSettings?.settings.some((setting) => setting.effect === "new-session") === true ? /* @__PURE__ */ jsx("p", {
-								style: notice,
-								children: t("globalSettingsNewSession")
-							}) : null,
-							globalSettings?.settings.some((setting) => setting.effect === "next-worktree") === true ? /* @__PURE__ */ jsx("p", {
-								style: notice,
-								children: t("worktreeBranchPrefixEffect")
-							}) : null,
-							globalSettings?.settings.some((setting) => setting.key === "maxProcesses") === true ? /* @__PURE__ */ jsx("p", {
-								style: notice,
-								children: t("limitsSettingEffect")
-							}) : null,
+							}) : globalSettings.settings.map((setting) => {
+								const copy = SETTING_COPY[setting.key];
+								return /* @__PURE__ */ jsxs("div", {
+									style: diagnosticGrid,
+									children: [/* @__PURE__ */ jsxs("span", {
+										style: diagnosticLabel,
+										children: [copy === void 0 ? setting.key : t(copy.label), copy === void 0 ? null : /* @__PURE__ */ jsx(SettingHint, {
+											text: t(copy.hint),
+											label: t("settingHint")
+										})]
+									}), setting.kind === "select" ? /* @__PURE__ */ jsx(GlobalSettingSelect, {
+										setting,
+										disabled: globalSettingsBusy,
+										onChange: (nextValue) => {
+											requestGlobalSettings({ [setting.key]: nextValue });
+										}
+									}) : /* @__PURE__ */ jsx(GlobalSettingText, {
+										setting,
+										disabled: globalSettingsBusy,
+										onChange: (nextValue) => {
+											requestGlobalSettings({ [setting.key]: nextValue });
+										}
+									})]
+								}, setting.key);
+							}),
 							globalSettingsError === void 0 ? null : /* @__PURE__ */ jsxs("p", {
 								role: "alert",
 								style: {
@@ -5017,12 +5255,15 @@ window.__ModuleLoader__.load({
 			}
 			return body;
 		}
+		/** A wedged host must surface as an error; the hero has no other way out of its loading state. */
+		const BRANCH_LOAD_TIMEOUT_MS = 15e3;
 		function loadRepositoryBranches(cwd, signal) {
+			const timeout = AbortSignal.timeout(BRANCH_LOAD_TIMEOUT_MS);
 			return response(fetch(`${CLAUDE_REPOSITORY_SETUP_PATH}/branches?cwd=${encodeURIComponent(cwd)}`, {
 				method: "GET",
 				credentials: "same-origin",
 				headers: { accept: "application/json" },
-				...signal === void 0 ? {} : { signal }
+				signal: signal === void 0 ? timeout : AbortSignal.any([signal, timeout])
 			}));
 		}
 		async function prepareRepository(cwd, branch, worktree, branchName, onProgress = () => {}) {
@@ -5173,8 +5414,10 @@ window.__ModuleLoader__.load({
 			}).join("\n\n")}`;
 		}
 		/** Draft handed to Claude after an update-branch merge left conflicts behind. */
-		function composeConflictsPrompt(baseBranch, conflicts) {
-			return `Merging origin/${baseBranch} into the current branch left merge conflicts in the files below. Resolve each conflict preserving the intent of both sides, then commit the merge.\n\n${conflicts.map((file) => `- ${file}`).join("\n")}`;
+		function composeConflictsPrompt(baseBranch, conflicts, method = "merge") {
+			const list = conflicts.map((file) => `- ${file}`).join("\n");
+			if (method === "rebase") return `Rebasing the current branch onto origin/${baseBranch} stopped on conflicts in the files below. Resolve each conflict preserving the intent of both sides, stage the files, run \`git rebase --continue\` until the rebase finishes, then push with \`git push --force-with-lease\`.\n\n${list}`;
+			return `Merging origin/${baseBranch} into the current branch left merge conflicts in the files below. Resolve each conflict preserving the intent of both sides, then commit the merge.\n\n${list}`;
 		}
 		//#endregion
 		//#region src/client/auto-fix.ts
@@ -5229,32 +5472,6 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/client/ClaudeRepositoryStatus.tsx
-		const RATE_LIMIT_TITLE_PREFIX = "Claude rate limit";
-		const RATE_LIMIT_BLOCKING_TITLE = "Claude rate limit is blocking requests";
-		/** Whether the newest quota update in the activity feed reports a blocked state. */
-		function rateLimitBlocked(activities) {
-			for (let index = activities.length - 1; index >= 0; index -= 1) {
-				const title = activities[index]?.title;
-				if (title?.startsWith(RATE_LIMIT_TITLE_PREFIX) === true) return title === RATE_LIMIT_BLOCKING_TITLE;
-			}
-			return false;
-		}
-		function StatusItem({ label, tone = "neutral" }) {
-			const toneStyle = tone === "success" ? repositoryItemSuccess : tone === "warning" ? repositoryItemWarning : tone === "error" ? repositoryItemError : {};
-			return /* @__PURE__ */ jsxs("span", {
-				style: {
-					...repositoryItem,
-					...toneStyle
-				},
-				children: [/* @__PURE__ */ jsx("span", {
-					style: repositoryItemDot,
-					"aria-hidden": "true"
-				}), /* @__PURE__ */ jsx("span", {
-					style: repositoryItemLabel,
-					children: label
-				})]
-			});
-		}
 		/** Icon-only status: the tone carries the state, the full label lives in the tooltip and accessible name. */
 		function StatusGlyph({ label, tone, children }) {
 			const toneStyle = tone === "success" ? repositoryItemSuccess : tone === "warning" ? repositoryItemWarning : tone === "error" ? repositoryItemError : {};
@@ -5695,6 +5912,7 @@ window.__ModuleLoader__.load({
 		}
 		function UpdateBranchControl({ sessionId, repository, t, submitPrompt }) {
 			const [dialog, setDialog] = useState();
+			const [method, setMethod] = useState("rebase");
 			const controller = useRef();
 			const pullRequest = repository.pullRequest;
 			const base = pullRequest?.baseBranch;
@@ -5746,7 +5964,8 @@ window.__ModuleLoader__.load({
 					fingerprint: dialog.fingerprint,
 					message: "",
 					includeUnstaged: false,
-					baseBranch: base
+					baseBranch: base,
+					mergeMethod: method
 				}).then((result) => {
 					setDialog({
 						...pending,
@@ -5829,6 +6048,17 @@ window.__ModuleLoader__.load({
 									})
 								})]
 							}),
+							["rebase", "merge"].map((option) => /* @__PURE__ */ jsxs("label", {
+								style: diffModalCheckbox,
+								children: [/* @__PURE__ */ jsx("input", {
+									type: "radio",
+									name: "dsh-claude-update-branch-method",
+									value: option,
+									checked: method === option,
+									disabled: settled || dialog.submitting,
+									onChange: () => setMethod(option)
+								}), t(`diffUpdateBranch_${option}`, { base })]
+							}, option)),
 							dialog.pushed === void 0 ? null : /* @__PURE__ */ jsx("p", {
 								style: diffModalSuccess,
 								children: t("diffUpdateBranchCompleted", { commit: dialog.pushed.slice(0, 8) })
@@ -5846,7 +6076,7 @@ window.__ModuleLoader__.load({
 									type: "button",
 									style: diffModalConflictResolve,
 									onClick: () => {
-										submitPrompt(composeConflictsPrompt(base, dialog.conflicts ?? []));
+										submitPrompt(composeConflictsPrompt(base, dialog.conflicts ?? [], method));
 										closeDialog();
 									},
 									children: t("diffUpdateBranchResolve")
@@ -6150,25 +6380,17 @@ window.__ModuleLoader__.load({
 			const aheadCount = repository.ahead ?? 0;
 			const pushable = repository.remote !== void 0 && repository.detached !== true && (aheadCount > 0 || repository.upstream === false);
 			const hasDiff = repository.diff !== void 0 && (repository.diff.additions > 0 || repository.diff.deletions > 0);
-			const rateLimited = rateLimitBlocked(projection.activities);
 			if (repository.status !== "ready") return /* @__PURE__ */ jsx("div", {
 				style: repositoryBarFrame,
 				children: /* @__PURE__ */ jsxs("div", {
 					style: repositoryBar,
-					children: [
-						/* @__PURE__ */ jsx("span", {
-							style: repositoryPrIcon,
-							children: /* @__PURE__ */ jsx(PullRequestIcon, {})
-						}),
-						/* @__PURE__ */ jsx("span", {
-							style: repositoryPrimary,
-							children: repository.status === "not-repository" ? t("repositoryNotGit") : t("repositoryUnavailable")
-						}),
-						rateLimited ? /* @__PURE__ */ jsx(StatusItem, {
-							label: t("repositoryRateLimited"),
-							tone: "warning"
-						}) : null
-					]
+					children: [/* @__PURE__ */ jsx("span", {
+						style: repositoryPrIcon,
+						children: /* @__PURE__ */ jsx(PullRequestIcon, {})
+					}), /* @__PURE__ */ jsx("span", {
+						style: repositoryPrimary,
+						children: repository.status === "not-repository" ? t("repositoryNotGit") : t("repositoryUnavailable")
+					})]
 				})
 			});
 			return /* @__PURE__ */ jsx("div", {
@@ -6215,83 +6437,76 @@ window.__ModuleLoader__.load({
 						}) : null,
 						/* @__PURE__ */ jsxs("span", {
 							style: repositoryStatusItems,
-							children: [
-								rateLimited ? /* @__PURE__ */ jsx(StatusItem, {
-									label: t("repositoryRateLimited"),
-									tone: "warning"
-								}) : null,
-								hasDiff || pushable ? /* @__PURE__ */ jsxs("button", {
-									type: "button",
-									style: {
-										...diffTrigger,
-										...merged ? diffTriggerMuted : {}
-									},
-									onClick: openDiff,
-									"aria-label": t("diffOpen"),
-									children: [hasDiff && repository.diff !== void 0 ? /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsxs("span", {
-										style: merged ? diffAddMuted : diffAdd,
-										children: ["+", repository.diff.additions]
-									}), /* @__PURE__ */ jsxs("span", {
-										style: merged ? diffDeleteMuted : diffDelete,
-										children: ["−", repository.diff.deletions]
-									})] }) : null, pushable ? /* @__PURE__ */ jsxs("span", {
-										style: merged ? diffAheadMuted : diffAhead,
-										children: ["↑", aheadCount > 0 ? aheadCount : ""]
-									}) : null]
-								}) : null,
-								pullRequest === void 0 ? null : merged ? /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsxs("span", {
-									style: repositoryMergedStatus,
-									children: [
-										/* @__PURE__ */ jsx("span", {
-											style: repositoryMergedDot,
-											"aria-hidden": "true"
-										}),
-										t("repositoryState_merged"),
-										mergedAge === void 0 ? null : /* @__PURE__ */ jsxs("span", {
-											style: repositoryMergedAge,
-											children: ["· ", t("repositoryMergedAgo", { age: mergedAge })]
-										})
-									]
-								}), /* @__PURE__ */ jsx(CleanupControl, {
-									repository,
-									t,
-									...deleteWorkspace === void 0 ? {} : { deleteWorkspace }
-								})] }) : /* @__PURE__ */ jsxs(Fragment$1, { children: [
-									pullRequest.checks === "failing" ? /* @__PURE__ */ jsx(FailingChecksControl, {
-										sessionId,
-										pullNumber: pullRequest.number,
-										t,
-										...submitPrompt === void 0 ? {} : { submitPrompt }
-									}) : pullRequest.checks === "none" ? null : /* @__PURE__ */ jsx(StatusGlyph, {
-										label: t(`repositoryChecks_${pullRequest.checks}`),
-										tone: pullRequest.checks === "passing" ? "success" : "warning",
-										children: /* @__PURE__ */ jsx(ChecksGlyph, { state: pullRequest.checks })
-									}),
-									pullRequest.review === "none" ? null : /* @__PURE__ */ jsx(StatusGlyph, {
-										label: t(`repositoryReview_${pullRequest.review}`),
-										tone: pullRequest.review === "approved" ? "success" : pullRequest.review === "changes-requested" ? "error" : "neutral",
-										children: /* @__PURE__ */ jsx(ReviewGlyph, {})
-									}),
-									/* @__PURE__ */ jsx(AutoFixControl, {
-										sessionId,
-										repository,
-										running,
-										t,
-										...submitPrompt === void 0 ? {} : { submitPrompt }
-									}),
-									/* @__PURE__ */ jsx(UpdateBranchControl, {
-										sessionId,
-										repository,
-										t,
-										...submitPrompt === void 0 ? {} : { submitPrompt }
+							children: [hasDiff || pushable ? /* @__PURE__ */ jsxs("button", {
+								type: "button",
+								style: {
+									...diffTrigger,
+									...merged ? diffTriggerMuted : {}
+								},
+								onClick: openDiff,
+								"aria-label": t("diffOpen"),
+								children: [hasDiff && repository.diff !== void 0 ? /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsxs("span", {
+									style: merged ? diffAddMuted : diffAdd,
+									children: ["+", repository.diff.additions]
+								}), /* @__PURE__ */ jsxs("span", {
+									style: merged ? diffDeleteMuted : diffDelete,
+									children: ["−", repository.diff.deletions]
+								})] }) : null, pushable ? /* @__PURE__ */ jsxs("span", {
+									style: merged ? diffAheadMuted : diffAhead,
+									children: ["↑", aheadCount > 0 ? aheadCount : ""]
+								}) : null]
+							}) : null, pullRequest === void 0 ? null : merged ? /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsxs("span", {
+								style: repositoryMergedStatus,
+								children: [
+									/* @__PURE__ */ jsx("span", {
+										style: repositoryMergedDot,
+										"aria-hidden": "true"
 									}),
-									/* @__PURE__ */ jsx(MergePullRequestControl, {
-										sessionId,
-										repository,
-										t
+									t("repositoryState_merged"),
+									mergedAge === void 0 ? null : /* @__PURE__ */ jsxs("span", {
+										style: repositoryMergedAge,
+										children: ["· ", t("repositoryMergedAgo", { age: mergedAge })]
 									})
-								] })
-							]
+								]
+							}), /* @__PURE__ */ jsx(CleanupControl, {
+								repository,
+								t,
+								...deleteWorkspace === void 0 ? {} : { deleteWorkspace }
+							})] }) : /* @__PURE__ */ jsxs(Fragment$1, { children: [
+								pullRequest.checks === "failing" ? /* @__PURE__ */ jsx(FailingChecksControl, {
+									sessionId,
+									pullNumber: pullRequest.number,
+									t,
+									...submitPrompt === void 0 ? {} : { submitPrompt }
+								}) : pullRequest.checks === "none" ? null : /* @__PURE__ */ jsx(StatusGlyph, {
+									label: t(`repositoryChecks_${pullRequest.checks}`),
+									tone: pullRequest.checks === "passing" ? "success" : "warning",
+									children: /* @__PURE__ */ jsx(ChecksGlyph, { state: pullRequest.checks })
+								}),
+								pullRequest.review === "none" ? null : /* @__PURE__ */ jsx(StatusGlyph, {
+									label: t(`repositoryReview_${pullRequest.review}`),
+									tone: pullRequest.review === "approved" ? "success" : pullRequest.review === "changes-requested" ? "error" : "neutral",
+									children: /* @__PURE__ */ jsx(ReviewGlyph, {})
+								}),
+								/* @__PURE__ */ jsx(AutoFixControl, {
+									sessionId,
+									repository,
+									running,
+									t,
+									...submitPrompt === void 0 ? {} : { submitPrompt }
+								}),
+								/* @__PURE__ */ jsx(UpdateBranchControl, {
+									sessionId,
+									repository,
+									t,
+									...submitPrompt === void 0 ? {} : { submitPrompt }
+								}),
+								/* @__PURE__ */ jsx(MergePullRequestControl, {
+									sessionId,
+									repository,
+									t
+								})
+							] })]
 						})
 					]
 				})
@@ -8588,9 +8803,15 @@ window.__ModuleLoader__.load({
 				row = row.parentElement;
 			}
 		}
+		/** Reuse the row's existing portal even when the host moved a node between it
+		*  and the seat: a fresh element would change React's portal identity and
+		*  restart (and abort) every effect keyed on it. */
 		function ensureClaudeHeroPortal(seat) {
-			const sibling = seat.nextElementSibling;
-			if (sibling instanceof HTMLElement && sibling.hasAttribute(PORTAL_ATTRIBUTE)) return sibling;
+			const existing = seat.parentElement?.querySelector(`:scope > [${PORTAL_ATTRIBUTE}]`) ?? null;
+			if (existing !== null) {
+				if (existing.previousElementSibling !== seat) seat.insertAdjacentElement("afterend", existing);
+				return existing;
+			}
 			const portal = document.createElement("span");
 			portal.setAttribute(PORTAL_ATTRIBUTE, "");
 			seat.insertAdjacentElement("afterend", portal);
@@ -8635,6 +8856,8 @@ window.__ModuleLoader__.load({
 			if (key === "End") return count - 1;
 			return (current + (key === "ArrowDown" ? 1 : -1) + count) % count;
 		}
+		const BRANCH_LOAD_RETRIES = 2;
+		const BRANCH_LOAD_RETRY_MS = 1e3;
 		const WORKTREE_PROGRESS_STAGES = [
 			"inspecting",
 			"fetching",
@@ -9002,14 +9225,26 @@ window.__ModuleLoader__.load({
 				setTicketError(void 0);
 				if (portal === void 0 || path === void 0) return;
 				const controller = new AbortController();
-				loadRepositoryBranches(path, controller.signal).then((value) => {
-					setBranches(value);
-					setSelected(value.current ?? value.branches[0] ?? "");
-				}, (reason) => {
-					if (!controller.signal.aborted) setError(reason instanceof Error ? reason.message : String(reason));
-				});
+				let timer;
+				const load = (remaining) => {
+					loadRepositoryBranches(path, controller.signal).then((value) => {
+						setBranches(value);
+						setSelected(value.current ?? value.branches[0] ?? "");
+					}, (reason) => {
+						if (controller.signal.aborted) return;
+						if (remaining > 0) {
+							timer = setTimeout(() => {
+								load(remaining - 1);
+							}, BRANCH_LOAD_RETRY_MS);
+							return;
+						}
+						setError(reason instanceof Error ? reason.message : String(reason));
+					});
+				};
+				load(BRANCH_LOAD_RETRIES);
 				return () => {
 					controller.abort();
+					if (timer !== void 0) clearTimeout(timer);
 				};
 			}, [
 				portal,
@@ -9409,7 +9644,7 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client/details-resize.ts
 		const DETAILS_MIN_WIDTH = 300;
-		const DETAILS_DEFAULT_WIDTH = 480;
+		const DETAILS_DEFAULT_WIDTH = 720;
 		const DETAILS_MAX_RATIO = .5;
 		const DRAG_THRESHOLD = 4;
 		function clampDetailsWidth(width, frameWidth) {
@@ -9610,14 +9845,16 @@ window.__ModuleLoader__.load({
 			globalSettings: "Claude Code 设置",
 			globalSettingsBody: "修改受支持的 Claude Code 与插件设置；其他字段会被保留。",
 			globalSettingsLoading: "正在加载全局设置…",
-			globalSettingsNewSession: "Output Style 修改仅对新建 Claude 会话生效。",
+			globalSettingsNewSession: "修改仅对新建 Claude 会话生效。",
 			globalSettingsError: "全局设置保存失败",
 			outputStyle: "Output Style",
 			worktreeBranchPrefix: "Worktree 分支前缀",
 			worktreeBranchPrefixEffect: "分支前缀修改会应用于之后自动创建的 Worktree 分支；显式指定的完整分支名不会被修改。",
 			maxProcessesSetting: "Claude 进程上限",
 			idleTimeoutSetting: "闲置回收时长（分钟）",
-			limitsSettingEffect: "进程上限在下次启动 Claude 进程时生效；闲置回收时长在下一次回合结束后生效。留空或非法值会被拒绝。",
+			maxProcessesEffect: "进程上限在下次启动 Claude 进程时生效。留空或非法值会被拒绝。",
+			idleTimeoutEffect: "闲置回收时长在下一次回合结束后生效。留空或非法值会被拒绝。",
+			settingHint: "查看说明",
 			pluginUpdate: "插件更新",
 			pluginUpdateBody: "检查 npm 上的新版本。只有可唯一识别的 npm 安装才能直接更新；本地开发链接不会被替换。",
 			updateNotChecked: "尚未检查更新。",
@@ -9655,7 +9892,22 @@ window.__ModuleLoader__.load({
 			tasksViewActivity: "查看活动",
 			tasksHideActivity: "收起活动",
 			tasksRunningCount: "{count} 个运行中任务",
-			repositoryRateLimited: "Claude 额度限流中",
+			planUsage: "账号额度",
+			planUsageBody: "当前 Claude 订阅的用量窗口，来自 Claude Code 的 /usage 数据。会话空闲时自动刷新，也可随时手动刷新。",
+			planUsageLoading: "读取中…",
+			planUsageRefresh: "刷新额度",
+			planUsageRefreshing: "刷新中…",
+			planUsageUnavailable: "此账号没有订阅额度（API key、Bedrock、Vertex 等不受套餐限流）。",
+			planUsageNever: "尚未获取额度数据，运行一次对话或点击刷新。",
+			planUsageError: "额度读取失败",
+			planUsageSubscription: "订阅",
+			planUsageUpdated: "更新于 {age}前",
+			planUsageResets: "{age}后重置",
+			planUsageUsed: "已用 {percent}%",
+			planWindow_five_hour: "5 小时",
+			planWindow_seven_day: "全部模型 · 每周",
+			planWindow_seven_day_opus: "Opus · 每周",
+			planWindow_seven_day_sonnet: "Sonnet · 每周",
 			tasksTurnRunning: "{count} 个任务执行中",
 			tasksTurnCompleted: "{count} 个任务已完成",
 			tasksTurnFailed: "{failed} 个任务失败，{completed} 个已完成",
@@ -9773,10 +10025,12 @@ window.__ModuleLoader__.load({
 			diffMergeCompleted: "已合并 PR #{number}",
 			diffUpdateBranch: "Update branch…",
 			repositoryUpdateBranch: "Update branch",
-			diffUpdateBranchDescription: "将 origin/{base} 合并进当前分支并推送;出现冲突时可交给 Claude 解决。",
+			diffUpdateBranchDescription: "用 origin/{base} 更新当前分支并推送;出现冲突时可交给 Claude 解决。",
+			diffUpdateBranch_rebase: "Rebase 到 origin/{base}(改写历史,以 --force-with-lease 推送)",
+			diffUpdateBranch_merge: "将 origin/{base} 合并进当前分支",
 			diffUpdateBranchBehind: "落后 origin/{base} {count} 个 commit",
-			diffUpdateBranchCompleted: "已合并并推送 commit {commit}",
-			diffUpdateBranchConflicts: "合并产生冲突,以下文件需要解决:",
+			diffUpdateBranchCompleted: "已更新并推送 commit {commit}",
+			diffUpdateBranchConflicts: "更新产生冲突,以下文件需要解决:",
 			diffUpdateBranchResolve: "让 Claude 解决冲突",
 			repositoryChecksOpen: "查看失败的检查",
 			checksCardTitle: "失败的检查",
@@ -9907,14 +10161,16 @@ window.__ModuleLoader__.load({
 			globalSettings: "Claude Code settings",
 			globalSettingsBody: "Modify supported Claude Code and plugin settings while preserving every other field.",
 			globalSettingsLoading: "Loading global settings…",
-			globalSettingsNewSession: "Output Style changes apply only to new Claude sessions.",
+			globalSettingsNewSession: "Changes apply only to new Claude sessions.",
 			globalSettingsError: "Global settings save failed",
 			outputStyle: "Output Style",
 			worktreeBranchPrefix: "Worktree branch prefix",
 			worktreeBranchPrefixEffect: "Prefix changes apply to subsequently generated Worktree branches. Explicit full branch names remain unchanged.",
 			maxProcessesSetting: "Claude process limit",
 			idleTimeoutSetting: "Idle timeout (minutes)",
-			limitsSettingEffect: "The process limit applies when the next Claude process is admitted; the idle timeout applies after the next completed turn.",
+			maxProcessesEffect: "The process limit applies when the next Claude process is admitted. Blank or invalid values are rejected.",
+			idleTimeoutEffect: "The idle timeout applies after the next completed turn. Blank or invalid values are rejected.",
+			settingHint: "Show details",
 			pluginUpdate: "Plugin updates",
 			pluginUpdateBody: "Check npm for new releases. Only a uniquely identified npm installation can update in place; local development links are never replaced.",
 			updateNotChecked: "Updates have not been checked yet.",
@@ -9952,7 +10208,22 @@ window.__ModuleLoader__.load({
 			tasksViewActivity: "View activity",
 			tasksHideActivity: "Hide activity",
 			tasksRunningCount: "{count} running task(s)",
-			repositoryRateLimited: "Rate limited",
+			planUsage: "Plan usage",
+			planUsageBody: "Utilization windows for the signed-in Claude subscription, from Claude Code's /usage data. Refreshes whenever a session goes idle, and on demand.",
+			planUsageLoading: "Loading…",
+			planUsageRefresh: "Refresh usage",
+			planUsageRefreshing: "Refreshing…",
+			planUsageUnavailable: "This account has no plan limits (API key, Bedrock, and Vertex sessions are not rate limited by a subscription).",
+			planUsageNever: "No usage data yet — run a turn or refresh.",
+			planUsageError: "Usage lookup failed",
+			planUsageSubscription: "Subscription",
+			planUsageUpdated: "Updated {age} ago",
+			planUsageResets: "Resets in {age}",
+			planUsageUsed: "{percent}% used",
+			planWindow_five_hour: "5-hour",
+			planWindow_seven_day: "All models · weekly",
+			planWindow_seven_day_opus: "Opus · weekly",
+			planWindow_seven_day_sonnet: "Sonnet · weekly",
 			tasksTurnRunning: "{count} task(s) running",
 			tasksTurnCompleted: "{count} task(s) completed",
 			tasksTurnFailed: "{failed} failed, {completed} completed",
@@ -10070,10 +10341,12 @@ window.__ModuleLoader__.load({
 			diffMergeCompleted: "Merged PR #{number}",
 			diffUpdateBranch: "Update branch…",
 			repositoryUpdateBranch: "Update branch",
-			diffUpdateBranchDescription: "Merge origin/{base} into the current branch and push; hand any conflicts to Claude.",
+			diffUpdateBranchDescription: "Update the current branch from origin/{base} and push; hand any conflicts to Claude.",
+			diffUpdateBranch_rebase: "Rebase onto origin/{base} (rewrites history, pushes with --force-with-lease)",
+			diffUpdateBranch_merge: "Merge origin/{base} into the current branch",
 			diffUpdateBranchBehind: "{count} commit(s) behind origin/{base}",
-			diffUpdateBranchCompleted: "Merged and pushed commit {commit}",
-			diffUpdateBranchConflicts: "The merge left conflicts in these files:",
+			diffUpdateBranchCompleted: "Updated and pushed commit {commit}",
+			diffUpdateBranchConflicts: "The update left conflicts in these files:",
 			diffUpdateBranchResolve: "Have Claude resolve the conflicts",
 			repositoryChecksOpen: "Show failing checks",
 			checksCardTitle: "Failing checks",