@ai-ecoverse/slicc-spectrum 1.92.0 → 1.94.1

package/dist/slicc-ui.js

@@ -9349,7 +9349,7 @@ function themeOf(node) {
   }
   return document.querySelector("slicc-app")?.shadowRoot?.querySelector("sp-theme") ?? document.body;
 }
-var dialogStyles = i`
+var dialogFrame = i`
   dialog {
     box-sizing: border-box;
     max-inline-size: calc(100vw - 2 * var(--swc-spacing-300));
@@ -9369,6 +9369,13 @@ var dialogStyles = i`
       color-mix(in srgb, var(--swc-overlay-color) calc(var(--swc-overlay-opacity-dark) * 100%), transparent)
     );
   }
+  @media (forced-colors: active) {
+    dialog {
+      outline: solid;
+    }
+  }
+`;
+var alertStyles = i`
   sp-alert-dialog {
     --mod-alert-dialog-min-width: min(
       var(--swc-alert-dialog-minimum-width),
@@ -9390,9 +9397,6 @@ var dialogStyles = i`
     }
   }
   @media (forced-colors: active) {
-    dialog {
-      outline: solid;
-    }
     sp-alert-dialog {
       border: none;
     }
@@ -9409,6 +9413,7 @@ var dialogStyles = i`
     margin-block-end: var(--swc-spacing-75);
   }
 `;
+var dialogStyles = [dialogFrame, alertStyles];
 var SliccConfirm = class extends i2 {
   static properties = { heading: {}, body: {}, action: {}, variant: {}, cancel: {} };
   trigger = null;
@@ -16209,11 +16214,11 @@ function getVisibleRowContext(state2, index) {
     subtreeEndIndex: getVisibleRowSubtreeEndIndex(state2, selected.cursor, selected.index, totalVisibleCount)
   };
 }
-function getVisibleSlice(state2, start, end) {
+function getVisibleSlice(state2, start2, end) {
   const instrumentation = state2.instrumentation;
   const totalVisibleCount = getVisibleCount(state2);
-  if (totalVisibleCount <= 0 || end < start) return [];
-  const normalizedStart = Math.max(0, Math.min(start, totalVisibleCount - 1));
+  if (totalVisibleCount <= 0 || end < start2) return [];
+  const normalizedStart = Math.max(0, Math.min(start2, totalVisibleCount - 1));
   const normalizedEnd = Math.max(normalizedStart, Math.min(end, totalVisibleCount - 1));
   if (instrumentation == null) {
     if (normalizedStart === 0) return collectVisibleRowsDFS(state2, normalizedEnd + 1);
@@ -16832,8 +16837,8 @@ var PathStore = class PathStore2 {
   getVisibleCount() {
     return withBenchmarkPhase(this.#state.instrumentation, "store.getVisibleCount", () => getVisibleCount(this.#state));
   }
-  getVisibleSlice(start, end) {
-    return withBenchmarkPhase(this.#state.instrumentation, "store.getVisibleSlice", () => getVisibleSlice(this.#state, start, end));
+  getVisibleSlice(start2, end) {
+    return withBenchmarkPhase(this.#state.instrumentation, "store.getVisibleSlice", () => getVisibleSlice(this.#state, start2, end));
   }
   getVisibleRowContext(index) {
     return withBenchmarkPhase(this.#state.instrumentation, "store.getVisibleRowContext", () => getVisibleRowContext(this.#state, index));
@@ -17896,9 +17901,9 @@ var FileTreeController = class FileTreeController2 {
   getVisibleCount() {
     return this.#visibleCount;
   }
-  getVisibleRows(start, end) {
-    if (end < start || this.#visibleCount === 0) return [];
-    const boundedStart = Math.max(0, start);
+  getVisibleRows(start2, end) {
+    if (end < start2 || this.#visibleCount === 0) return [];
+    const boundedStart = Math.max(0, start2);
     const boundedEnd = Math.min(this.#visibleCount - 1, end);
     if (boundedEnd < boundedStart) return [];
     const boundedLength = boundedEnd - boundedStart + 1;
@@ -22203,8 +22208,8 @@ var FileTree = class {
   getVisibleCount() {
     return this.#controller.getVisibleCount();
   }
-  getVisibleRows(start, end) {
-    return this.#controller.getVisibleRows(start, end);
+  getVisibleRows(start2, end) {
+    return this.#controller.getVisibleRows(start2, end);
   }
   getSelectedPaths() {
     return this.#controller.getSelectedPaths();
@@ -22529,14 +22534,14 @@ function inline2(text2) {
 function cells(line) {
   return line.trim().replace(/^\||\|$/g, "").split("|").map((cell) => cell.trim());
 }
-function fence(lines, start) {
-  const lang = lines[start].slice(3).trim();
-  let end = start + 1;
+function fence(lines, start2) {
+  const lang = lines[start2].slice(3).trim();
+  let end = start2 + 1;
   while (end < lines.length && !lines[end].startsWith("```")) end++;
-  return [{ type: "code", lang, text: lines.slice(start + 1, end).join("\n") }, end + 1];
+  return [{ type: "code", lang, text: lines.slice(start2 + 1, end).join("\n") }, end + 1];
 }
-function run(lines, start, test) {
-  let end = start;
+function run(lines, start2, test) {
+  let end = start2;
   while (end < lines.length && test(lines[end])) end++;
   return end;
 }
@@ -22649,6 +22654,34 @@ function markdown(text2) {
   return b`${parse(text2).map(render)}`;
 }
 
+// src/app/sign-in.ts
+var continuing = "Continue in the sign-in window that opened.";
+var closed = "Closed the sign-in window? Cancel, then Log in again.";
+var signInWait = { closedAfter: 2e4 };
+function signInText(waited) {
+  return waited ? closed : continuing;
+}
+var SignInWaits = class {
+  #since = /* @__PURE__ */ new Map();
+  #update;
+  constructor(update) {
+    this.#update = update;
+  }
+  waited(key2) {
+    const now = Date.now();
+    const since3 = this.#since.get(key2);
+    if (since3 === void 0) {
+      this.#since.set(key2, now);
+      setTimeout(this.#update, signInWait.closedAfter);
+      return false;
+    }
+    return now - since3 >= signInWait.closedAfter;
+  }
+  done(key2) {
+    this.#since.delete(key2);
+  }
+};
+
 // src/app/messages.ts
 var lickLabels = {
   webhook: ["Webhook", "informative"],
@@ -22843,8 +22876,6 @@ function actionLabel(action, handlers, messageId) {
   return count2 > 1 ? `Drop ${count2} failed turns` : actionLabels[action];
 }
 var signedIn = "Signed in. Retry to send it again.";
-var continuing = "Continue in the sign-in window that opened.";
-var closed = "Closed the sign-in window? Cancel, then Log in again.";
 function stopSigningIn(event2, handlers, account, id) {
   const main2 = event2.currentTarget.nextElementSibling;
   main2.focus();
@@ -22863,7 +22894,7 @@ function errorCard(item2, handlers) {
   const login = fix === "login" && item2.account && !handlers.readOnly ? handlers.login?.(item2.account, id) : void 0;
   const resolved = login?.state === "connected";
   const signing = login?.state === "signing-in" && login.window;
-  const text2 = resolved ? signedIn : signing ? login.waited ? closed : continuing : item2.text;
+  const text2 = resolved ? signedIn : signing ? signInText(login.waited) : item2.text;
   const title = resolved && login.provider ? `Signed in to ${login.provider} again.` : item2.title;
   const failure2 = login?.state === "idle" ? login.error : void 0;
   return b`<div class="error-card" role=${resolved ? A : "alert"} aria-atomic=${resolved ? A : "false"} data-id=${id || A} data-login=${login?.state ?? A}>
@@ -24701,7 +24732,7 @@ document.addEventListener(
   },
   true
 );
-var SliccChat = class _SliccChat extends ThemedElement {
+var SliccChat = class extends ThemedElement {
   static properties = {
     ...ThemedElement.properties,
     agent: {},
@@ -25125,19 +25156,14 @@ var SliccChat = class _SliccChat extends ThemedElement {
     if (!restored) return;
     this.renderRoot.querySelector("slicc-composer")?.restore(latest ? { text: latest.text, attachments: latest.attachments } : restored);
   }
-  static closedAfter = 2e4;
-  #logins = /* @__PURE__ */ new Map();
-  #signing = /* @__PURE__ */ new Map();
-  #waited(key2) {
-    const now = Date.now();
-    const since3 = this.#signing.get(key2);
-    if (since3 === void 0) {
-      this.#signing.set(key2, now);
-      setTimeout(() => this.requestUpdate(), _SliccChat.closedAfter);
-      return false;
-    }
-    return now - since3 >= _SliccChat.closedAfter;
+  static get closedAfter() {
+    return signInWait.closedAfter;
   }
+  static set closedAfter(after) {
+    signInWait.closedAfter = after;
+  }
+  #logins = /* @__PURE__ */ new Map();
+  #waits = new SignInWaits(() => this.requestUpdate());
   #loginState(accountId, messageId) {
     const settings = this.model.settings;
     const account = settings.accounts().find((candidate) => candidate.id === accountId);
@@ -25146,8 +25172,8 @@ var SliccChat = class _SliccChat extends ThemedElement {
     const window2 = account?.auth === "oauth";
     const key2 = `${messageId}:${accountId}`;
     if (account?.status === "signing-in" || local2?.pending)
-      return { state: "signing-in", cancel, window: window2, waited: window2 && this.#waited(key2) };
-    this.#signing.delete(key2);
+      return { state: "signing-in", cancel, window: window2, waited: window2 && this.#waits.waited(key2) };
+    this.#waits.done(key2);
     if (account?.status === "connected") return { state: "connected", provider: account.provider };
     return { state: "idle", error: local2?.error };
   }
@@ -25988,13 +26014,13 @@ var SliccFileView = class extends ThemedElement {
   async save() {
     const model = this.model;
     if (!model || this.draft === null) return;
-    const draft = this.draft;
+    const draft2 = this.draft;
     this.saving = true;
     try {
-      await model.files.write(this.path, draft);
-      this.text = draft;
+      await model.files.write(this.path, draft2);
+      this.text = draft2;
       this.missing = false;
-      if (this.draft === draft) this.draft = null;
+      if (this.draft === draft2) this.draft = null;
     } finally {
       this.saving = false;
     }
@@ -31336,8 +31362,8 @@ var Panels = class {
     };
   }
   find(id) {
-    const listed = this.list().find((info) => info.id === id);
-    if (listed) return listed;
+    const listed2 = this.list().find((info) => info.id === id);
+    if (listed2) return listed2;
     const document2 = id.match(/^(file|diff):(.+)$/);
     if (!document2) return void 0;
     return this.#state({
@@ -36597,9 +36623,9 @@ function scan2(words, cwds, whole) {
 }
 function reach2(command3, cwd) {
   if (command3.length > 4096) return `${command3.slice(0, 40)}\u2026`;
-  const start = absolute("/", cwd ?? "/");
-  if (protects(start, false)) return start;
-  const cwds = /* @__PURE__ */ new Set([start]);
+  const start2 = absolute("/", cwd ?? "/");
+  if (protects(start2, false)) return start2;
+  const cwds = /* @__PURE__ */ new Set([start2]);
   const text2 = unglob(ansi(command3.replace(/\\\n/g, "")));
   const plain = text2.split(separators).map((segment2) => commas(segment2.split(/[\s<>=]+/).map((word) => word.replace(/['"\\]/g, ""))));
   const aware = shield(text2).split(separators).map((segment2) => commas(quoted(unshield(segment2))));
@@ -36610,7 +36636,7 @@ function reach2(command3, cwd) {
     if (hit) return hit;
   }
   const named2 = segments.flat().find((word) => !word.startsWith("/") && /fnox|secrets-policy/.test(word));
-  if (named2) return absolute([...cwds].pop() ?? start, named2);
+  if (named2) return absolute([...cwds].pop() ?? start2, named2);
   const home2 = segments.flat().find((word) => /^~(?:[+-](?:\/|$)|.*\/\.\.(?:\/|$))/.test(word));
   if (home2) return home2;
   return segments.flat().some((word) => word.includes("$")) || text2.includes("`") ? text2.match(expansion)[0] : null;
@@ -39792,20 +39818,18 @@ var fieldStyles = i`
     font-size: var(--swc-font-size-75);
     color: var(--swc-neutral-subdued-content-color-default);
   }
-  .field input:not([type='checkbox']),
-  .field select {
+  .field input:not([type='checkbox']) {
     box-sizing: border-box;
     inline-size: 100%;
     font: inherit;
     min-height: var(--swc-component-height-100);
     padding: 0 var(--swc-spacing-100);
-    border: var(--swc-border-width-100) solid var(--swc-gray-400);
+    border: var(--swc-border-width-100) solid var(--swc-neutral-visual-color);
     border-radius: var(--swc-corner-radius-small-default);
     background: var(--swc-background-layer-2-color);
     color: inherit;
   }
-  .field input[aria-invalid='true'],
-  .field select[aria-invalid='true'] {
+  .field input[aria-invalid='true'] {
     border-color: var(--swc-negative-border-color-default);
   }
   .field input[type='file'] {
@@ -39822,7 +39846,6 @@ var fieldStyles = i`
     color: inherit;
   }
   .field input:focus-visible,
-  .field select:focus-visible,
   input[type='checkbox']:focus-visible {
     outline: var(--swc-focus-indicator-thickness) solid var(--swc-focus-indicator-color);
     outline-offset: var(--swc-focus-ring-gap);
@@ -40422,7 +40445,7 @@ var SliccComposer = class extends ThemedElement {
     clearValues(this.renderRoot);
     const held = [
       this.attachments,
-      ...[...this.#drafts.values()].map((draft) => draft.attachments)
+      ...[...this.#drafts.values()].map((draft2) => draft2.attachments)
     ];
     if (held.flat().some((attachment2) => attachment2.url?.startsWith("blob:")))
       this.#abandon = setTimeout(() => {
@@ -40478,10 +40501,10 @@ var SliccComposer = class extends ThemedElement {
   #switch(id) {
     if (this.#agent)
       this.#drafts.set(this.#agent, { value: this.value, attachments: this.attachments });
-    const draft = this.#drafts.get(id);
+    const draft2 = this.#drafts.get(id);
     this.#agent = id;
-    this.value = draft?.value ?? "";
-    this.attachments = draft?.attachments ?? [];
+    this.value = draft2?.value ?? "";
+    this.attachments = draft2?.attachments ?? [];
     this.popup = null;
     this.#history = -1;
   }
@@ -40534,8 +40557,8 @@ var SliccComposer = class extends ThemedElement {
     this.failure = null;
     this.#history = -1;
     model.agent.send(this.#agent, text2).catch((error) => {
-      const draft = this.value.trim();
-      this.value = draft && draft !== text2 ? `${text2}
+      const draft2 = this.value.trim();
+      this.value = draft2 && draft2 !== text2 ? `${text2}
 ${this.value}` : text2;
       this.failure = error instanceof Error ? error.message : String(error);
     });
@@ -40860,8 +40883,8 @@ ${this.value}` : text2;
   }
   async #paste(event2) {
     const data = event2.clipboardData;
-    const listed = [...data?.files ?? []];
-    const files = listed.length ? listed : [...data?.items ?? []].flatMap((item2) => {
+    const listed2 = [...data?.files ?? []];
+    const files = listed2.length ? listed2 : [...data?.items ?? []].flatMap((item2) => {
       const file = item2.kind === "file" ? item2.getAsFile() : null;
       return file ? [file] : [];
     });
@@ -41828,9 +41851,9 @@ function revealed(name, entries, now = Date.now(), more = false) {
   );
   if (!reveals.length) return null;
   const [last] = reveals;
-  const start = startOfDay(now);
-  const today = reveals.filter((entry) => entry.at >= start).length;
-  const partial = more && (entries[entries.length - 1]?.at ?? 0) >= start;
+  const start2 = startOfDay(now);
+  const today = reveals.filter((entry) => entry.at >= start2).length;
+  const partial = more && (entries[entries.length - 1]?.at ?? 0) >= start2;
   const when2 = today ? `${partial ? "at least " : ""}${today} ${today === 1 ? "time" : "times"} today` : since(last.at, now);
   return b`Revealed to programs ${when2}, last by ${who(last)} with <code>${last.argv}</code>`;
 }
@@ -41839,7 +41862,28 @@ function changes(entry, devices) {
     return entry.changes.map((change) => [change.kind, changeLine(change, devices)]);
   return (entry.widened ?? []).map((change) => [change.kind, widening(change, devices)]);
 }
-function auditLine(entry, devices) {
+var listed = (items, one2) => items.map((item2, index) => b`${index ? ", " : ""}${one2(item2)}`);
+function endpointsLine(entry, named2 = (provider) => provider) {
+  const parts2 = [];
+  if (entry.purged?.length)
+    parts2.push(
+      b`<span class="part" data-part="purged">Removed custom model URLs an agent set, automatically: ${listed(entry.purged, (item2) => b`${named2(item2.provider)} at <code>${item2.host ?? item2.url}</code>`)}. Only you can set a model URL now, in Settings › Accounts</span>`
+    );
+  if (entry.adopted?.length)
+    parts2.push(
+      b`<span class="part" data-part="adopted">Kept the MCP servers your tokens use, automatically: ${listed(entry.adopted, (item2) => b`${item2.server} at <code>${item2.host}</code>`)}</span>`
+    );
+  if (entry.pinned)
+    parts2.push(
+      b`<span class="part" data-part="pinned"><code>${entry.pinned.name ?? entry.pinned.server}</code> pinned to <code>${entry.pinned.host}</code> automatically, on first use</span>`
+    );
+  if (entry.unpinned)
+    parts2.push(
+      b`<span class="part" data-part="unpinned"><code>${entry.unpinned.name ?? entry.unpinned.server}</code> unpinned from <code>${entry.unpinned.host}</code>; the next use pins it again</span>`
+    );
+  return b`${parts2.map((part2, index) => b`${index ? ". " : ""}${part2}`)}`;
+}
+function auditLine(entry, devices, named2) {
   switch (entry.type) {
     case "inject":
     case "forward":
@@ -41855,7 +41899,7 @@ function auditLine(entry, devices) {
     case "restore":
       return b`Restored`;
     case "endpoints":
-      return b`Removed custom model URLs an agent set, automatically: ${entry.purged.map((item2, index) => b`${index ? ", " : ""}${item2.provider} <code>${item2.url}</code>`)}`;
+      return endpointsLine(entry, named2);
     case "refresh":
       return entry.grant ? b`Refreshed automatically with the sign-in <code>${entry.grant}</code>` : b`Refreshed automatically`;
     default:
@@ -41912,6 +41956,9 @@ var SliccSecrets = class extends ThemedElement {
     failure: { state: true },
     form: { state: true },
     busy: { state: true },
+    unpinning: { state: true },
+    unpinned: { state: true },
+    unpinFailure: { state: true },
     problem: { state: true },
     invalid: { state: true },
     said: { state: true },
@@ -41934,6 +41981,9 @@ var SliccSecrets = class extends ThemedElement {
     this.failure = null;
     this.form = null;
     this.busy = false;
+    this.unpinning = null;
+    this.unpinned = /* @__PURE__ */ new Set();
+    this.unpinFailure = null;
     this.problem = null;
     this.invalid = null;
     this.said = null;
@@ -42196,6 +42246,13 @@ var SliccSecrets = class extends ThemedElement {
       .audit .hint {
         display: block;
       }
+      .audit .unpin {
+        display: flex;
+        flex-wrap: wrap;
+        align-items: center;
+        gap: var(--swc-spacing-200);
+        margin-top: var(--swc-spacing-100);
+      }
       .row {
         display: flex;
         flex-wrap: wrap;
@@ -42257,6 +42314,9 @@ var SliccSecrets = class extends ThemedElement {
     this.failure = null;
     this.form = null;
     this.busy = false;
+    this.unpinning = null;
+    this.unpinned = /* @__PURE__ */ new Set();
+    this.unpinFailure = null;
     this.problem = null;
     this.invalid = null;
     this.said = null;
@@ -42741,12 +42801,42 @@ var SliccSecrets = class extends ThemedElement {
         ${refused2.map((item2) => b`<li data-refused-secret=${item2.secret}><span><code>${item2.secret}</code> to ${ruleLine(item2.rule)}</span><span class="muted">${item2.reason}</span></li>`)}
       </ul>`;
   }
-  #entry(entry, devices) {
+  #provider(id) {
+    const settings = this.model?.settings;
+    const option2 = settings?.providers?.().find((item2) => item2.id === id);
+    const account = settings?.accounts().find((item2) => item2.id === id);
+    return option2?.name ?? account?.provider ?? id;
+  }
+  #unpin(vault, entry, all2) {
+    const name = entry.pinned?.name;
+    if (!name || !vault.unpin) return A;
+    const key2 = `unpin:${entry.seq}`;
+    const undone = all2.some(
+      (later) => later.type === "endpoints" && later.seq > entry.seq && later.unpinned?.name === name
+    );
+    if (undone || this.unpinned.has(key2)) return A;
+    const busy = this.unpinning === key2;
+    return b`<span class="unpin"><swc-button size="s" variant="secondary" fill-style="outline" data-action="unpin" ?pending=${busy} ?disabled=${!!vault.status()?.locked} @click=${() => this.#unpinNow(vault, name, key2)}>Unpin</swc-button>${this.unpinFailure?.key === key2 ? b`<span class="warning" role="alert" data-error="unpin">${this.unpinFailure.message}</span>` : A}</span>`;
+  }
+  async #unpinNow(vault, name, key2) {
+    if (this.unpinning) return;
+    this.unpinning = key2;
+    this.unpinFailure = null;
+    try {
+      await vault.unpin?.([name]);
+      if (this.#mine(vault)) this.unpinned = /* @__PURE__ */ new Set([...this.unpinned, key2]);
+    } catch (error) {
+      if (this.#mine(vault)) this.unpinFailure = { key: key2, message: failureText(error) };
+    } finally {
+      if (this.#mine(vault)) this.unpinning = null;
+    }
+  }
+  #entry(entry, devices, vault, all2 = []) {
     const date = new Date(entry.at);
     const name = entry.type === "policy" || entry.type === "endpoints" ? null : entry.name;
     return b`<li data-seq=${entry.seq} data-type=${entry.type}>
       <time datetime=${date.toISOString()} title=${date.toLocaleString("en-GB", { dateStyle: "medium", timeStyle: "short" })}>${since(entry.at)}</time>
-      <span class="what">${name ? b`<code>${name}</code> · ` : A}${auditLine(entry, devices)}${entry.type === "policy" || entry.type === "refresh" || entry.type === "endpoints" ? A : b` <span class="by">by ${who(entry)}</span>`}</span>
+      <span class="what">${name ? b`<code>${name}</code> · ` : A}${auditLine(entry, devices, (provider) => this.#provider(provider))}${entry.type === "policy" || entry.type === "refresh" || entry.type === "endpoints" ? A : b` <span class="by">by ${who(entry)}</span>`}${entry.type === "endpoints" && vault ? this.#unpin(vault, entry, all2) : A}</span>
     </li>`;
   }
   #audit(vault, list5, entries, devices) {
@@ -42758,7 +42848,7 @@ var SliccSecrets = class extends ThemedElement {
       this.reveals = event2.target.checked;
     }}>Only reveals to programs</sp-switch>
       </div>
-      ${shown4.length ? b`<ol class="audit" aria-labelledby="secrets-audit">${shown4.map((entry) => this.#entry(entry, devices))}</ol>` : b`<p class="muted" data-audit-empty>${this.reveals ? more ? "No reveals in the activity loaded so far." : "No program has been given a secret." : "Nothing has used a secret yet."}</p>`}
+      ${shown4.length ? b`<ol class="audit" aria-labelledby="secrets-audit">${shown4.map((entry) => this.#entry(entry, devices, vault, entries))}</ol>` : b`<p class="muted" data-audit-empty>${this.reveals ? more ? "No reveals in the activity loaded so far." : "No program has been given a secret." : "Nothing has used a secret yet."}</p>`}
       ${more ? b`<div class="row"><swc-button size="s" variant="secondary" fill-style="outline" data-action="older" ?pending=${this.loading} @click=${() => this.showOlder(vault, entries)}>Show older</swc-button></div>` : A}`;
   }
   #feedback() {
@@ -42873,6 +42963,7 @@ function recordKind(account) {
   return account.group === "mcp" ? "mcp" : "model";
 }
 function recordName(account) {
+  if (account.vaultName) return account.vaultName;
   if (account.group === "mcp") return `MCP_${upper(serverOf(account))}_TOKEN`;
   return envNames[account.id] ?? `${upper(account.id)}_API_KEY`;
 }
@@ -42887,7 +42978,51 @@ var accountStatus = {
   "needs-sign-in": ["neutral", "Needs sign-in"],
   "sign-in-expired": ["notice", "Sign-in expired"]
 };
+var authHints = {
+  "api-key": "API key",
+  oauth: "Sign in",
+  fields: "Endpoint and key",
+  local: "On this device"
+};
+var listOrder = {
+  connected: 0,
+  expired: 1,
+  "signing-in": 2,
+  disconnected: 3
+};
+var corsNotice = {
+  short: "Needs the SLICC extension or CLI",
+  long: "Needs the SLICC extension or CLI, because the browser blocks direct requests to it."
+};
+var removeBodies = {
+  oauth: "Its sign-in is deleted from the vault. Models from it stop working.",
+  local: "Models from it stop working."
+};
+function draft(option2) {
+  return {
+    id: option2.id,
+    provider: option2.name,
+    identity: "",
+    status: "disconnected",
+    group: "providers",
+    store: "vault",
+    auth: option2.auth === "fields" ? "api-key" : option2.auth,
+    fields: option2.fields,
+    keyUrl: option2.keyUrl,
+    needs: option2.needs,
+    vaultName: option2.vaultName
+  };
+}
+function matchProviders(options, query) {
+  const words = query.trim().toLowerCase().split(/\s+/).filter(Boolean);
+  return options.filter((option2) => {
+    const text2 = `${option2.name} ${option2.id} ${option2.description ?? ""}`.toLowerCase();
+    return words.every((word) => text2.includes(word));
+  });
+}
 var popup = (account) => account.group === "mcp" && account.auth === "oauth";
+var start = (options, value) => options.some((option2) => option2.value === value) ? value : options[0]?.value ?? "";
+var nothingToChoose = "Nothing to choose from yet. You can connect without it.";
 var secretNames = { "api-key": "API key", token: "token" };
 var rejectedNames = { "api-key": "API key rejected", token: "Token rejected" };
 var keptNames = { "api-key": "Key kept in the vault", token: "Token kept in the vault" };
@@ -42906,8 +43041,15 @@ var SliccSettings = class extends ThemedElement {
     entering: { state: true },
     failure: { state: true },
     problem: { state: true },
-    blocked: { state: true }
+    blocked: { state: true },
+    picking: { state: true },
+    adding: { state: true },
+    query: { state: true },
+    filled: { state: true }
   };
+  #waits = new SignInWaits(() => this.requestUpdate());
+  #landing = null;
+  #bases = /* @__PURE__ */ new Map();
   #scroll = new ViewScroll(this, "settings:scroll", { scroller: () => this, rows: "[data-id]" });
   constructor() {
     super();
@@ -42916,9 +43058,16 @@ var SliccSettings = class extends ThemedElement {
     this.failure = null;
     this.problem = null;
     this.blocked = false;
+    this.picking = false;
+    this.adding = null;
+    this.query = "";
+    this.filled = /* @__PURE__ */ new Set();
   }
   static styles = [
     fieldStyles,
+    dialogFrame,
+    searchCss,
+    r(link_default),
     i`
       :host {
         display: block;
@@ -43005,6 +43154,22 @@ var SliccSettings = class extends ThemedElement {
         gap: var(--swc-spacing-200);
         max-width: 420px;
       }
+      .key.stacked sp-textfield,
+      .field sp-picker {
+        width: 100%;
+      }
+      .field sp-field-label {
+        margin: 0;
+        padding-block: 0;
+      }
+      .sr {
+        position: absolute;
+        inline-size: 1px;
+        block-size: 1px;
+        overflow: hidden;
+        clip-path: inset(50%);
+        white-space: nowrap;
+      }
       .buttons,
       .locked {
         display: flex;
@@ -43030,6 +43195,144 @@ var SliccSettings = class extends ThemedElement {
         line-height: var(--swc-line-height-200);
         --swc-icon-color: var(--swc-negative-content-color-default);
       }
+      .actions {
+        display: flex;
+        align-items: center;
+        gap: var(--swc-spacing-75);
+      }
+      .notes {
+        grid-column: 1 / -1;
+        display: grid;
+        gap: var(--swc-spacing-75);
+        margin-block-start: calc(-1 * var(--swc-spacing-200));
+      }
+      .notice {
+        display: flex;
+        align-items: flex-start;
+        gap: var(--swc-spacing-75);
+        margin: 0;
+        color: var(--swc-neutral-subdued-content-color-default);
+        font-size: var(--swc-font-size-75);
+        line-height: var(--swc-line-height-200);
+        --swc-icon-color: var(--swc-notice-visual-color);
+      }
+      .notice swc-icon-alert-triangle {
+        flex: none;
+        margin-block-start: var(--swc-spacing-50);
+      }
+      .add {
+        margin-block-start: var(--swc-spacing-200);
+        margin-inline-start: calc(-1 * var(--swc-spacing-100));
+      }
+      dialog.picker {
+        inline-size: min(520px, calc(100vw - 2 * var(--swc-spacing-300)));
+      }
+      .picker .head {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: var(--swc-spacing-200);
+        padding: var(--swc-spacing-400) var(--swc-spacing-300) var(--swc-spacing-200) var(--swc-spacing-500);
+      }
+      .picker h2 {
+        margin: 0;
+        font-size: var(--swc-heading-size-s);
+        overflow-wrap: anywhere;
+      }
+      .picker .find {
+        display: flex;
+        padding: var(--swc-spacing-100) var(--swc-spacing-500) var(--swc-spacing-200);
+      }
+      .picker .results {
+        block-size: min(400px, calc(100dvh - 280px));
+        overflow-y: auto;
+        overscroll-behavior: contain;
+        padding: var(--swc-spacing-75) var(--swc-spacing-400);
+        border-block: var(--swc-border-width-100) solid var(--swc-gray-200);
+      }
+      .options {
+        display: grid;
+        gap: var(--swc-spacing-50);
+      }
+      .option {
+        display: grid;
+        grid-template-columns: minmax(0, 1fr) max-content;
+        align-items: baseline;
+        gap: var(--swc-spacing-50) var(--swc-spacing-300);
+        padding: var(--swc-spacing-100) var(--swc-spacing-100);
+        border-radius: var(--swc-corner-radius-medium-default);
+        cursor: pointer;
+      }
+      .option:hover,
+      .option:focus {
+        background: var(--swc-gray-200);
+      }
+      .option:focus {
+        outline: none;
+      }
+      .option:focus-visible {
+        outline: var(--swc-focus-indicator-thickness) solid var(--swc-focus-indicator-color);
+        outline-offset: calc(-1 * var(--swc-focus-indicator-thickness));
+      }
+      .option[aria-disabled='true'] {
+        cursor: default;
+      }
+      .option[aria-disabled='true']:hover {
+        background: none;
+      }
+      .option .name {
+        font-weight: var(--swc-bold-font-weight);
+        overflow-wrap: anywhere;
+      }
+      .option[aria-disabled='true'] .name {
+        color: var(--swc-neutral-subdued-content-color-default);
+      }
+      .option .tag {
+        justify-self: end;
+        color: var(--swc-neutral-subdued-content-color-default);
+        font-size: var(--swc-font-size-75);
+      }
+      .added {
+        display: inline-flex;
+        align-items: center;
+        gap: var(--swc-spacing-50);
+      }
+      .option .description,
+      .option .notice {
+        grid-column: 1 / -1;
+      }
+      .option .description,
+      .lead,
+      .empty {
+        margin: 0;
+        color: var(--swc-neutral-subdued-content-color-default);
+      }
+      .empty {
+        padding: var(--swc-spacing-200) var(--swc-spacing-100);
+        overflow-wrap: anywhere;
+      }
+      .picker .end {
+        justify-content: flex-end;
+        padding: var(--swc-spacing-300) var(--swc-spacing-500) var(--swc-spacing-400);
+      }
+      .step {
+        display: grid;
+        gap: var(--swc-spacing-200);
+        padding: var(--swc-spacing-100) var(--swc-spacing-500) var(--swc-spacing-500);
+      }
+      .step .key.stacked {
+        max-width: none;
+      }
+      .step sp-textfield {
+        inline-size: 100%;
+      }
+      .step .buttons {
+        margin-block-start: var(--swc-spacing-200);
+      }
+      .get-key {
+        justify-self: start;
+        font-size: var(--swc-font-size-75);
+      }
       @container (max-width: 480px) {
         .page {
           padding-inline: var(--swc-spacing-300);
@@ -43060,7 +43363,8 @@ var SliccSettings = class extends ThemedElement {
         .state {
           grid-area: state;
         }
-        .account swc-button {
+        .account swc-button,
+        .account .actions {
           grid-area: action;
         }
         .key sp-textfield {
@@ -43080,6 +43384,7 @@ var SliccSettings = class extends ThemedElement {
       ...super.subscribe(model),
       model.settings.on("settings", settle2),
       model.settings.on("accounts", settle2),
+      model.settings.on("providers", update),
       ...model.vault ? [model.vault.on("status", update)] : []
     ];
   }
@@ -43126,6 +43431,7 @@ var SliccSettings = class extends ThemedElement {
     try {
       await (fields ? settings?.connect(id, secret, fields) : secret === void 0 ? settings?.connect(id) : settings?.connect(id, secret));
       if (this.entering === id) this.entering = null;
+      if (this.adding?.id === id && this.#added(id)?.status === "connected") this.#finish(id);
     } catch (error) {
       if (!this.#cancelled.has(id)) this.failure = { id, message: error.message };
     } finally {
@@ -43161,7 +43467,82 @@ var SliccSettings = class extends ThemedElement {
       this.#busy(id, false);
       return;
     }
-    await this.connect(id, void 0, fields);
+    await this.#connectBases(account, void 0, fields, vault);
+  }
+  #baseOf(value) {
+    const trimmed = value?.trim() ?? "";
+    try {
+      return new URL(trimmed).protocol === "https:" ? trimmed : void 0;
+    } catch {
+      return void 0;
+    }
+  }
+  #oldBase(account, field) {
+    return this.#baseOf(field.value) ?? this.#bases.get(`${account.id} ${field.name}`);
+  }
+  #baseChanges(account, fields) {
+    return (account.fields ?? []).filter((field) => field.customBase).map((field) => ({
+      field: field.name,
+      url: this.#baseOf(fields?.[field.name]),
+      old: this.#oldBase(account, field)
+    })).filter((change) => change.url !== change.old);
+  }
+  #modelChange(name, changes2, from, to) {
+    const entries = (key2) => changes2.flatMap((change) => change[key2] ? [{ name, url: change[key2] }] : []);
+    const remove2 = entries(from);
+    const add = entries(to);
+    if (!remove2.length && !add.length) return null;
+    return {
+      ...remove2.length ? { remove: { model: remove2 } } : {},
+      ...add.length ? { add: { model: add } } : {}
+    };
+  }
+  async #connectBases(account, secret, fields, vault = null) {
+    const model = this.model;
+    const live = vault?.endpoints ? vault : null;
+    const { id } = account;
+    const name = recordName(account);
+    const changes2 = this.#baseChanges(account, fields);
+    const forward = live ? this.#modelChange(name, changes2, "old", "url") : null;
+    if (forward) {
+      this.#busy(id, true);
+      try {
+        await live?.endpoints?.(forward);
+      } catch (error) {
+        this.#busy(id, false);
+        const field = changes2.find((change) => change.url) ?? changes2[0];
+        if (this.model === model) this.#refuse(id, field.field, failureText(error));
+        return;
+      }
+      if (this.model !== model) {
+        this.#busy(id, false);
+        return;
+      }
+    }
+    await this.connect(id, secret, fields);
+    if (this.failure?.id === id) {
+      this.#placeFailure(account, fields);
+      const back = forward ? this.#modelChange(name, changes2, "url", "old") : null;
+      if (back) await live?.endpoints?.(back).catch(() => {
+      });
+      return;
+    }
+    for (const change of changes2) {
+      const key2 = `${id} ${change.field}`;
+      if (change.url) this.#bases.set(key2, change.url);
+      else this.#bases.delete(key2);
+    }
+  }
+  #placeFailure(account, fields) {
+    const message = this.failure.message;
+    const field = (account.fields ?? []).find(
+      (candidate) => candidate.customBase && !!fields?.[candidate.name] && [candidate.name, candidate.label, "https", "url", "port", "userinfo"].some(
+        (word) => new RegExp(`\\b${word.replace(/[^a-z0-9 ]/gi, "\\$&")}\\b`, "i").test(message)
+      )
+    );
+    if (!field) return;
+    this.failure = null;
+    this.#refuse(account.id, field.name, message);
   }
   #refuse(id, field, message) {
     this.problem = { id, field, message };
@@ -43179,19 +43560,35 @@ var SliccSettings = class extends ThemedElement {
       const value = input.value.trim();
       if (value) values[field.name] = value;
       else if (field.required && field.options?.length !== 0) {
-        this.#refuse(account.id, field.name, `${field.label} can\u2019t be empty`);
+        this.#refuse(
+          account.id,
+          field.name,
+          field.options ? `Select a ${field.label.toLowerCase()}.` : `${field.label} can\u2019t be empty`
+        );
         return null;
       }
     }
     return values;
   }
+  #added(id) {
+    return this.model?.settings.accounts().find((account) => account.id === id);
+  }
+  #offered() {
+    return this.model?.settings.providers?.() ?? null;
+  }
   #start(account) {
     if (account.auth !== "api-key") {
       void this.connect(account.id);
       return;
     }
+    this.#enter(account);
+  }
+  #enter(account) {
     this.failure = null;
     this.problem = null;
+    this.filled = new Set(
+      (account.fields ?? []).filter((field) => field.options || field.value?.trim()).map((field) => field.name)
+    );
     this.entering = account.id;
     void this.updateComplete.then(() => this.focusOn(".key sp-textfield", ".key input"));
   }
@@ -43199,6 +43596,7 @@ var SliccSettings = class extends ThemedElement {
     event2.preventDefault();
     const form = event2.currentTarget;
     this.problem = null;
+    this.filled = new Set([...this.filled].filter((name) => name !== "value"));
     if (this.#vault(account)) {
       const value = take(form.querySelector("input[data-field=value]"));
       const fields2 = this.#fields(form, account);
@@ -43209,7 +43607,7 @@ var SliccSettings = class extends ThemedElement {
     const secret = field.value.trim();
     field.value = "";
     const fields = this.#fields(form, account);
-    if (secret && fields !== null) void this.connect(account.id, secret, fields);
+    if (secret && fields !== null) void this.#connectBases(account, secret, fields);
   }
   #submitOnEnter(event2) {
     const target2 = event2.target;
@@ -43220,7 +43618,7 @@ var SliccSettings = class extends ThemedElement {
   #send(event2) {
     event2.currentTarget.closest("form")?.requestSubmit();
   }
-  #enter(event2) {
+  #enterKey(event2) {
     if (event2.key === "Enter") this.#send(event2);
   }
   #cancel() {
@@ -43229,11 +43627,11 @@ var SliccSettings = class extends ThemedElement {
     this.failure = null;
     this.problem = null;
   }
-  #problem(account, field) {
+  #problem(account, field, icon = true) {
     const problem = this.problem;
     if (problem?.id !== account.id || problem.field !== field) return A;
     return b`<div class="problem" id="key-problem" role="alert">
-      <swc-icon-alert-triangle size="s" aria-hidden="true"></swc-icon-alert-triangle>
+      ${icon ? b`<swc-icon-alert-triangle size="s" aria-hidden="true"></swc-icon-alert-triangle>` : A}
       <span>${problem.message}</span>
     </div>`;
   }
@@ -43245,35 +43643,75 @@ var SliccSettings = class extends ThemedElement {
   }
   #extra(account) {
     return (account.fields ?? []).map(
-      (field) => b`<label class="field">
-          <span>${field.label}</span>${this.#control(account, field)}
-        </label>
-        ${this.#problem(account, field.name)}`
+      (field) => field.options ? b`<div class="field">
+              <sp-field-label for=${`field-${field.name}`} size="m">${field.label}</sp-field-label>${this.#control(account, field)}
+              ${field.options.length ? A : b`<p class="hint" data-empty=${field.name}>${nothingToChoose}</p>`}
+              ${field.help ? b`<p class="hint" id=${`help-${field.name}`}>${field.help}</p>` : A}
+              ${this.#problem(account, field.name, false)}
+            </div>` : b`<label class="field">
+              <span>${field.label}</span>${this.#control(account, field)}
+            </label>
+            ${field.help ? b`<p class="hint" id=${`help-${field.name}`}>${field.help}</p>` : A}
+            ${this.#problem(account, field.name)}`
     );
   }
+  #describedBy(account, field) {
+    const problem = this.#described(account, field.name);
+    const ids = [problem === A ? "" : problem, field.help ? `help-${field.name}` : ""];
+    return ids.filter(Boolean).join(" ") || A;
+  }
   #control(account, field) {
     if (field.options) {
-      const chosen = field.value ?? field.options[0]?.value;
-      return b`<select
+      const empty3 = !field.options.length;
+      const described = this.problem?.id === account.id && this.problem.field === field.name;
+      return b`<sp-picker
+          size="m"
           data-account-field=${field.name}
-          ?disabled=${!field.options.length}
+          label=${empty3 ? "None available" : field.label}
+          id=${`field-${field.name}`}
+          value=${start(field.options, field.value)}
+          ?disabled=${empty3}
+          ?invalid=${described}
           aria-required=${field.required ? "true" : A}
-          aria-invalid=${this.#invalid(account, field.name)}
-          aria-describedby=${this.#described(account, field.name)}
         >
-          ${field.options.map((option2) => b`<option value=${option2.value} ?selected=${option2.value === chosen}>${option2.label}</option>`)}
-        </select>`;
+          ${field.options.map((option2) => b`<sp-menu-item value=${option2.value}>${option2.label}</sp-menu-item>`)}
+          ${described || empty3 || field.help ? b`<span slot="description" class="sr">${described ? this.problem?.message : empty3 ? nothingToChoose : field.help}</span>` : A}
+        </sp-picker>`;
     }
     return b`<input
           type="text"
           autocomplete="off"
           spellcheck="false"
           data-account-field=${field.name}
+          value=${field.value ?? A}
+          placeholder=${field.placeholder ?? A}
           aria-required=${field.required ? "true" : A}
           aria-invalid=${this.#invalid(account, field.name)}
-          aria-describedby=${this.#described(account, field.name)}
+          aria-describedby=${this.#describedBy(account, field)}
         />`;
   }
+  #getKey(account) {
+    if (!account.keyUrl) return A;
+    return b`<a class="swc-Link get-key" href=${account.keyUrl} target="_blank" rel="noopener noreferrer" data-action="get-key">Get a key</a>`;
+  }
+  #leave(account) {
+    const adding = this.adding?.id === account.id;
+    return b`<swc-button size="m" variant="secondary" data-action=${adding ? "back" : "cancel"} @click=${() => adding ? this.#back() : this.#cancel()}>${adding ? "Back" : "Cancel"}</swc-button>`;
+  }
+  #saveLabel(account) {
+    return this.adding?.id === account.id ? "Connect" : "Save";
+  }
+  #ready(account) {
+    if (!this.#offered()) return true;
+    const required = (account.fields ?? []).filter((field) => field.required && !field.options);
+    return ["value", ...required.map((field) => field.name)].every((name) => this.filled.has(name));
+  }
+  #fill(event2) {
+    const input = event2.target;
+    const name = input.dataset.accountField ?? "value";
+    const rest = [...this.filled].filter((candidate) => candidate !== name);
+    this.filled = new Set(input.value.trim() ? [...rest, name] : rest);
+  }
   #unlock(vault) {
     return b`<div class="locked" data-locked>
       <span>Unlock the vault first</span>
@@ -43292,7 +43730,7 @@ var SliccSettings = class extends ThemedElement {
     const busy = this.pending.has(account.id);
     const locked = !!vault.status()?.locked;
     const name = secretNames[account.secret ?? "api-key"];
-    return b`<form class="key stacked" data-id=${account.id} data-store="vault" @submit=${(event2) => this.#submit(event2, account)} @keydown=${(event2) => this.#submitOnEnter(event2)}>
+    return b`<form class="key stacked" data-id=${account.id} data-store="vault" @submit=${(event2) => this.#submit(event2, account)} @keydown=${(event2) => this.#submitOnEnter(event2)} @input=${(event2) => this.#fill(event2)}>
         <label class="field"><span>${account.provider} ${name}</span><input
           type="password"
           autocomplete="off"
@@ -43303,11 +43741,12 @@ var SliccSettings = class extends ThemedElement {
           aria-describedby=${this.#described(account, "value")}
         /></label>
         ${this.#problem(account, "value")}
-        ${this.#extra(account)}
         ${locked ? this.#unlock(vault) : b`<p class="hint">Saved in the vault</p>`}
+        ${this.#getKey(account)}
+        ${this.#extra(account)}
         <div class="buttons">
-          <swc-button size="m" variant="accent" data-action="save" ?pending=${busy} ?disabled=${locked} @click=${(event2) => this.#send(event2)}>Save</swc-button>
-          <swc-button size="m" variant="secondary" data-action="cancel" @click=${() => this.#cancel()}>Cancel</swc-button>
+          <swc-button size="m" variant="accent" data-action="save" ?pending=${busy} ?disabled=${locked || !busy && !this.#ready(account)} @click=${(event2) => this.#send(event2)}>${this.#saveLabel(account)}</swc-button>
+          ${this.#leave(account)}
         </div>
       </form>`;
   }
@@ -43316,23 +43755,31 @@ var SliccSettings = class extends ThemedElement {
     const vault = this.#vault(account);
     if (vault) return this.#kept(account, vault);
     const busy = this.pending.has(account.id);
-    const extra = account.fields?.length;
-    return b`<form class=${extra ? "key stacked" : "key"} data-id=${account.id} @submit=${(event2) => this.#submit(event2, account)} @keydown=${(event2) => this.#submitOnEnter(event2)}>
-        <sp-textfield
+    const extra = account.fields?.length || account.keyUrl;
+    return b`<form class=${extra ? "key stacked" : "key"} data-id=${account.id} @submit=${(event2) => this.#submit(event2, account)} @keydown=${(event2) => this.#submitOnEnter(event2)} @input=${(event2) => this.#fill(event2)}>
+        ${extra ? b`<div class="field"><sp-field-label for="key-secret" size="m">${this.#secretLabel(account)}</sp-field-label>${this.#secret(account)}</div>` : this.#secret(account)}
+        ${this.#getKey(account)}
+        ${extra ? this.#extra(account) : A}
+        ${extra ? b`<div class="buttons">${this.#buttons(account, busy)}</div>` : this.#buttons(account, busy)}
+      </form>`;
+  }
+  #secretLabel(account) {
+    return `${account.provider} ${secretNames[account.secret ?? "api-key"]}`;
+  }
+  #secret(account) {
+    return b`<sp-textfield
           size="m"
           type="password"
           autocomplete="off"
-          label=${`${account.provider} ${secretNames[account.secret ?? "api-key"]}`}
+          id="key-secret"
+          label=${this.#secretLabel(account)}
           placeholder=${`Paste the ${secretNames[account.secret ?? "api-key"]}`}
-          @keydown=${(event2) => this.#enter(event2)}
-        ></sp-textfield>
-        ${extra ? this.#extra(account) : A}
-        ${extra ? b`<div class="buttons">${this.#buttons(busy)}</div>` : this.#buttons(busy)}
-      </form>`;
+          @keydown=${(event2) => this.#enterKey(event2)}
+        ></sp-textfield>`;
   }
-  #buttons(busy) {
-    return b`<swc-button size="m" variant="accent" data-action="save" ?pending=${busy} @click=${(event2) => this.#send(event2)}>Save</swc-button>
-        <swc-button size="m" variant="secondary" data-action="cancel" @click=${() => this.#cancel()}>Cancel</swc-button>`;
+  #buttons(account, busy) {
+    return b`<swc-button size="m" variant="accent" data-action="save" ?pending=${busy} ?disabled=${!busy && !this.#ready(account)} @click=${(event2) => this.#send(event2)}>${this.#saveLabel(account)}</swc-button>
+        ${this.#leave(account)}`;
   }
   #inVault(account) {
     const vault = this.model?.vault;
@@ -43384,7 +43831,8 @@ var SliccSettings = class extends ThemedElement {
   get busyReason() {
     const accounts = this.model?.settings.accounts() ?? [];
     if (accounts.some((account) => this.#signingIn(account))) return "signing in";
-    return this.entering === null ? null : "a key is being entered";
+    if (this.entering !== null) return "a key is being entered";
+    return this.picking ? "a provider is being added" : null;
   }
   #signingIn(account) {
     return account.status === "signing-in" || account.auth !== "api-key" && account.status !== "connected" && this.pending.has(account.id);
@@ -43441,10 +43889,266 @@ var SliccSettings = class extends ThemedElement {
       <span class="provider">${account.provider}</span>
       <span class="identity">${account.identity}${this.#inVault(account) ? b`<span class="kept" data-store="vault">${account.identity ? " \xB7 " : ""}${kept2(account)}</span>` : A}</span>
       <swc-status-light class="state" variant=${variant}>${label}</swc-status-light>
-      ${this.#action(account)}
+      ${this.#removable(account) ? b`<div class="actions">${this.#action(account)}${this.#removeButton(account)}</div>` : this.#action(account)}
     </div>
-    ${this.#key(account)}
-    ${failure2}`;
+    ${this.#offered() ? this.#rowNotes(account) : A}
+    ${this.adding?.id === account.id ? A : b`${this.#key(account)}${failure2}`}`;
+  }
+  #removable(account) {
+    return !!this.#offered() && !!this.model?.settings.remove && account.group !== "mcp";
+  }
+  #removeButton(account) {
+    const id = `remove-${account.id}`;
+    const label = `Remove ${account.provider}`;
+    return b`<swc-action-button
+        id=${id}
+        size="m"
+        quiet
+        data-action="remove-account"
+        accessible-label=${label}
+        ?disabled=${this.pending.has(account.id)}
+        @click=${() => this.#remove(account)}
+        ><swc-icon-delete slot="icon"></swc-icon-delete></swc-action-button
+      ><swc-tooltip for=${id} placement="top">${label}</swc-tooltip>`;
+  }
+  async #remove(account) {
+    const model = this.model;
+    const body4 = removeBodies[account.auth ?? ""] ?? "Its key is deleted from the vault. Models from it stop working.";
+    const title = `Remove ${account.provider}?`;
+    if (!await confirm({ title, body: body4, action: "Remove" })) return;
+    if (this.model !== model) return;
+    clearValues(this.renderRoot);
+    if (this.entering === account.id) this.entering = null;
+    const vault = model.vault;
+    const keyed = account.store === "vault" && account.auth === "api-key" && !!vault?.remove;
+    if (keyed && !await this.#forget(account, vault)) return;
+    if (this.model !== model) return;
+    this.#busy(account.id, true);
+    this.failure = null;
+    try {
+      await model.settings.remove?.(account.id);
+    } catch (error) {
+      if (this.model === model) this.failure = { id: account.id, message: failureText(error) };
+      return;
+    } finally {
+      this.#busy(account.id, false);
+    }
+    this.focusOn("[data-action=add-provider]");
+    for (const field of account.fields ?? []) this.#bases.delete(`${account.id} ${field.name}`);
+  }
+  #notice(needs, size4 = "long") {
+    if (needs !== "cors-free-transport") return A;
+    return b`<p class="notice" data-notice=${needs}><swc-icon-alert-triangle size="s" aria-hidden="true"></swc-icon-alert-triangle><span>${corsNotice[size4]}</span></p>`;
+  }
+  #signingNote(account) {
+    const key2 = `settings:${account.id}`;
+    if (account.auth !== "oauth" || !this.#signingIn(account)) {
+      this.#waits.done(key2);
+      return A;
+    }
+    return b`<p class="hint" role="status" data-signing>${signInText(this.#waits.waited(key2))}</p>`;
+  }
+  #rowNotes(account) {
+    const notice = this.#notice(account.needs);
+    const signing = this.adding?.id === account.id ? A : this.#signingNote(account);
+    if (notice === A && signing === A) return A;
+    return b`<div class="notes">${notice}${signing}</div>`;
+  }
+  #openPicker() {
+    this.query = "";
+    this.adding = null;
+    this.picking = true;
+  }
+  updated(changed) {
+    super.updated(changed);
+    const dialog = this.#dialog;
+    if (!changed.has("picking") || !dialog || dialog.open) return;
+    dialog.showModal();
+    const field = this.renderRoot.querySelector("sp-search");
+    void field.updateComplete.then(() => field.focus());
+  }
+  get #dialog() {
+    return this.renderRoot.querySelector("dialog.picker");
+  }
+  #closePicker() {
+    this.#dialog?.close();
+  }
+  #closed() {
+    const id = this.adding?.id;
+    if (id !== void 0 && this.entering === id) {
+      clearValues(this.renderRoot);
+      this.entering = null;
+      this.problem = null;
+    }
+    if (id !== void 0 && this.failure?.id === id) this.failure = null;
+    this.picking = false;
+    this.adding = null;
+    this.query = "";
+    const landing = this.#landing;
+    this.#landing = null;
+    void this.updateComplete.then(() => {
+      const root2 = this.renderRoot;
+      const row = landing ? root2.querySelector(`.account[data-id="${CSS.escape(landing)}"] swc-button`) : null;
+      (row ?? root2.querySelector("[data-action=add-provider]"))?.focus();
+    });
+  }
+  #finish(id) {
+    this.#landing = id;
+    this.#closePicker();
+  }
+  #choose(option2) {
+    if (this.#added(option2.id)) return;
+    this.adding = option2;
+    this.failure = null;
+    if (option2.auth === "api-key" || option2.auth === "fields") {
+      this.#enter(draft(option2));
+      return;
+    }
+    void this.updateComplete.then(
+      () => this.focusOn("[data-step] [data-action=sign-in]", "[data-step] [data-action=connect]")
+    );
+  }
+  #back() {
+    const id = this.adding.id;
+    clearValues(this.renderRoot);
+    if (this.entering === id) this.entering = null;
+    if (this.failure?.id === id) this.failure = null;
+    this.problem = null;
+    this.adding = null;
+    void this.updateComplete.then(
+      () => this.renderRoot.querySelector(`.option[data-provider="${CSS.escape(id)}"]`)?.focus()
+    );
+  }
+  #options() {
+    return [...this.renderRoot.querySelectorAll(".option")];
+  }
+  #pickerKey(event2) {
+    if (event2.key !== "Escape") return;
+    event2.preventDefault();
+    this.#closePicker();
+  }
+  #searchKey(event2) {
+    if (event2.key === "ArrowDown") {
+      event2.preventDefault();
+      this.#options()[0]?.focus();
+      return;
+    }
+    if (event2.key !== "Enter") return;
+    event2.preventDefault();
+    const first2 = matchProviders(this.#offered() ?? [], this.query).find(
+      (option2) => !this.#added(option2.id)
+    );
+    if (first2) this.#choose(first2);
+  }
+  #optionKey(event2, option2) {
+    const options = this.#options();
+    const at = options.indexOf(event2.currentTarget);
+    const moves = {
+      ArrowDown: Math.min(at + 1, options.length - 1),
+      ArrowUp: at - 1,
+      Home: 0,
+      End: options.length - 1
+    };
+    const typed3 = event2.key.length === 1 && !event2.ctrlKey && !event2.metaKey && !event2.altKey;
+    if (event2.key in moves) {
+      const to = moves[event2.key];
+      if (to < 0) this.focusOn("sp-search");
+      else options[to].focus();
+    } else if (event2.key === "Enter" || event2.key === " ") this.#choose(option2);
+    else if (typed3 || event2.key === "Backspace") {
+      this.query = typed3 ? this.query + event2.key : this.query.slice(0, -1);
+      this.focusOn("sp-search");
+    } else return;
+    event2.preventDefault();
+  }
+  #option(option2) {
+    const added = !!this.#added(option2.id);
+    return b`<div
+      class="option"
+      role="option"
+      tabindex="-1"
+      data-provider=${option2.id}
+      data-auth=${option2.auth}
+      aria-disabled=${added ? "true" : "false"}
+      @click=${() => this.#choose(option2)}
+      @keydown=${(event2) => this.#optionKey(event2, option2)}
+    >
+      <span class="name">${option2.name}</span>
+      <span class="tag">${added ? b`<span class="added" data-added><swc-icon-checkmark size="s" aria-hidden="true"></swc-icon-checkmark>Added</span>` : authHints[option2.auth]}</span>
+      ${option2.description ? b`<span class="description">${option2.description}</span>` : A}
+      ${this.#notice(option2.needs, "short")}
+    </div>`;
+  }
+  #pickStep(offered) {
+    const matches2 = matchProviders(offered, this.query);
+    return b`<div class="find">${search({
+      label: "Search providers",
+      value: this.query,
+      input: (value) => {
+        this.query = value;
+      },
+      keydown: (event2) => this.#searchKey(event2)
+    })}</div>
+      <div class="results">${matches2.length ? b`<div class="options" role="listbox" aria-label="Providers">${matches2.map((option2) => this.#option(option2))}</div>` : b`<p class="empty" role="status">No provider matches “${this.query.trim()}”.</p>`}</div>
+      <div class="buttons end">
+        <swc-button size="m" variant="secondary" data-action="close" @click=${() => this.#closePicker()}>Cancel</swc-button>
+      </div>`;
+  }
+  #signInStep(account) {
+    const signing = this.#signingIn(account);
+    const cancel = signing && !!this.model?.settings.cancel;
+    return b`<p class="hint">Sign in to ${account.provider} in a new window.</p>
+      ${signing ? this.#signingNote(account) : A}
+      <div class="buttons">
+        ${cancel ? b`<swc-button size="m" variant="secondary" data-action="cancel-sign-in" @click=${() => this.#stopSigningIn(account)}>Cancel</swc-button>` : A}
+        <swc-button size="m" variant="accent" data-action="sign-in" ?pending=${signing} @click=${() => this.connect(account.id)}>${signing ? "Signing in\u2026" : "Sign in"}</swc-button>
+        ${signing ? A : this.#leave(account)}
+      </div>`;
+  }
+  #localStep(account) {
+    return b`<p class="hint">SLICC connects to ${account.provider} on this device.</p>
+      <div class="buttons">
+        <swc-button size="m" variant="accent" data-action="connect" ?pending=${this.pending.has(account.id)} @click=${() => this.connect(account.id)}>Connect</swc-button>
+        ${this.#leave(account)}
+      </div>`;
+  }
+  #connectStep(option2) {
+    const account = this.#added(option2.id) ?? draft(option2);
+    const step = option2.auth === "oauth" ? this.#signInStep(account) : option2.auth === "local" ? this.#localStep(account) : this.#key(account);
+    return b`<div class="step" data-step=${option2.auth} data-provider=${option2.id}>
+      ${option2.description ? b`<p class="lead">${option2.description}</p>` : A}
+      ${this.#notice(option2.needs)}
+      ${step}
+      ${this.failure?.id === option2.id ? b`<div class="failure" role="alert"><swc-icon-alert-triangle size="s" aria-hidden="true"></swc-icon-alert-triangle><span>${this.failure.message}</span></div>` : A}
+    </div>`;
+  }
+  #picker(offered) {
+    if (!this.picking) return A;
+    const adding = this.adding;
+    return b`<dialog class="picker" aria-labelledby="picker-title" data-picker=${adding ? "connect" : "pick"} @keydown=${(event2) => this.#pickerKey(event2)} @close=${() => this.#closed()}>
+      <div class="head">
+        <h2 id="picker-title">${adding ? `Add ${adding.name}` : "Add a provider"}</h2>
+        <swc-close-button size="m" data-action="close" accessible-label="Close" @click=${() => this.#closePicker()}></swc-close-button>
+      </div>
+      ${adding ? this.#connectStep(adding) : this.#pickStep(offered)}
+    </dialog>`;
+  }
+  #providerList(accounts) {
+    const offered = this.#offered();
+    if (!offered)
+      return b`<div class="accounts">${accounts.map((account) => this.#account(account))}</div>`;
+    const sorted = [...accounts].sort((a23, b13) => listOrder[a23.status] - listOrder[b13.status]);
+    return b`<div class="accounts" data-group="providers">${c(
+      sorted,
+      (account) => account.id,
+      (account) => this.#account(account)
+    )}</div>
+      <div class="add">
+        <swc-action-button size="m" quiet data-action="add-provider" @click=${() => this.#openPicker()}>
+          <swc-icon-add slot="icon"></swc-icon-add>Add a provider
+        </swc-action-button>
+      </div>
+      ${this.#picker(offered)}`;
   }
   render() {
     const settings = this.model?.settings;
@@ -43500,7 +44204,7 @@ var SliccSettings = class extends ThemedElement {
       </div>
       </div>
       <h2 data-section="accounts">Accounts</h2>
-      <div class="accounts">${providers.map((account) => this.#account(account))}</div>
+      ${this.#providerList(providers)}
       ${servers.length ? b`<h2>MCP servers</h2>
               <div class="accounts" data-group="mcp">${servers.map((account) => this.#account(account))}</div>` : A}
       ${this.model?.vault ? b`<slicc-secrets .model=${this.model}></slicc-secrets>` : A}
@@ -43536,11 +44240,11 @@ function closure(found, source) {
   }
   return used;
 }
-function args(value, start) {
+function args(value, start2) {
   const parts2 = [];
   let depth = 0;
-  let from = start;
-  let at = start;
+  let from = start2;
+  let at = start2;
   for (; at < value.length; at++) {
     const char = value[at];
     if (char === "(") depth++;
@@ -52924,14 +53628,14 @@ function splitToken(token2, offsets) {
   return tokens;
 }
 function findFirstBreakpointAfter(breakpoints, offset3) {
-  let start = 0;
+  let start2 = 0;
   let end = breakpoints.length;
-  while (start < end) {
-    const middle = start + (end - start >> 1);
-    if (breakpoints[middle] <= offset3) start = middle + 1;
+  while (start2 < end) {
+    const middle = start2 + (end - start2 >> 1);
+    if (breakpoints[middle] <= offset3) start2 = middle + 1;
     else end = middle;
   }
-  return start;
+  return start2;
 }
 function splitTokens(tokens, breakpoints) {
   const sorted = [...breakpoints instanceof Set ? breakpoints : new Set(breakpoints)].sort((a23, b13) => a23 - b13);
@@ -52939,11 +53643,11 @@ function splitTokens(tokens, breakpoints) {
   return tokens.map((line) => {
     return line.flatMap((token2) => {
       const tokenEnd = token2.offset + token2.content.length;
-      const start = findFirstBreakpointAfter(sorted, token2.offset);
-      let end = start;
+      const start2 = findFirstBreakpointAfter(sorted, token2.offset);
+      let end = start2;
       while (end < sorted.length && sorted[end] < tokenEnd) end++;
-      if (start === end) return token2;
-      const breakpointsInToken = sorted.slice(start, end);
+      if (start2 === end) return token2;
+      const breakpointsInToken = sorted.slice(start2, end);
       for (let index = 0; index < breakpointsInToken.length; index++) breakpointsInToken[index] -= token2.offset;
       return splitToken(token2, breakpointsInToken);
     });
@@ -53049,17 +53753,17 @@ function transformerDecorations() {
       const ctx = getContext(this);
       const lines = [...codeEl.children].filter((i26) => i26.type === "element" && i26.tagName === "span");
       if (lines.length !== ctx.converter.lines.length) throw new ShikiError2(`Number of lines in code element (${lines.length}) does not match the number of lines in the source (${ctx.converter.lines.length}). Failed to apply decorations.`);
-      function applyLineSection(line, start, end, decoration) {
+      function applyLineSection(line, start2, end, decoration) {
         const lineEl = lines[line];
         let text2 = "";
         let startIndex = -1;
         let endIndex = -1;
-        if (start === 0) startIndex = 0;
+        if (start2 === 0) startIndex = 0;
         if (end === 0) endIndex = 0;
         if (end === Number.POSITIVE_INFINITY) endIndex = lineEl.children.length;
         if (startIndex === -1 || endIndex === -1) for (let i26 = 0; i26 < lineEl.children.length; i26++) {
           text2 += stringify3(lineEl.children[i26]);
-          if (startIndex === -1 && text2.length === start) startIndex = i26 + 1;
+          if (startIndex === -1 && text2.length === start2) startIndex = i26 + 1;
           if (endIndex === -1 && text2.length === end) endIndex = i26 + 1;
         }
         if (startIndex === -1) throw new ShikiError2(`Failed to find start index for decoration ${JSON.stringify(decoration.start)}`);
@@ -53097,11 +53801,11 @@ function transformerDecorations() {
       const lineApplies = [];
       const sorted = ctx.decorations.sort((a23, b13) => b13.start.offset - a23.start.offset || a23.end.offset - b13.end.offset);
       for (const decoration of sorted) {
-        const { start, end } = decoration;
-        if (start.line === end.line) applyLineSection(start.line, start.character, end.character, decoration);
-        else if (start.line < end.line) {
-          applyLineSection(start.line, start.character, Number.POSITIVE_INFINITY, decoration);
-          for (let i26 = start.line + 1; i26 < end.line; i26++) lineApplies.unshift(() => applyLine(i26, decoration));
+        const { start: start2, end } = decoration;
+        if (start2.line === end.line) applyLineSection(start2.line, start2.character, end.character, decoration);
+        else if (start2.line < end.line) {
+          applyLineSection(start2.line, start2.character, Number.POSITIVE_INFINITY, decoration);
+          for (let i26 = start2.line + 1; i26 < end.line; i26++) lineApplies.unshift(() => applyLine(i26, decoration));
           applyLineSection(end.line, 0, end.character, decoration);
         }
       }
@@ -55587,9 +56291,9 @@ var PosixClassMap = /* @__PURE__ */ new Map([
   ["word", r39`[\p{Alpha}\p{M}\p{Nd}\p{Pc}]`],
   ["xdigit", r39`\p{AHex}`]
 ]);
-function range(start, end) {
+function range(start2, end) {
   const range22 = [];
-  for (let i26 = start; i26 <= end; i26++) {
+  for (let i26 = start2; i26 <= end; i26++) {
     range22.push(i26);
   }
   return range22;
@@ -55598,8 +56302,8 @@ function titleEntry(codePoint) {
   const char = cp(codePoint);
   return [char.toLowerCase(), char];
 }
-function titleRange(start, end) {
-  return range(start, end).map((codePoint) => titleEntry(codePoint));
+function titleRange(start2, end) {
+  return range(start2, end).map((codePoint) => titleEntry(codePoint));
 }
 var UnicodePropertiesWithSpecificCase = /* @__PURE__ */ new Set([
   "Lower",
@@ -56829,15 +57533,15 @@ function getCharEscape(codePoint, { escDigit, inCharClass, useFlagV }) {
 function getCodePointRangesFromChars(chars) {
   const codePoints = chars.map((char) => char.codePointAt(0)).sort((a23, b13) => a23 - b13);
   const values = [];
-  let start = null;
+  let start2 = null;
   for (let i26 = 0; i26 < codePoints.length; i26++) {
     if (codePoints[i26 + 1] === codePoints[i26] + 1) {
-      start ??= codePoints[i26];
-    } else if (start === null) {
+      start2 ??= codePoints[i26];
+    } else if (start2 === null) {
       values.push(codePoints[i26]);
     } else {
-      values.push([start, codePoints[i26]]);
-      start = null;
+      values.push([start2, codePoints[i26]]);
+      start2 = null;
     }
   }
   return values;
@@ -58481,7 +59185,7 @@ var InteractionManager = class {
     return range3 == null ? void 0 : this.selectionEnds(range3);
   }
   selectionEnds(range3) {
-    const start = {
+    const start2 = {
       lineNumber: range3.start,
       side: range3.side
     };
@@ -58489,14 +59193,14 @@ var InteractionManager = class {
       lineNumber: range3.end,
       side: range3.endSide ?? range3.side
     };
-    const startIndex = this.selectionPointRowIndex(start);
+    const startIndex = this.selectionPointRowIndex(start2);
     const endIndex = this.selectionPointRowIndex(end);
     if (startIndex == null || endIndex == null) return;
     return startIndex > endIndex ? {
       top: end,
-      bottom: start
+      bottom: start2
     } : {
-      top: start,
+      top: start2,
       bottom: end
     };
   }
@@ -58814,9 +59518,9 @@ var InteractionManager = class {
   buildSelectedLineRange(anchor, current) {
     return this.buildSelectionRange(anchor.lineNumber, current.lineNumber, anchor.side, current.side);
   }
-  buildSelectionRange(start, end, side, endSide) {
+  buildSelectionRange(start2, end, side, endSide) {
     return {
-      start,
+      start: start2,
       end,
       ...side != null ? { side } : {},
       ...side !== endSide && endSide != null ? { endSide } : {}
@@ -60401,9 +61105,9 @@ function computeLineOffsets(contents) {
 function linesFromFileContents(contents) {
   const offsets = computeLineOffsets(contents);
   return Array.from({ length: offsets.length }, (_9, i26) => {
-    const start = offsets[i26];
+    const start2 = offsets[i26];
     const end = offsets[i26 + 1] ?? contents.length;
-    return contents.slice(start, end);
+    return contents.slice(start2, end);
   });
 }
 
@@ -62692,11 +63396,11 @@ function cloneFileDiffMetadata(fileDiff) {
 }
 
 // node_modules/@pierre/diffs/dist/utils/getHunkSideBoundaries.js
-function getHunkSideStartBoundary(start, count2) {
-  return start - (count2 === 0 ? 0 : 1);
+function getHunkSideStartBoundary(start2, count2) {
+  return start2 - (count2 === 0 ? 0 : 1);
 }
-function getHunkSideEndBoundary(start, count2) {
-  return getHunkSideStartBoundary(start, count2) + count2;
+function getHunkSideEndBoundary(start2, count2) {
+  return getHunkSideStartBoundary(start2, count2) + count2;
 }
 
 // node_modules/@pierre/diffs/dist/utils/composeCacheKey.js
@@ -64615,12 +65319,12 @@ function getNearestRenderableAdditionLine({ fileDiff, lineNumber, direction, exp
   }
   if (lineNumber >= modeledEnd) return lineNumber;
   if (direction === "down") {
-    for (const [start, end] of ranges) if (end > lineNumber) return Math.max(start, lineNumber);
+    for (const [start2, end] of ranges) if (end > lineNumber) return Math.max(start2, lineNumber);
     return;
   }
   for (let index = ranges.length - 1; index >= 0; index--) {
-    const [start, end] = ranges[index];
-    if (start <= lineNumber) return Math.min(end - 1, lineNumber);
+    const [start2, end] = ranges[index];
+    if (start2 <= lineNumber) return Math.min(end - 1, lineNumber);
   }
 }
 
@@ -64983,21 +65687,21 @@ function getContextLineIterationBounds(state2, count2, diffStyle) {
   if (!state2.isWindowedHighlight || count2 <= 0) return [0, count2];
   const ranges = [];
   function pushRange(currentCount) {
-    const start2 = Math.max(0, state2.viewportStart - currentCount);
+    const start3 = Math.max(0, state2.viewportStart - currentCount);
     const end2 = Math.min(count2, state2.viewportEnd - currentCount);
-    if (end2 > start2) ranges.push([start2, end2]);
+    if (end2 > start3) ranges.push([start3, end2]);
   }
   if (diffStyle !== "split") pushRange(state2.unifiedCount);
   if (diffStyle !== "unified") pushRange(state2.splitCount);
   if (ranges.length === 0) return [0, 0];
-  let start = ranges[0][0];
+  let start2 = ranges[0][0];
   let end = ranges[0][1];
   for (let index = 1; index < ranges.length; index++) {
     const range3 = ranges[index];
-    start = Math.min(start, range3[0]);
+    start2 = Math.min(start2, range3[0]);
     end = Math.max(end, range3[1]);
   }
-  return [start, end];
+  return [start2, end];
 }
 function walkContextLines(state2, count2, diffStyle, callback, onSkippedStart, shouldBreak) {
   const [startIndex, endIndex] = getContextLineIterationBounds(state2, count2, diffStyle);
@@ -65025,10 +65729,10 @@ function getChangeIterationRanges(state2, content, diffStyle) {
   const useSplit = diffStyle !== "unified";
   const iterationSpace = diffStyle === "unified" ? "unified" : "split";
   const iterationRanges = [];
-  function getVisibleRange(start, count2) {
-    if (start + count2 <= state2.viewportStart || start >= state2.viewportEnd) return;
-    const visibleStart = Math.max(0, state2.viewportStart - start);
-    const visibleEnd = Math.min(count2, state2.viewportEnd - start);
+  function getVisibleRange(start2, count2) {
+    if (start2 + count2 <= state2.viewportStart || start2 >= state2.viewportEnd) return;
+    const visibleStart = Math.max(0, state2.viewportStart - start2);
+    const visibleEnd = Math.min(count2, state2.viewportEnd - start2);
     return visibleEnd > visibleStart ? [visibleStart, visibleEnd] : void 0;
   }
   function mapRangeToIteration(range3, kind) {
@@ -65037,8 +65741,8 @@ function getChangeIterationRanges(state2, content, diffStyle) {
   }
   function pushRange(range3, kind) {
     if (range3 == null) return;
-    const [start, end] = mapRangeToIteration(range3, kind);
-    if (end > start) iterationRanges.push([start, end]);
+    const [start2, end] = mapRangeToIteration(range3, kind);
+    if (end > start2) iterationRanges.push([start2, end]);
   }
   if (useUnified) {
     pushRange(getVisibleRange(state2.unifiedCount, content.deletions), "deletions");
@@ -65051,10 +65755,10 @@ function getChangeIterationRanges(state2, content, diffStyle) {
   if (iterationRanges.length === 0) return iterationRanges;
   iterationRanges.sort((a23, b13) => a23[0] - b13[0]);
   const merged2 = [iterationRanges[0]];
-  for (const [start, end] of iterationRanges.slice(1)) {
+  for (const [start2, end] of iterationRanges.slice(1)) {
     const last = merged2[merged2.length - 1];
-    if (start <= last[1]) last[1] = Math.max(last[1], end);
-    else merged2.push([start, end]);
+    if (start2 <= last[1]) last[1] = Math.max(last[1], end);
+    else merged2.push([start2, end]);
   }
   return merged2;
 }
@@ -65638,17 +66342,17 @@ function normalizeEditorLines(lines) {
 }
 function findDivergenceCore(deletionLines, additionLines) {
   const maxStart = Math.min(deletionLines.length, additionLines.length);
-  let start = 0;
-  while (start < maxStart && deletionLines[start] === additionLines[start]) start++;
+  let start2 = 0;
+  while (start2 < maxStart && deletionLines[start2] === additionLines[start2]) start2++;
   let deletionEnd = deletionLines.length;
   let additionEnd = additionLines.length;
-  while (deletionEnd > start && additionEnd > start && deletionLines[deletionEnd - 1] === additionLines[additionEnd - 1]) {
+  while (deletionEnd > start2 && additionEnd > start2 && deletionLines[deletionEnd - 1] === additionLines[additionEnd - 1]) {
     deletionEnd--;
     additionEnd--;
   }
-  if (start === deletionEnd && start === additionEnd) return;
+  if (start2 === deletionEnd && start2 === additionEnd) return;
   return {
-    start,
+    start: start2,
     deletionEnd,
     additionEnd
   };
@@ -65686,8 +66390,8 @@ function applySessionChangedLines(diff, changedAdditionLineIndexes, parseDiffOpt
       hunkIndex++;
     }
     const hunk = hunks[hunkIndex];
-    const start = hunk == null ? void 0 : getHunkAdditionStart(hunk);
-    if (start == null || line < start || regionIndex != null && regionIndex !== hunkIndex) return rebuildSessionHunks(diff, parseDiffOptions, getPreviousAdditionLine);
+    const start2 = hunk == null ? void 0 : getHunkAdditionStart(hunk);
+    if (start2 == null || line < start2 || regionIndex != null && regionIndex !== hunkIndex) return rebuildSessionHunks(diff, parseDiffOptions, getPreviousAdditionLine);
     regionIndex = hunkIndex;
   }
   if (regionIndex == null) return;
@@ -65783,10 +66487,10 @@ function rebuildExpansionFromAnchors(diff, anchors) {
     if (gapEnd <= gapStart) return;
     let fromStart = 0;
     let fromEnd = 0;
-    for (const [start, end] of anchors) {
-      if (end <= gapStart || start >= gapEnd) continue;
-      if (start <= gapStart) fromStart = Math.max(fromStart, Math.min(end, gapEnd) - gapStart);
-      if (end >= gapEnd) fromEnd = Math.max(fromEnd, gapEnd - Math.max(start, gapStart));
+    for (const [start2, end] of anchors) {
+      if (end <= gapStart || start2 >= gapEnd) continue;
+      if (start2 <= gapStart) fromStart = Math.max(fromStart, Math.min(end, gapEnd) - gapStart);
+      if (end >= gapEnd) fromEnd = Math.max(fromEnd, gapEnd - Math.max(start2, gapStart));
     }
     if (fromStart > 0 || fromEnd > 0) rebuilt.set(key2, {
       fromStart,
@@ -70757,7 +71461,7 @@ var Splitview = class {
         for (const item2 of this.viewItems) item2.enabled = false;
         const doc = (_sash$ownerDocument = sash.ownerDocument) !== null && _sash$ownerDocument !== void 0 ? _sash$ownerDocument : document;
         const iframes = disableIframePointEvents(doc);
-        const start = this._orientation === "HORIZONTAL" ? event2.clientX : event2.clientY;
+        const start2 = this._orientation === "HORIZONTAL" ? event2.clientX : event2.clientY;
         const sashIndex = firstIndex(this.sashes, (s19) => s19.container === sash);
         const sizes = this.viewItems.map((x7) => x7.size);
         let snapBefore;
@@ -70791,7 +71495,7 @@ var Splitview = class {
           };
         }
         const onPointerMove = (event3) => {
-          const delta = (this._orientation === "HORIZONTAL" ? event3.clientX : event3.clientY) - start;
+          const delta = (this._orientation === "HORIZONTAL" ? event3.clientX : event3.clientY) - start2;
           this.resize(sashIndex, delta, sizes, void 0, void 0, minDelta, maxDelta, snapBefore, snapAfter);
           this.distributeEmptySpace();
           this.layoutViews();
@@ -75389,11 +76093,11 @@ var BaseTabGroupIndicator = class {
   */
   trackUnderlines() {
     if (this._rafId !== null) cancelAnimationFrame(this._rafId);
-    const start = performance.now();
+    const start2 = performance.now();
     const duration = 250;
     const tick = () => {
       this._positionUnderlinesSync();
-      if (performance.now() - start < duration) this._rafId = requestAnimationFrame(tick);
+      if (performance.now() - start2 < duration) this._rafId = requestAnimationFrame(tick);
       else this._rafId = null;
     };
     this._rafId = requestAnimationFrame(tick);
@@ -77658,12 +78362,12 @@ var Tabs = class extends CompositeDisposable {
   _scrollTabIntoView(element2, isVertical) {
     const parentElement = element2.parentElement;
     if (!parentElement) return;
-    const start = isVertical ? element2.offsetTop : element2.offsetLeft;
+    const start2 = isVertical ? element2.offsetTop : element2.offsetLeft;
     const size4 = isVertical ? element2.offsetHeight : element2.offsetWidth;
     const scrollStart = isVertical ? parentElement.scrollTop : parentElement.scrollLeft;
     const clientSize = isVertical ? parentElement.clientHeight : parentElement.clientWidth;
-    if (start < scrollStart || start + size4 > scrollStart + clientSize) if (isVertical) parentElement.scrollTop = start;
-    else parentElement.scrollLeft = start;
+    if (start2 < scrollStart || start2 + size4 > scrollStart + clientSize) if (isVertical) parentElement.scrollTop = start2;
+    else parentElement.scrollLeft = start2;
   }
   /**
   * Activate a tab in response to a plain (non-shift) left pointerdown.