@youtyan/code-viewer 0.11.1 → 0.12.0

package/web/app.js

@@ -5,6 +5,311 @@
       __defProp(target, name, { get: all[name], enumerable: true });
   };
 
+  // web-src/core/terminal-paste.ts
+  var PASTE_IMAGE_TYPES = {
+    "image/png": "png",
+    "image/jpeg": "jpg",
+    "image/gif": "gif",
+    "image/webp": "webp"
+  };
+  var MAX_PASTE_IMAGE_BYTES = 8 * 1024 * 1024;
+  var MAX_PASTE_BODY_BYTES = Math.ceil(MAX_PASTE_IMAGE_BYTES * 1.4);
+  var SHIFT_ENTER_SEQUENCE = `${String.fromCharCode(27)}[200~${String.fromCharCode(10)}${String.fromCharCode(27)}[201~`;
+  function isShiftEnter(event) {
+    return event.key === "Enter" && event.shiftKey && !event.ctrlKey && !event.metaKey && !event.altKey;
+  }
+
+  // web-src/core/terminal-images.ts
+  var TERMINAL_IMAGE_EXTENSIONS = [
+    ...new Set(Object.values(PASTE_IMAGE_TYPES)),
+    "jpeg"
+  ];
+  var MAX_TERMINAL_IMAGE_PATHS = 64;
+  var MAX_TERMINAL_IMAGE_QUERY = 16;
+  var MAX_IMAGE_PATH_LENGTH = 1024;
+  var ESC = String.fromCharCode(27);
+  var BEL = String.fromCharCode(7);
+  var ANSI_RE = new RegExp(
+    `${ESC}\\[[0-9;?]*[ -/]*[@-~]|${ESC}\\][^${BEL}${ESC}]*(?:${BEL}|${ESC}\\\\)|${ESC}[@-Z\\\\-_]`,
+    "g"
+  );
+  function stripAnsi(text3) {
+    return text3.replace(ANSI_RE, "");
+  }
+  var PATH_CHAR = "[\\p{L}\\p{N}._~+@%/-]";
+  var NAME_CHAR = "[\\p{L}\\p{N}_~+@%-]";
+  var IMAGE_PATH_RE = new RegExp(
+    `${PATH_CHAR}*${NAME_CHAR}\\.(?:${TERMINAL_IMAGE_EXTENSIONS.join("|")})(?![\\p{L}\\p{N}])`,
+    "giu"
+  );
+  function looksLikeUrl(value) {
+    return value.startsWith("//") || value.includes("://");
+  }
+  function findImagePaths(text3, limit = MAX_TERMINAL_IMAGE_PATHS) {
+    const found = [];
+    const seen = /* @__PURE__ */ new Set();
+    for (const match2 of text3.matchAll(IMAGE_PATH_RE)) {
+      const path = match2[0];
+      if (path.length > MAX_IMAGE_PATH_LENGTH) continue;
+      if (looksLikeUrl(path)) continue;
+      if (seen.has(path)) continue;
+      seen.add(path);
+      found.push(path);
+      if (found.length >= limit) break;
+    }
+    return found;
+  }
+  function joinWrappedLines(text3, width) {
+    if (!Number.isFinite(width) || width <= 0) return text3;
+    const lines = text3.split("\n");
+    const joined = [];
+    let current = null;
+    let previousLength = 0;
+    for (const line of lines) {
+      if (current === null) {
+        current = line;
+      } else if (previousLength >= width) {
+        current += line;
+      } else {
+        joined.push(current);
+        current = line;
+      }
+      previousLength = line.length;
+    }
+    if (current !== null) joined.push(current);
+    return joined.join("\n");
+  }
+  function joinBrokenPathLines(text3) {
+    const lines = text3.split("\n");
+    const candidates = [];
+    for (let i2 = 0; i2 + 1 < lines.length; i2 += 1) {
+      const head = lastPathFragment(lines[i2] ?? "");
+      const tail = firstWord(lines[i2 + 1] ?? "");
+      if (!head || !tail) continue;
+      candidates.push(head.text + tail);
+    }
+    return candidates.join("\n");
+  }
+  function lastPathFragment(line) {
+    let found = null;
+    const words = /\S+/g;
+    for (const match2 of line.matchAll(words)) {
+      if (match2[0].includes("/")) {
+        found = { text: match2[0], index: match2.index ?? 0 };
+      }
+    }
+    return found;
+  }
+  function firstWord(line) {
+    return /\S+/.exec(line)?.[0] ?? "";
+  }
+  function findImagePathsInText(plain, width = 0, limit = MAX_TERMINAL_IMAGE_PATHS) {
+    const merged = [];
+    const seen = /* @__PURE__ */ new Set();
+    const sources = [
+      plain,
+      width > 0 ? joinWrappedLines(plain, width) : "",
+      joinBrokenPathLines(plain)
+    ];
+    for (const source of sources) {
+      if (!source) continue;
+      for (const path of findImagePaths(source, limit)) {
+        if (seen.has(path)) continue;
+        seen.add(path);
+        merged.push(path);
+        if (merged.length >= limit) return merged;
+      }
+    }
+    return merged;
+  }
+  function findPathAnchors(lines, candidates) {
+    const anchors = [];
+    for (const candidate of candidates) {
+      if (!candidate) continue;
+      const anchor = firstAnchor(lines, candidate);
+      if (anchor) anchors.push(anchor);
+    }
+    return anchors;
+  }
+  function firstAnchor(lines, candidate) {
+    for (let row = 0; row < lines.length; row += 1) {
+      const line = lines[row] ?? "";
+      const direct = line.indexOf(candidate);
+      if (direct >= 0) return { candidate, row, col: direct, span: 1 };
+      const head = lastPathFragment(line);
+      if (!head) continue;
+      const tail = firstWord(lines[row + 1] ?? "");
+      if (tail && head.text + tail === candidate) {
+        return { candidate, row, col: head.index, span: 2 };
+      }
+    }
+    return null;
+  }
+
+  // web-src/core/agent-screen.ts
+  var AGENT_SCREEN_RULE_SET_VERSION = 1;
+  var ESC2 = String.fromCharCode(27);
+  var BEL2 = String.fromCharCode(7);
+  var OSC_TITLE_RE = new RegExp(
+    `${ESC2}\\](?:0|2);([^${BEL2}${ESC2}]*)(?:${BEL2}|${ESC2}\\\\)`,
+    "g"
+  );
+  var BLOCKING_HINTS = [
+    { contains: ["enter to confirm"] },
+    { contains: ["enter to select"] },
+    { contains: ["enter to submit"] },
+    { contains: ["allow command?"] },
+    { contains: ["[y/n]"] },
+    { contains: ["yes (y)"] },
+    { contains: ["do you want to proceed?"] }
+  ];
+  var DEFAULT_AGENT_SCREEN_RULES = {
+    version: AGENT_SCREEN_RULE_SET_VERSION,
+    rules: [
+      {
+        id: "title_requires_input",
+        state: "waiting",
+        priority: 1100,
+        region: "osc_title",
+        contains: ["action required"]
+      },
+      {
+        id: "title_spinner",
+        state: "working",
+        priority: 1050,
+        region: "osc_title",
+        regex: ["^[⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏]"]
+      },
+      {
+        id: "transcript_view",
+        state: "skip",
+        priority: 1e3,
+        region: "bottom_non_empty",
+        lines: 8,
+        any: [
+          { contains: ["showing detailed transcript"] },
+          { contains: ["pgup/pgdn", "home/end to jump", "q to quit"] }
+        ]
+      },
+      {
+        id: "interactive_form",
+        state: "waiting",
+        priority: 980,
+        region: "bottom_non_empty",
+        lines: 14,
+        contains: ["esc to cancel"],
+        any: [
+          { contains: ["enter to confirm"] },
+          { contains: ["enter to select"] },
+          { contains: ["enter to submit"] }
+        ]
+      },
+      {
+        id: "live_reasoning",
+        state: "working",
+        priority: 970,
+        region: "bottom_non_empty",
+        lines: 8,
+        contains: ["tokens", "thinking"],
+        any: [{ lineRegex: ["^\\s*[✢✻✽✶✳]"] }, { lineRegex: ["(?i)^\\s*·"] }]
+      },
+      {
+        id: "prompt_box",
+        state: "idle",
+        priority: 950,
+        region: "bottom_non_empty",
+        lines: 8,
+        lineRegex: ["^\\s*❯"],
+        not: [
+          ...BLOCKING_HINTS,
+          { contains: ["esc to cancel"] },
+          { contains: ["arrow keys"] },
+          { contains: ["↑/↓ to navigate"] }
+        ]
+      },
+      {
+        id: "strong_input_request",
+        state: "waiting",
+        priority: 900,
+        region: "bottom_non_empty",
+        lines: 12,
+        any: [
+          { contains: ["press enter to confirm or esc to cancel"] },
+          { contains: ["enter to submit answer"] },
+          { contains: ["enter to submit all"] },
+          { contains: ["allow command?"] }
+        ]
+      },
+      {
+        id: "permission_request",
+        state: "waiting",
+        priority: 850,
+        region: "bottom_non_empty",
+        lines: 14,
+        contains: ["do you want to proceed?"],
+        any: [
+          { lineRegex: ["(?i)^\\P{L}*yes\\b"] },
+          { lineRegex: ["(?i)^\\P{L}*no\\b"] }
+        ]
+      },
+      {
+        id: "weak_input_request",
+        state: "waiting",
+        priority: 600,
+        region: "bottom_non_empty",
+        lines: 8,
+        any: [
+          { contains: ["[y/n]"] },
+          { contains: ["yes (y)"] },
+          {
+            any: [
+              { contains: ["do you want to"] },
+              { contains: ["would you like to"] }
+            ],
+            all: [{ any: [{ contains: ["yes"] }, { contains: ["❯"] }] }]
+          }
+        ]
+      },
+      {
+        id: "live_working_status",
+        state: "working",
+        priority: 500,
+        region: "bottom_non_empty",
+        lines: 3,
+        lineRegex: ["^[•◦]\\s+Working"],
+        not: [{ contains: ["conversation interrupted"] }]
+      },
+      {
+        id: "last_prompt",
+        state: "idle",
+        priority: 400,
+        region: "last_non_empty",
+        lineRegex: ["^\\s*[›❯]"],
+        not: BLOCKING_HINTS
+      }
+    ]
+  };
+  var MATCHER_KEYS = /* @__PURE__ */ new Set([
+    "contains",
+    "regex",
+    "lineRegex",
+    "all",
+    "any",
+    "not"
+  ]);
+  var RULE_KEYS = /* @__PURE__ */ new Set([
+    ...MATCHER_KEYS,
+    "id",
+    "state",
+    "priority",
+    "region",
+    "lines"
+  ]);
+  function formatAgentScreenRuleSet(rules) {
+    return `${JSON.stringify(rules, null, 2)}
+`;
+  }
+
   // web-src/core/diff-file-kinds.ts
   var HEAVY_SIZE_CLASSES = /* @__PURE__ */ new Set(["medium", "large", "huge"]);
   function classifyDiffFileKind(file) {
@@ -277,6 +582,191 @@ ${lines.join("\n")}
     };
   }
 
+  // web-src/core/error-detail.ts
+  function errorWithCause(message, cause) {
+    return Object.assign(new Error(message), { cause });
+  }
+  function errorWithCauses(message, errors2) {
+    return Object.assign(new Error(message), { errors: [...errors2] });
+  }
+  var OMIT_VALUE = /* @__PURE__ */ Symbol("omit-sensitive-error-field");
+  function isSensitiveFieldName(key) {
+    const normalized = key.toLowerCase().replace(/[^a-z0-9]/g, "");
+    return normalized === "auth" || normalized.endsWith("auth") || normalized.startsWith("auth") && !normalized.startsWith("author") || normalized.includes("authorization") || normalized.includes("cookie") || normalized.includes("token") || normalized.includes("password") || normalized.includes("passwd") || normalized.includes("secret") || normalized.includes("credential") || normalized.includes("apikey") || normalized.includes("privatekey");
+  }
+  function errorName(error2) {
+    try {
+      return typeof error2.name === "string" ? error2.name : "Error";
+    } catch {
+      return "Error";
+    }
+  }
+  function errorMessage(error2) {
+    try {
+      return typeof error2.message === "string" ? error2.message : "unable to read error message";
+    } catch {
+      return "unable to read error message";
+    }
+  }
+  function sanitizeObjectFields(value, ancestors, excludedKeys = /* @__PURE__ */ new Set()) {
+    let keys;
+    try {
+      keys = Object.getOwnPropertyNames(value);
+    } catch {
+      return { value: "[Unserializable object]", removedSensitive: false };
+    }
+    const output = /* @__PURE__ */ Object.create(null);
+    let removedSensitive = false;
+    for (const key of keys) {
+      if (excludedKeys.has(key)) continue;
+      if (isSensitiveFieldName(key)) {
+        removedSensitive = true;
+        continue;
+      }
+      let descriptor;
+      try {
+        descriptor = Object.getOwnPropertyDescriptor(value, key);
+      } catch {
+        output[key] = "[Unserializable field]";
+        continue;
+      }
+      if (!descriptor) continue;
+      if (!("value" in descriptor)) {
+        output[key] = "[Accessor]";
+        continue;
+      }
+      const sanitized = sanitizeValue(descriptor.value, ancestors);
+      if (sanitized === OMIT_VALUE) {
+        removedSensitive = true;
+        continue;
+      }
+      output[key] = sanitized.value;
+      removedSensitive ||= sanitized.removedSensitive;
+    }
+    if (Object.keys(output).length === 0 && removedSensitive) return OMIT_VALUE;
+    return { value: output, removedSensitive };
+  }
+  function sanitizeError(error2, ancestors) {
+    const output = /* @__PURE__ */ Object.create(null);
+    output.name = errorName(error2);
+    output.message = errorMessage(error2);
+    const fields = sanitizeObjectFields(
+      error2,
+      ancestors,
+      /* @__PURE__ */ new Set(["name", "message", "stack"])
+    );
+    if (fields !== OMIT_VALUE) Object.assign(output, fields.value);
+    return {
+      value: output,
+      removedSensitive: fields === OMIT_VALUE ? true : fields.removedSensitive
+    };
+  }
+  function sanitizeValue(value, ancestors) {
+    if (value === null || typeof value === "string" || typeof value === "boolean")
+      return { value, removedSensitive: false };
+    if (typeof value === "number") {
+      return {
+        value: Number.isFinite(value) ? value : String(value),
+        removedSensitive: false
+      };
+    }
+    if (typeof value === "bigint") {
+      return { value: `${value}n`, removedSensitive: false };
+    }
+    if (typeof value === "undefined") {
+      return { value: "[undefined]", removedSensitive: false };
+    }
+    if (typeof value === "symbol") {
+      return { value: "[symbol]", removedSensitive: false };
+    }
+    if (typeof value === "function") {
+      return { value: "[function]", removedSensitive: false };
+    }
+    const objectValue = value;
+    if (ancestors.has(objectValue)) {
+      return { value: "[Circular]", removedSensitive: false };
+    }
+    ancestors.add(objectValue);
+    try {
+      if (Array.isArray(objectValue)) {
+        const output = [];
+        let removedSensitive = false;
+        for (const item of objectValue) {
+          const sanitized = sanitizeValue(item, ancestors);
+          if (sanitized === OMIT_VALUE) {
+            removedSensitive = true;
+            continue;
+          }
+          output.push(sanitized.value);
+          removedSensitive ||= sanitized.removedSensitive;
+        }
+        if (output.length === 0 && removedSensitive) return OMIT_VALUE;
+        return { value: output, removedSensitive };
+      }
+      if (objectValue instanceof Error)
+        return sanitizeError(objectValue, ancestors);
+      return sanitizeObjectFields(objectValue, ancestors);
+    } catch {
+      return { value: "[Unserializable object]", removedSensitive: false };
+    } finally {
+      ancestors.delete(objectValue);
+    }
+  }
+  function formatNonError(value) {
+    if (typeof value === "string") return value;
+    try {
+      const sanitized = sanitizeValue(value, /* @__PURE__ */ new Set());
+      const serializable = sanitized === OMIT_VALUE ? {} : sanitized.value;
+      return JSON.stringify(serializable);
+    } catch {
+      return "[Unserializable value]";
+    }
+  }
+  function formatErrorFields(error2) {
+    const fields = sanitizeObjectFields(
+      error2,
+      /* @__PURE__ */ new Set([error2]),
+      /* @__PURE__ */ new Set(["name", "message", "stack", "cause"])
+    );
+    if (fields === OMIT_VALUE) return "";
+    const output = fields.value;
+    return Object.keys(output).length > 0 ? `
+Details: ${JSON.stringify(output)}` : "";
+  }
+  function formatErrorDetail(error2) {
+    const parts = [];
+    const seen = /* @__PURE__ */ new Set();
+    let current = error2;
+    while (current instanceof Error && !seen.has(current)) {
+      seen.add(current);
+      parts.push(
+        `${errorName(current)}: ${errorMessage(current)}${formatErrorFields(current)}`
+      );
+      try {
+        current = current.cause;
+      } catch {
+        current = "[Unserializable error cause]";
+      }
+    }
+    if (current !== void 0) {
+      parts.push(
+        seen.has(current) ? "Error cause cycle detected" : formatNonError(current)
+      );
+    }
+    return parts.join("\nCaused by: ") || formatNonError(error2);
+  }
+  async function responseErrorMessage(response, operation) {
+    const statusText = response.statusText ? ` ${response.statusText}` : "";
+    const prefix = `${operation} (HTTP ${response.status}${statusText})`;
+    let body;
+    try {
+      body = await response.text();
+    } catch (error2) {
+      throw errorWithCause(`${prefix}: failed to read response body`, error2);
+    }
+    return body ? `${prefix}: ${body}` : prefix;
+  }
+
   // web-src/core/expand-logic.ts
   function initExpandState(prevHunkEndNew, hunkNewStart) {
     return {
@@ -8381,6 +8871,22 @@ ${lines.join("\n")}
     md.core.ruler.after("inline", "footnote_tail", footnote_tail);
   }
 
+  // web-src/core/lazy-bundle.ts
+  function createBundleLoader(bundleFile, init) {
+    let pending = null;
+    return () => {
+      if (!pending) {
+        pending = import(
+          /* @vite-ignore */
+          `/${bundleFile}`
+        ).then(
+          (mod) => init ? init(mod) : mod
+        );
+      }
+      return pending;
+    };
+  }
+
   // web-src/core/mermaid-loader.ts
   var DEFAULT_CONFIG = {
     startOnLoad: false,
@@ -8388,18 +8894,19 @@ ${lines.join("\n")}
     theme: "default",
     er: { useMaxWidth: false }
   };
+  var loadMermaidModule = createBundleLoader("mermaid.js");
   var mermaidPromise = null;
   var initialized = false;
   function loadMermaid() {
     if (!mermaidPromise) {
-      mermaidPromise = import(`/${"mermaid.js"}`).then((mod) => {
+      mermaidPromise = loadMermaidModule().then((mod) => {
         const mermaid = mod.default;
         if (!initialized) {
           mermaid.initialize(DEFAULT_CONFIG);
           initialized = true;
         }
         return mermaid;
-      }).catch(() => null);
+      });
     }
     return mermaidPromise;
   }
@@ -8417,20 +8924,23 @@ ${lines.join("\n")}
     const pre = template.content.querySelector("pre");
     return pre ? pre.innerHTML : "";
   }
+  var loadShikiModule = createBundleLoader("shiki.js");
   var cache = /* @__PURE__ */ new Map();
   function loadShikiHighlighter(options) {
     const key = JSON.stringify({
       themes: [...options.themes].sort(),
-      langs: [...options.langs].sort()
+      langs: [...options.langs].sort(),
+      failureMode: options.failureMode ?? "fallback"
     });
     const cached = cache.get(key);
     if (cached) return cached;
-    const promise = import(`/${"shiki.js"}`).then(
+    const load = loadShikiModule().then(
       (mod) => mod.createHighlighter({
         themes: options.themes,
         langs: options.langs
       })
-    ).catch(() => null);
+    );
+    const promise = options.failureMode === "throw" ? load : load.catch(() => null);
     cache.set(key, promise);
     return promise;
   }
@@ -11305,188 +11815,6 @@ ${frontmatter.yaml}
     return inferred;
   }
 
-  // web-src/core/error-detail.ts
-  function errorWithCause(message, cause) {
-    return Object.assign(new Error(message), { cause });
-  }
-  var OMIT_VALUE = /* @__PURE__ */ Symbol("omit-sensitive-error-field");
-  function isSensitiveFieldName(key) {
-    const normalized = key.toLowerCase().replace(/[^a-z0-9]/g, "");
-    return normalized === "auth" || normalized.endsWith("auth") || normalized.startsWith("auth") && !normalized.startsWith("author") || normalized.includes("authorization") || normalized.includes("cookie") || normalized.includes("token") || normalized.includes("password") || normalized.includes("passwd") || normalized.includes("secret") || normalized.includes("credential") || normalized.includes("apikey") || normalized.includes("privatekey");
-  }
-  function errorName(error2) {
-    try {
-      return typeof error2.name === "string" ? error2.name : "Error";
-    } catch {
-      return "Error";
-    }
-  }
-  function errorMessage(error2) {
-    try {
-      return typeof error2.message === "string" ? error2.message : "unable to read error message";
-    } catch {
-      return "unable to read error message";
-    }
-  }
-  function sanitizeObjectFields(value, ancestors, excludedKeys = /* @__PURE__ */ new Set()) {
-    let keys;
-    try {
-      keys = Object.getOwnPropertyNames(value);
-    } catch {
-      return { value: "[Unserializable object]", removedSensitive: false };
-    }
-    const output = /* @__PURE__ */ Object.create(null);
-    let removedSensitive = false;
-    for (const key of keys) {
-      if (excludedKeys.has(key)) continue;
-      if (isSensitiveFieldName(key)) {
-        removedSensitive = true;
-        continue;
-      }
-      let descriptor;
-      try {
-        descriptor = Object.getOwnPropertyDescriptor(value, key);
-      } catch {
-        output[key] = "[Unserializable field]";
-        continue;
-      }
-      if (!descriptor) continue;
-      if (!("value" in descriptor)) {
-        output[key] = "[Accessor]";
-        continue;
-      }
-      const sanitized = sanitizeValue(descriptor.value, ancestors);
-      if (sanitized === OMIT_VALUE) {
-        removedSensitive = true;
-        continue;
-      }
-      output[key] = sanitized.value;
-      removedSensitive ||= sanitized.removedSensitive;
-    }
-    if (Object.keys(output).length === 0 && removedSensitive) return OMIT_VALUE;
-    return { value: output, removedSensitive };
-  }
-  function sanitizeError(error2, ancestors) {
-    const output = /* @__PURE__ */ Object.create(null);
-    output.name = errorName(error2);
-    output.message = errorMessage(error2);
-    const fields = sanitizeObjectFields(
-      error2,
-      ancestors,
-      /* @__PURE__ */ new Set(["name", "message", "stack"])
-    );
-    if (fields !== OMIT_VALUE) Object.assign(output, fields.value);
-    return {
-      value: output,
-      removedSensitive: fields === OMIT_VALUE ? true : fields.removedSensitive
-    };
-  }
-  function sanitizeValue(value, ancestors) {
-    if (value === null || typeof value === "string" || typeof value === "boolean")
-      return { value, removedSensitive: false };
-    if (typeof value === "number") {
-      return {
-        value: Number.isFinite(value) ? value : String(value),
-        removedSensitive: false
-      };
-    }
-    if (typeof value === "bigint") {
-      return { value: `${value}n`, removedSensitive: false };
-    }
-    if (typeof value === "undefined") {
-      return { value: "[undefined]", removedSensitive: false };
-    }
-    if (typeof value === "symbol") {
-      return { value: "[symbol]", removedSensitive: false };
-    }
-    if (typeof value === "function") {
-      return { value: "[function]", removedSensitive: false };
-    }
-    const objectValue = value;
-    if (ancestors.has(objectValue)) {
-      return { value: "[Circular]", removedSensitive: false };
-    }
-    ancestors.add(objectValue);
-    try {
-      if (Array.isArray(objectValue)) {
-        const output = [];
-        let removedSensitive = false;
-        for (const item of objectValue) {
-          const sanitized = sanitizeValue(item, ancestors);
-          if (sanitized === OMIT_VALUE) {
-            removedSensitive = true;
-            continue;
-          }
-          output.push(sanitized.value);
-          removedSensitive ||= sanitized.removedSensitive;
-        }
-        if (output.length === 0 && removedSensitive) return OMIT_VALUE;
-        return { value: output, removedSensitive };
-      }
-      if (objectValue instanceof Error)
-        return sanitizeError(objectValue, ancestors);
-      return sanitizeObjectFields(objectValue, ancestors);
-    } catch {
-      return { value: "[Unserializable object]", removedSensitive: false };
-    } finally {
-      ancestors.delete(objectValue);
-    }
-  }
-  function formatNonError(value) {
-    if (typeof value === "string") return value;
-    try {
-      const sanitized = sanitizeValue(value, /* @__PURE__ */ new Set());
-      const serializable = sanitized === OMIT_VALUE ? {} : sanitized.value;
-      return JSON.stringify(serializable);
-    } catch {
-      return "[Unserializable value]";
-    }
-  }
-  function formatErrorFields(error2) {
-    const fields = sanitizeObjectFields(
-      error2,
-      /* @__PURE__ */ new Set([error2]),
-      /* @__PURE__ */ new Set(["name", "message", "stack", "cause"])
-    );
-    if (fields === OMIT_VALUE) return "";
-    const output = fields.value;
-    return Object.keys(output).length > 0 ? `
-Details: ${JSON.stringify(output)}` : "";
-  }
-  function formatErrorDetail(error2) {
-    const parts = [];
-    const seen = /* @__PURE__ */ new Set();
-    let current = error2;
-    while (current instanceof Error && !seen.has(current)) {
-      seen.add(current);
-      parts.push(
-        `${errorName(current)}: ${errorMessage(current)}${formatErrorFields(current)}`
-      );
-      try {
-        current = current.cause;
-      } catch {
-        current = "[Unserializable error cause]";
-      }
-    }
-    if (current !== void 0) {
-      parts.push(
-        seen.has(current) ? "Error cause cycle detected" : formatNonError(current)
-      );
-    }
-    return parts.join("\nCaused by: ") || formatNonError(error2);
-  }
-  async function responseErrorMessage(response, operation) {
-    const statusText = response.statusText ? ` ${response.statusText}` : "";
-    const prefix = `${operation} (HTTP ${response.status}${statusText})`;
-    let body;
-    try {
-      body = await response.text();
-    } catch (error2) {
-      throw errorWithCause(`${prefix}: failed to read response body`, error2);
-    }
-    return body ? `${prefix}: ${body}` : prefix;
-  }
-
   // web-src/core/id.ts
   function bytesToHex(bytes) {
     return Array.from(bytes, (b2) => b2.toString(16).padStart(2, "0")).join("");
@@ -23929,11 +24257,31 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
     }
     async function ensureDbUiState() {
       if (dbUiLoadPromise) return dbUiLoadPromise;
-      dbUiLoadPromise = fetch("/_db/ui").then(async (res) => {
-        if (!res.ok) return;
-        applyDbUiState(await res.json());
-      }).catch(() => void 0);
-      return dbUiLoadPromise;
+      const operation = (async () => {
+        const response = await deps.trackLoad(fetch("/_db/ui"));
+        if (!response.ok) {
+          throw new Error(
+            await responseErrorMessage(response, "load database UI settings")
+          );
+        }
+        let state;
+        try {
+          state = await response.json();
+        } catch (error2) {
+          throw errorWithCause(
+            "load database UI settings: response is not valid JSON",
+            error2
+          );
+        }
+        applyDbUiState(state);
+      })();
+      dbUiLoadPromise = operation;
+      try {
+        await operation;
+      } catch (error2) {
+        if (dbUiLoadPromise === operation) dbUiLoadPromise = null;
+        throw error2;
+      }
     }
     function getColumnWidths(dbId, table2) {
       return { ...dbUiState.columnWidths[dbId]?.[table2] || {} };
@@ -24001,14 +24349,29 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
       const v = dbUiState.prefs?.[key];
       return v === void 0 ? fallback : v;
     }
-    function setDbUiPref(key, value) {
-      const nextPrefs = { ...dbUiState.prefs ?? {}, [key]: value };
-      applyDbUiState({ ...dbUiState, prefs: nextPrefs });
-      void fetch("/_db/ui", {
-        method: "PATCH",
-        headers: actionHeaders(),
-        body: JSON.stringify({ prefs: { [key]: value } })
-      }).catch(() => void 0);
+    async function saveDbUiPrefs(patch) {
+      const response = await deps.trackLoad(
+        fetch("/_db/ui", {
+          method: "PATCH",
+          headers: actionHeaders(),
+          body: JSON.stringify({ prefs: patch })
+        })
+      );
+      if (!response.ok) {
+        throw new Error(
+          await responseErrorMessage(response, "save database UI settings")
+        );
+      }
+      let saved;
+      try {
+        saved = await response.json();
+      } catch (error2) {
+        throw errorWithCause(
+          "save database UI settings: response is not valid JSON",
+          error2
+        );
+      }
+      applyDbUiState({ ...dbUiState, prefs: saved.prefs });
     }
     function onDbUiPrefChange(listener) {
       dbUiPrefListeners.add(listener);
@@ -24437,7 +24800,6 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
           getSnapshotSelectedTables,
           setSnapshotSelectedTables,
           getDbUiPref,
-          setDbUiPref,
           onDbUiPrefChange,
           loadSqlHistory,
           refreshDatastores,
@@ -24854,7 +25216,8 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
       localize,
       refresh: refreshDatastores,
       getDbUiPref,
-      setDbUiPref,
+      loadDbUiPrefs: ensureDbUiState,
+      saveDbUiPrefs,
       onDbUiPrefChange
     };
   }
@@ -28403,7 +28766,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
         settings: {
           nav: "Settings",
           title: "Settings",
-          intro: "Viewer preferences for this project and this browser. Changes are saved as you make them.",
+          intro: "Viewer preferences for this project and this browser. Edits remain a draft until you select Save changes.",
           groups: []
         },
         overview: {
@@ -28524,6 +28887,10 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
                   kind: "paragraph",
                   text: "The left side starts with a Your turn section for terminals that are waiting for input or finished but unread. Below it, you can scope the session list to this repository or all tmux sessions, filter by state, and search by task, place, or id. Its two-tier tree puts shells opened by this panel at the top: a shell running tmux carries a terminal icon and its session name, and that session's windows and panes hang underneath it. The bottom tier is the tmux sessions no shell has opened yet. Each pane is labelled with the title tmux shows for it — a coding agent running in a pane usually puts what it is doing there, so the tree alone tells you which pane is busy."
                 },
+                {
+                  kind: "paragraph",
+                  text: "Status first uses lifecycle reports when they are available. Otherwise it evaluates every enabled screen rule against the live terminal title and recent visible lines, then uses the highest-priority match. A terminal is tracked only after a report or a visible rule identifies it; screen motion then provides the working/idle fallback. Working matches expire when the title and screen stop changing, so stale status text does not stay active. Settings & Help → Settings contains the full JSON rule set, including regions, priorities, contains checks, regular expressions, and nested all/any/not conditions. Regular expressions use a bounded safe subset: groups, alternation, and backreferences are rejected, and AND/OR belongs in all/any. Saving validates the whole set and shows every error without replacing the active rules. Restoring the built-in rules removes the saved override so updated defaults can arrive with later releases."
+                },
                 {
                   kind: "paragraph",
                   text: "Click a pane and the panel takes you to it. If a shell already has that session open, it switches to that shell and makes the pane current; otherwise a shell is opened and attached for you. A session moves up to the top tier the moment a shell opens it and drops back down when that shell closes, so you end up with one shell per tmux session rather than one per pane. Powerline separators and file icons render when a Nerd Font is installed on the machine running the browser; no font ships with the package. The tree needs tmux on PATH — without it the panel says so, and shells still work. Opening shells needs the optional @lydell/node-pty package."
@@ -28578,6 +28945,10 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
                       "settings.json",
                       "Settings — diff layout, theme, language, sidebar/history widths, font sizes, syntax highlight, ignore-whitespace, hide-tests, scope overrides (omitted dirs / excluded names), upload toggle, annotation panel open/width/follow/mute/rate, and the last viewed diff range."
                     ],
+                    [
+                      "agent-screen-rules.json",
+                      "Terminal status screen rules saved from Settings. Removing the override restores the built-in rules."
+                    ],
                     [
                       "view-state.json",
                       "Sidebar tree state — collapsed directories, lazy-expanded directories (folders opened on demand in large repos), and the viewed-file list used to dim already-read entries."
@@ -29137,7 +29508,7 @@ code-viewer annotate add-db --db app.db --tab query \\
         settings: {
           nav: "設定",
           title: "設定",
-          intro: "このプロジェクトとこのブラウザのビューア設定です。変更は自動で保存されます。",
+          intro: "このプロジェクトとこのブラウザのビューア設定です。「変更を保存」を押すまで編集内容は下書きのままです。",
           groups: []
         },
         overview: {
@@ -29258,6 +29629,10 @@ code-viewer annotate add-db --db app.db --tab query \\
                   kind: "paragraph",
                   text: "左側の先頭には、入力待ちと、終わったのにまだ見ていないターミナルを集める「あなたの番」があります。その下の一覧は、このリポジトリだけ、またはすべての tmux セッションに範囲を切り替え、状態で絞り込み、作業内容・場所・宛先で検索できます。2 段のツリーの上段はこのパネルが開いたシェルで、中で tmux が動いていれば端末の印とセッション名が付き、そのセッションのウィンドウとペインがその下にぶら下がります。下段は、まだどのシェルも開いていない tmux セッションです。ペインには tmux 側のタイトルが付きます。ペインで動いているコーディングエージェントは作業内容をタイトルに出すので、ツリーを見るだけでどのペインが動いているか分かります。"
                 },
+                {
+                  kind: "paragraph",
+                  text: "状態変更の申告がある場合はそれを先に使います。申告が無い場合は、現在のターミナルタイトルと画面下端の表示に対して全ルールを評価し、優先度が最大の一致から「作業中」「入力待ち」「待機中」「直前の状態を維持」を決めます。申告か見えているルールで対象を識別した後だけ、画面の変化量を作業中・待機中の補助判定に使います。作業中ルールの文字が残っていても、タイトルと画面が変化しなくなれば待機中へ移ります。設定・ヘルプ → 設定では、見る範囲、優先度、contains、正規表現、入れ子の all/any/not を含むJSONルール集を編集できます。正規表現は処理時間を抑えた範囲だけを許可し、グループ・選択・後方参照は使えません。AND/OR は all/any で表します。保存時は全ルールを検証し、エラーはすべて表示して適用中のルールを置き換えません。組み込みルールへ戻すと保存済みの上書きを削除するため、以後の更新で新しい既定ルールを受け取れます。"
+                },
                 {
                   kind: "paragraph",
                   text: "ペインを押すと、そこまで連れて行きます。そのセッションを既に開いているシェルがあれば、そのシェルに切り替えてペインをカレントにします。無ければ、こちらでシェルを開いて attach します。シェルで開いた瞬間にセッションは下段から上段へ移り、そのシェルを閉じると下段へ戻ります。つまりペインごとではなく、tmux のセッション 1 つにつきシェル 1 本になります。powerline のセパレータやファイルアイコンは、ブラウザを動かしている環境に Nerd Font が入っていれば表示されます（フォントはパッケージに同梱していません）。ツリーには tmux が PATH にあることが必要で、無い場合はその旨を表示します（シェルはそのまま使えます）。シェルを開くには任意依存の @lydell/node-pty が必要です。"
@@ -29312,6 +29687,10 @@ code-viewer annotate add-db --db app.db --tab query \\
                       "settings.json",
                       "設定 — diff レイアウト、テーマ、言語、サイドバー/履歴幅、フォントサイズ、シンタックスハイライト、whitespace 無視、テスト非表示、scope 上書き（除外ディレクトリ / 除外名）、アップロード許可、注釈パネルの開閉/幅/follow/ミュート/再生速度、最後に表示した diff 範囲を保存します。"
                     ],
+                    [
+                      "agent-screen-rules.json",
+                      "設定画面で保存したターミナル状態の画面判定ルール。上書きを削除すると組み込みルールへ戻ります。"
+                    ],
                     [
                       "view-state.json",
                       "サイドバーツリーの状態 — 折りたたみ済みディレクトリ、遅延展開済みディレクトリ（大規模リポジトリで必要に応じて開かれたフォルダ）、既読扱いするための表示済みファイル一覧。"
@@ -39302,7 +39681,7 @@ code-viewer annotate add-db --db app.db --tab query \\
     stateWaiting: "waiting",
     stateDone: "unread",
     stateIdle: "idle",
-    guessed: "guessed from screen activity",
+    guessed: "detected from visible terminal UI or screen activity",
     filterPlaceholder: "task, place, or id",
     filterAll: "all",
     noMatches: "Nothing matches this filter.",
@@ -39373,11 +39752,11 @@ code-viewer annotate add-db --db app.db --tab query \\
     yourTurnHint: "入力待ちと、終わったのにまだ見ていないもの",
     yourTurnEmpty: "いま手を入れるものはありません。",
     sessions: "ターミナル",
-    stateWorking: "稼働",
-    stateWaiting: "待ち",
+    stateWorking: "作業中",
+    stateWaiting: "入力待ち",
     stateDone: "未読",
-    stateIdle: "停止",
-    guessed: "画面の動きからの推測",
+    stateIdle: "待機中",
+    guessed: "画面表示または画面の動きからの判定",
     filterPlaceholder: "作業内容・場所・宛先",
     filterAll: "すべて",
     noMatches: "この条件に合うものはありません。",
@@ -39642,6 +40021,10 @@ code-viewer annotate add-db --db app.db --tab query \\
     const attentionEmpty = document.createElement("p");
     attentionEmpty.className = "terminal-empty";
     attentionSection.append(attentionHead, attentionCards, attentionEmpty);
+    const observationErrors = document.createElement("pre");
+    observationErrors.className = "terminal-observation-errors";
+    observationErrors.setAttribute("role", "alert");
+    observationErrors.hidden = true;
     const filters = document.createElement("div");
     filters.className = "terminal-filters";
     const stateSelect = document.createElement("select");
@@ -39660,14 +40043,15 @@ code-viewer annotate add-db --db app.db --tab query \\
     tree.role = "tree";
     const treeEmpty = document.createElement("p");
     treeEmpty.className = "terminal-empty";
-    el.append(scopeBar, attentionSection, filters, tree);
+    el.append(scopeBar, observationErrors, attentionSection, filters, tree);
     let data = {
       panes: null,
       shells: [],
       clients: [],
       shellAvailable: true,
       shellUnavailableReason: "",
-      states: []
+      states: [],
+      stateErrors: []
     };
     let selected = null;
     let stateFilter = null;
@@ -39807,7 +40191,7 @@ code-viewer annotate add-db --db app.db --tab query \\
       button.title = [
         row.task,
         row.kind === "tmux" ? `${row.locator} · ${row.place}` : row.place,
-        row.source === "activity" ? text3.guessed : "",
+        row.source && row.source !== "hook" ? text3.guessed : "",
         row.lastPrompt ? `${text3.lastPrompt}: ${row.lastPrompt}` : ""
       ].filter(Boolean).join("\n");
       button.addEventListener("click", () => activate(row));
@@ -40010,6 +40394,13 @@ code-viewer annotate add-db --db app.db --tab query \\
         data.clients
       );
       const scoped = filterByScope(all, scope);
+      observationErrors.textContent = data.stateErrors.map((error2) => {
+        const target = error2.target ? ` ${error2.target}` : "";
+        return `[${error2.operation}${target}]
+${error2.detail}${error2.stack ? `
+${error2.stack}` : ""}`;
+      }).join("\n\n");
+      observationErrors.hidden = data.stateErrors.length === 0;
       renderScope(all, scoped);
       const attention = attentionRows(scoped);
       attentionTitle.textContent = text3.yourTurn;
@@ -40039,158 +40430,6 @@ code-viewer annotate add-db --db app.db --tab query \\
     };
   }
 
-  // web-src/core/terminal-paste.ts
-  var PASTE_IMAGE_TYPES = {
-    "image/png": "png",
-    "image/jpeg": "jpg",
-    "image/gif": "gif",
-    "image/webp": "webp"
-  };
-  var MAX_PASTE_IMAGE_BYTES = 8 * 1024 * 1024;
-  var MAX_PASTE_BODY_BYTES = Math.ceil(MAX_PASTE_IMAGE_BYTES * 1.4);
-  var SHIFT_ENTER_SEQUENCE = `${String.fromCharCode(27)}[200~${String.fromCharCode(10)}${String.fromCharCode(27)}[201~`;
-  function isShiftEnter(event) {
-    return event.key === "Enter" && event.shiftKey && !event.ctrlKey && !event.metaKey && !event.altKey;
-  }
-
-  // web-src/core/terminal-images.ts
-  var TERMINAL_IMAGE_EXTENSIONS = [
-    ...new Set(Object.values(PASTE_IMAGE_TYPES)),
-    "jpeg"
-  ];
-  var MAX_TERMINAL_IMAGE_PATHS = 64;
-  var MAX_TERMINAL_IMAGE_QUERY = 16;
-  var MAX_IMAGE_PATH_LENGTH = 1024;
-  var ESC = String.fromCharCode(27);
-  var BEL = String.fromCharCode(7);
-  var ANSI_RE = new RegExp(
-    `${ESC}\\[[0-9;?]*[ -/]*[@-~]|${ESC}\\][^${BEL}${ESC}]*(?:${BEL}|${ESC}\\\\)|${ESC}[@-Z\\\\-_]`,
-    "g"
-  );
-  function stripAnsi(text3) {
-    return text3.replace(ANSI_RE, "");
-  }
-  var PATH_CHAR = "[\\p{L}\\p{N}._~+@%/-]";
-  var NAME_CHAR = "[\\p{L}\\p{N}_~+@%-]";
-  var IMAGE_PATH_RE = new RegExp(
-    `${PATH_CHAR}*${NAME_CHAR}\\.(?:${TERMINAL_IMAGE_EXTENSIONS.join("|")})(?![\\p{L}\\p{N}])`,
-    "giu"
-  );
-  function looksLikeUrl(value) {
-    return value.startsWith("//") || value.includes("://");
-  }
-  function findImagePaths(text3, limit = MAX_TERMINAL_IMAGE_PATHS) {
-    const found = [];
-    const seen = /* @__PURE__ */ new Set();
-    for (const match2 of text3.matchAll(IMAGE_PATH_RE)) {
-      const path = match2[0];
-      if (path.length > MAX_IMAGE_PATH_LENGTH) continue;
-      if (looksLikeUrl(path)) continue;
-      if (seen.has(path)) continue;
-      seen.add(path);
-      found.push(path);
-      if (found.length >= limit) break;
-    }
-    return found;
-  }
-  function joinWrappedLines(text3, width) {
-    if (!Number.isFinite(width) || width <= 0) return text3;
-    const lines = text3.split("\n");
-    const joined = [];
-    let current = null;
-    let previousLength = 0;
-    for (const line of lines) {
-      if (current === null) {
-        current = line;
-      } else if (previousLength >= width) {
-        current += line;
-      } else {
-        joined.push(current);
-        current = line;
-      }
-      previousLength = line.length;
-    }
-    if (current !== null) joined.push(current);
-    return joined.join("\n");
-  }
-  function joinBrokenPathLines(text3) {
-    const lines = text3.split("\n");
-    const candidates = [];
-    for (let i2 = 0; i2 + 1 < lines.length; i2 += 1) {
-      const head = lastPathFragment(lines[i2] ?? "");
-      const tail = firstWord(lines[i2 + 1] ?? "");
-      if (!head || !tail) continue;
-      candidates.push(head.text + tail);
-    }
-    return candidates.join("\n");
-  }
-  function lastPathFragment(line) {
-    let found = null;
-    const words = /\S+/g;
-    for (const match2 of line.matchAll(words)) {
-      if (match2[0].includes("/")) {
-        found = { text: match2[0], index: match2.index ?? 0 };
-      }
-    }
-    return found;
-  }
-  function firstWord(line) {
-    return /\S+/.exec(line)?.[0] ?? "";
-  }
-  function findImagePathsInText(plain, width = 0, limit = MAX_TERMINAL_IMAGE_PATHS) {
-    const merged = [];
-    const seen = /* @__PURE__ */ new Set();
-    const sources = [
-      plain,
-      width > 0 ? joinWrappedLines(plain, width) : "",
-      joinBrokenPathLines(plain)
-    ];
-    for (const source of sources) {
-      if (!source) continue;
-      for (const path of findImagePaths(source, limit)) {
-        if (seen.has(path)) continue;
-        seen.add(path);
-        merged.push(path);
-        if (merged.length >= limit) return merged;
-      }
-    }
-    return merged;
-  }
-  function findPathAnchors(lines, candidates) {
-    const anchors = [];
-    for (const candidate of candidates) {
-      if (!candidate) continue;
-      const anchor = firstAnchor(lines, candidate);
-      if (anchor) anchors.push(anchor);
-    }
-    return anchors;
-  }
-  function firstAnchor(lines, candidate) {
-    for (let row = 0; row < lines.length; row += 1) {
-      const line = lines[row] ?? "";
-      const direct = line.indexOf(candidate);
-      if (direct >= 0) return { candidate, row, col: direct, span: 1 };
-      const head = lastPathFragment(line);
-      if (!head) continue;
-      const tail = firstWord(lines[row + 1] ?? "");
-      if (tail && head.text + tail === candidate) {
-        return { candidate, row, col: head.index, span: 2 };
-      }
-    }
-    return null;
-  }
-
-  // web-src/core/lazy-bundle.ts
-  function createBundleLoader(bundleFile, init) {
-    let pending = null;
-    return () => {
-      if (!pending) {
-        pending = import(`/${bundleFile}`).then((mod) => init ? init(mod) : mod).catch(() => null);
-      }
-      return pending;
-    };
-  }
-
   // web-src/core/xterm-loader.ts
   var loadXterm = createBundleLoader("xterm.js");
 
@@ -40887,6 +41126,7 @@ ${formatErrorDetail(error2)}`
     let board = null;
     let lastTargetId = null;
     let states = [];
+    let stateErrors = [];
     let screen = null;
     let reloadBtn = null;
     let fontSmaller = null;
@@ -40996,7 +41236,8 @@ ${formatErrorDetail(error2)}`);
         clients: clients?.clients ?? [],
         shellAvailable: shells?.available ?? true,
         shellUnavailableReason: shells?.reason ?? "",
-        states
+        states,
+        stateErrors
       });
       board?.setSelected(attached?.id ?? null);
     }
@@ -41029,12 +41270,13 @@ ${formatErrorDetail(error2)}`);
         }
         const nextPanes = await paneRes.json();
         const nextShells = await shellRes.json();
-        const nextStates = (await stateRes.json()).states;
+        const nextStateResponse = await stateRes.json();
         const nextClients = await clientRes.json();
         if (stale()) return;
         panes = nextPanes;
         shells = nextShells;
-        states = nextStates ?? [];
+        states = nextStateResponse.states ?? [];
+        stateErrors = nextStateResponse.errors ?? [];
         clients = nextClients;
         renderLists();
         if (attached && !findShell(attached.id)) {
@@ -42268,6 +42510,17 @@ ${formatErrorDetail(error2)}`);
     { value: "en", label: "English" },
     { value: "ja", label: "日本語" }
   ];
+  var GENERAL_SETTING_FIELDS = [
+    "language",
+    "sidebarFontSize",
+    "codeFontSize",
+    "omitDirs",
+    "excludeNames",
+    "watchLimit",
+    "uploadEnabled",
+    "inferFkRails",
+    "s3TooltipEnabled"
+  ];
   function section() {
     const div = document.createElement("div");
     div.className = "scope-settings-section";
@@ -42309,8 +42562,8 @@ ${formatErrorDetail(error2)}`);
     wrap.append(input2, text3);
     return { wrap, input: input2, text: text3 };
   }
-  function setFieldValue(field2, value) {
-    if (field2 === document.activeElement) return;
+  function setFieldValue(field2, value, force = false) {
+    if (!force && field2 === document.activeElement) return;
     if (field2.value !== value) field2.value = value;
   }
   function createViewerSettings(deps) {
@@ -42334,22 +42587,66 @@ ${formatErrorDetail(error2)}`);
     const watchLimitNumber = document.createElement("input");
     const watchLimitRange = document.createElement("input");
     const watchLimitHelp = helpText("scope-watch-limit-help");
-    const autosaveNote = helpText("scope-settings-autosave-note");
+    const agentRules = document.createElement("textarea");
+    const agentRulesHelp = helpText("agent-screen-rules-help");
+    const agentRulesSource = helpText("agent-screen-rules-source");
+    const agentRulesError = helpText("agent-screen-rules-error");
+    agentRulesError.classList.add("scope-settings-refresh-error");
+    agentRulesError.hidden = true;
+    const agentRulesHighlightError = helpText(
+      "agent-screen-rules-highlight-error"
+    );
+    agentRulesHighlightError.classList.add("scope-settings-refresh-error");
+    agentRulesHighlightError.hidden = true;
+    const agentRulesHighlight = document.createElement("pre");
+    agentRulesHighlight.className = "agent-screen-rules-highlight";
+    agentRulesHighlight.setAttribute("aria-hidden", "true");
+    const agentRulesGuide = document.createElement("details");
+    agentRulesGuide.id = "agent-screen-rules-guide";
+    agentRulesGuide.className = "agent-screen-rules-guide";
+    agentRulesGuide.open = true;
+    const agentRulesGuideTitle = document.createElement("summary");
+    const agentRulesGuideIntro = helpText();
+    const agentRulesGuideFields = helpText();
+    const agentRulesGuideMatchers = helpText();
+    const agentRulesGuideRegions = helpText();
+    const agentRulesGuideExample = document.createElement("pre");
+    agentRulesGuideExample.className = "agent-screen-rules-guide-example";
+    const agentRulesSave = document.createElement("button");
+    const agentRulesReset = document.createElement("button");
+    const saveNote = helpText("scope-settings-save-note");
+    const saveStatus = helpText("scope-settings-save-status");
+    saveStatus.setAttribute("aria-live", "polite");
+    const saveError = helpText("scope-settings-save-error");
+    saveError.classList.add("scope-settings-refresh-error");
+    saveError.hidden = true;
     const refreshError = helpText("scope-settings-refresh-error");
     refreshError.classList.add("scope-settings-refresh-error");
     refreshError.hidden = true;
     const resetButton = document.createElement("button");
+    const saveButton = document.createElement("button");
     const displayTitle = sectionTitle();
     const uploadsTitle = sectionTitle();
     const excludedTitle = sectionTitle();
     const datastoreTitle = sectionTitle();
     const watchTitle = sectionTitle();
+    const agentRulesTitle = sectionTitle();
     const languageLabel = fieldLabel("viewer-language");
     const sidebarFontSizeLabel = fieldLabel("sidebar-font-size");
     const codeFontSizeLabel = fieldLabel("code-font-size");
     const omitDirsLabel = fieldLabel("scope-omit-dirs");
     const excludeNamesLabel = fieldLabel("scope-exclude-names");
     const watchLimitLabel = fieldLabel("scope-watch-limit");
+    const agentRulesLabel = fieldLabel("agent-screen-rules");
+    let generalDirty = false;
+    let generalSavePending = false;
+    let restoreDefaults = false;
+    const changedGeneralFields = /* @__PURE__ */ new Set();
+    let generalStatus = "idle";
+    let agentRulesPending = false;
+    let agentRulesDirty = false;
+    let jsonHighlighter = null;
+    let refreshGeneration = 0;
     function build() {
       const wrap = document.createElement("div");
       wrap.className = "scope-settings";
@@ -42417,63 +42714,318 @@ ${formatErrorDetail(error2)}`);
       const watch = section();
       watch.id = "watch-settings-section";
       watch.append(watchTitle, watchLimitLabel, watchRow, watchLimitHelp);
+      agentRulesTitle.id = "agent-screen-rules-title";
+      agentRules.id = "agent-screen-rules";
+      agentRules.rows = 24;
+      agentRules.spellcheck = false;
+      agentRules.setAttribute(
+        "aria-describedby",
+        [
+          "agent-screen-rules-help",
+          "agent-screen-rules-source",
+          "agent-screen-rules-error",
+          "agent-screen-rules-highlight-error"
+        ].join(" ")
+      );
+      const agentRulesEditor = document.createElement("div");
+      agentRulesEditor.className = "agent-screen-rules-editor";
+      agentRulesEditor.append(agentRulesHighlight, agentRules);
+      agentRulesGuide.append(
+        agentRulesGuideTitle,
+        agentRulesGuideIntro,
+        agentRulesGuideFields,
+        agentRulesGuideMatchers,
+        agentRulesGuideRegions,
+        agentRulesGuideExample
+      );
+      agentRulesSave.type = "button";
+      agentRulesSave.id = "agent-screen-rules-save";
+      agentRulesReset.type = "button";
+      agentRulesReset.id = "agent-screen-rules-reset";
+      const agentRuleActions = document.createElement("div");
+      agentRuleActions.className = "scope-settings-actions";
+      agentRuleActions.append(agentRulesReset, agentRulesSave);
+      const ruleSettings = section();
+      ruleSettings.classList.add("agent-screen-rules-section");
+      ruleSettings.append(
+        agentRulesTitle,
+        agentRulesLabel,
+        agentRulesHelp,
+        agentRulesGuide,
+        agentRulesEditor,
+        agentRulesSource,
+        agentRulesError,
+        agentRulesHighlightError,
+        agentRuleActions
+      );
       resetButton.id = "scope-omit-reset";
       resetButton.type = "button";
+      saveButton.id = "scope-settings-save";
+      saveButton.type = "button";
+      saveButton.className = "scope-settings-primary-action";
+      const generalActions = document.createElement("div");
+      generalActions.className = "scope-settings-actions";
+      generalActions.append(resetButton, saveButton);
       const footer = document.createElement("div");
       footer.className = "scope-settings-footer";
-      footer.append(autosaveNote, refreshError, resetButton);
-      wrap.append(display, uploads, excluded, datastores, watch, footer);
+      footer.append(
+        saveNote,
+        saveStatus,
+        saveError,
+        refreshError,
+        generalActions
+      );
+      wrap.append(
+        display,
+        uploads,
+        excluded,
+        datastores,
+        watch,
+        ruleSettings,
+        footer
+      );
       wire();
+      void initializeJsonHighlighting();
       return wrap;
     }
     function wire() {
-      language.addEventListener(
-        "change",
-        () => deps.onLanguageChange(language.value)
-      );
+      language.addEventListener("change", () => markGeneralDirty("language"));
       sidebarFontSize.addEventListener(
         "change",
-        () => deps.onSidebarFontSizeChange(sidebarFontSize.value)
+        () => markGeneralDirty("sidebarFontSize")
       );
       codeFontSize.addEventListener(
         "change",
-        () => deps.onCodeFontSizeChange(codeFontSize.value)
+        () => markGeneralDirty("codeFontSize")
       );
       upload.input.addEventListener(
         "change",
-        () => deps.onUploadEnabledChange(upload.input.checked)
-      );
-      omitDirs.addEventListener(
-        "change",
-        () => deps.onOmitDirsChange(omitDirs.value)
-      );
-      excludeNames.addEventListener(
-        "change",
-        () => deps.onExcludeNamesChange(excludeNames.value)
+        () => markGeneralDirty("uploadEnabled")
       );
       inferFk.input.addEventListener(
         "change",
-        () => deps.onInferFkChange(inferFk.input.checked)
+        () => markGeneralDirty("inferFkRails")
       );
       s3Tooltip.input.addEventListener(
         "change",
-        () => deps.onS3TooltipChange(s3Tooltip.input.checked)
+        () => markGeneralDirty("s3TooltipEnabled")
       );
+      omitDirs.addEventListener("input", () => markGeneralDirty("omitDirs"));
+      excludeNames.addEventListener(
+        "input",
+        () => markGeneralDirty("excludeNames")
+      );
+      watchLimitNumber.addEventListener("input", () => {
+        watchLimitRange.value = watchLimitNumber.value;
+        markGeneralDirty("watchLimit");
+      });
       watchLimitNumber.addEventListener("change", () => {
         watchLimitRange.value = watchLimitNumber.value;
-        deps.onWatchLimitChange(watchLimitNumber.value);
+        markGeneralDirty("watchLimit");
       });
       watchLimitRange.addEventListener("input", () => {
         watchLimitNumber.value = watchLimitRange.value;
+        markGeneralDirty("watchLimit");
       });
       watchLimitRange.addEventListener(
         "change",
-        () => deps.onWatchLimitChange(watchLimitRange.value)
+        () => markGeneralDirty("watchLimit")
       );
-      resetButton.addEventListener("click", () => {
-        deps.onReset();
-        sync();
+      agentRules.addEventListener("input", () => {
+        agentRulesDirty = true;
+        syncAgentRulesHighlight();
+      });
+      agentRules.addEventListener("scroll", syncAgentRulesScroll);
+      agentRulesSave.addEventListener("click", () => {
+        void updateAgentRules(() => deps.onAgentRulesSave(agentRules.value));
       });
+      agentRulesReset.addEventListener("click", () => {
+        void updateAgentRules(() => deps.onAgentRulesReset());
+      });
+      resetButton.addEventListener("click", () => {
+        applyGeneralFields(deps.getDefaultValues(), true);
+        restoreDefaults = true;
+        changedGeneralFields.clear();
+        for (const field2 of GENERAL_SETTING_FIELDS) {
+          changedGeneralFields.add(field2);
+        }
+        generalDirty = true;
+        generalStatus = "dirty";
+        clearGeneralSaveError();
+        renderGeneralSaveState();
+      });
+      saveButton.addEventListener("click", () => {
+        void saveGeneralSettings();
+      });
+    }
+    function markGeneralDirty(field2) {
+      if (generalSavePending) return;
+      changedGeneralFields.add(field2);
+      generalDirty = true;
+      restoreDefaults = false;
+      generalStatus = "dirty";
+      watchLimitNumber.setCustomValidity("");
+      clearGeneralSaveError();
+      renderGeneralSaveState();
+    }
+    function clearGeneralSaveError() {
+      saveError.textContent = "";
+      saveError.hidden = true;
+    }
+    function renderGeneralSaveState() {
+      const text3 = deps.getText();
+      saveButton.textContent = generalStatus === "saving" ? text3.saving : text3.save;
+      saveButton.disabled = generalSavePending || !generalDirty;
+      resetButton.disabled = generalSavePending;
+      saveStatus.textContent = generalStatus === "saving" ? text3.saving : generalStatus === "saved" ? text3.saved : generalDirty ? text3.unsaved : "";
+    }
+    function setGeneralControlsDisabled(disabled) {
+      for (const field2 of [
+        language,
+        sidebarFontSize,
+        codeFontSize,
+        upload.input,
+        omitDirs,
+        excludeNames,
+        inferFk.input,
+        s3Tooltip.input,
+        watchLimitNumber,
+        watchLimitRange
+      ]) {
+        field2.disabled = disabled;
+      }
+    }
+    function applyGeneralFields(values, force = false) {
+      setFieldValue(language, values.language, force);
+      setFieldValue(sidebarFontSize, values.sidebarFontSize, force);
+      setFieldValue(codeFontSize, values.codeFontSize, force);
+      setFieldValue(omitDirs, values.omitDirs, force);
+      setFieldValue(excludeNames, values.excludeNames, force);
+      setFieldValue(watchLimitNumber, String(values.watchLimit), force);
+      setFieldValue(watchLimitRange, String(values.watchLimit), force);
+      upload.input.checked = values.uploadEnabled;
+      inferFk.input.checked = values.inferFkRails;
+      s3Tooltip.input.checked = values.s3TooltipEnabled;
+    }
+    function readGeneralDraft() {
+      const values = deps.getValues();
+      const watchLimit = Number(watchLimitNumber.value);
+      if (!Number.isInteger(watchLimit) || watchLimit < values.watchLimitMin || watchLimit > values.watchLimitMax) {
+        const message = deps.getText().watchLimitInvalid(values.watchLimitMin, values.watchLimitMax);
+        watchLimitNumber.setCustomValidity(message);
+        saveError.textContent = message;
+        saveError.hidden = false;
+        generalStatus = "dirty";
+        renderGeneralSaveState();
+        return null;
+      }
+      watchLimitNumber.setCustomValidity("");
+      return {
+        language: language.value,
+        sidebarFontSize: sidebarFontSize.value,
+        codeFontSize: codeFontSize.value,
+        omitDirs: omitDirs.value,
+        excludeNames: excludeNames.value,
+        watchLimit,
+        uploadEnabled: upload.input.checked,
+        inferFkRails: inferFk.input.checked,
+        s3TooltipEnabled: s3Tooltip.input.checked
+      };
+    }
+    async function saveGeneralSettings() {
+      if (generalSavePending || !generalDirty) return;
+      const draft = readGeneralDraft();
+      if (!draft) return;
+      refreshGeneration += 1;
+      generalSavePending = true;
+      generalStatus = "saving";
+      clearGeneralSaveError();
+      setGeneralControlsDisabled(true);
+      renderGeneralSaveState();
+      let completed = false;
+      try {
+        await deps.onSave(draft, {
+          restoreDefaults,
+          changedFields: [...changedGeneralFields]
+        });
+        generalDirty = false;
+        restoreDefaults = false;
+        changedGeneralFields.clear();
+        generalStatus = "saved";
+        completed = true;
+      } catch (error2) {
+        console.error("[code-viewer] viewer settings save failed", error2);
+        saveError.textContent = formatErrorDetail(error2);
+        saveError.hidden = false;
+        generalStatus = "dirty";
+      } finally {
+        generalSavePending = false;
+        setGeneralControlsDisabled(false);
+        if (completed) sync();
+        else renderGeneralSaveState();
+      }
+    }
+    async function initializeJsonHighlighting() {
+      try {
+        jsonHighlighter = await loadShikiHighlighter({
+          themes: ["github-light", "github-dark"],
+          langs: ["json"],
+          failureMode: "throw"
+        });
+        if (!jsonHighlighter) {
+          throw new Error("JSON syntax highlighting could not be loaded");
+        }
+        syncAgentRulesHighlight();
+      } catch (error2) {
+        console.error("[code-viewer] JSON syntax highlighting failed", error2);
+        agentRulesHighlightError.textContent = formatErrorDetail(error2);
+        agentRulesHighlightError.hidden = false;
+      }
+    }
+    function syncAgentRulesHighlight() {
+      const highlighted = highlightToInnerHtml(
+        agentRules.value,
+        "json",
+        jsonHighlighter
+      );
+      if (highlighted) agentRulesHighlight.innerHTML = highlighted;
+      else agentRulesHighlight.textContent = agentRules.value;
+      syncAgentRulesScroll();
+    }
+    function syncAgentRulesScroll() {
+      agentRulesHighlight.scrollTop = agentRules.scrollTop;
+      agentRulesHighlight.scrollLeft = agentRules.scrollLeft;
+    }
+    async function updateAgentRules(operation) {
+      if (agentRulesPending) return;
+      refreshGeneration += 1;
+      agentRulesPending = true;
+      agentRules.disabled = true;
+      agentRulesSave.disabled = true;
+      agentRulesReset.disabled = true;
+      agentRulesSource.textContent = deps.getText().agentRulesSaving;
+      agentRulesError.hidden = true;
+      agentRulesError.textContent = "";
+      let completed = false;
+      try {
+        await operation();
+        agentRulesDirty = false;
+        completed = true;
+      } catch (error2) {
+        console.error("[code-viewer] terminal rule update failed", error2);
+        agentRulesError.textContent = formatErrorDetail(error2);
+        agentRulesError.hidden = false;
+      } finally {
+        agentRulesPending = false;
+        agentRules.disabled = false;
+        agentRulesSave.disabled = false;
+        agentRulesReset.disabled = false;
+        if (completed) {
+          sync();
+        } else {
+          agentRulesSource.textContent = deps.getValues().agentRulesSource === "saved" ? deps.getText().agentRulesSourceSaved : deps.getText().agentRulesSourceDefault;
+        }
+      }
     }
     function applyText() {
       const text3 = deps.getText();
@@ -42483,12 +43035,14 @@ ${formatErrorDetail(error2)}`);
       excludedTitle.textContent = text3.excludedDirectories;
       datastoreTitle.textContent = text3.datastoreTitle;
       watchTitle.textContent = text3.watchTitle;
+      agentRulesTitle.textContent = text3.agentRulesTitle;
       languageLabel.textContent = text3.language;
       sidebarFontSizeLabel.textContent = text3.fileListFontSize;
       codeFontSizeLabel.textContent = text3.codeFontSize;
       omitDirsLabel.textContent = text3.omitDirs;
       excludeNamesLabel.textContent = text3.excludeNames;
       watchLimitLabel.textContent = text3.watchLimit;
+      agentRulesLabel.textContent = text3.agentRulesLabel;
       uiFontSizeHelp.textContent = text3.fileListFontSizeHelp;
       displaySource.textContent = text3.displaySource;
       upload.text.textContent = text3.uploadEnabledLabel;
@@ -42500,37 +43054,49 @@ ${formatErrorDetail(error2)}`);
       s3Tooltip.text.textContent = text3.datastoreS3TooltipLabel;
       s3TooltipHelp.textContent = text3.datastoreS3TooltipHelp;
       watchLimitHelp.textContent = text3.watchLimitHelp(values.watchLimitDefault);
-      autosaveNote.textContent = text3.autosaveNote;
+      agentRulesHelp.textContent = text3.agentRulesHelp;
+      agentRulesGuideTitle.textContent = text3.agentRulesGuideTitle;
+      agentRulesGuideIntro.textContent = text3.agentRulesGuideIntro;
+      agentRulesGuideFields.textContent = text3.agentRulesGuideFields;
+      agentRulesGuideMatchers.textContent = text3.agentRulesGuideMatchers;
+      agentRulesGuideRegions.textContent = text3.agentRulesGuideRegions;
+      agentRulesGuideExample.textContent = text3.agentRulesGuideExample;
+      agentRulesSave.textContent = text3.agentRulesSave;
+      agentRulesReset.textContent = text3.agentRulesReset;
+      saveNote.textContent = text3.saveNote;
       resetButton.textContent = text3.reset;
+      renderGeneralSaveState();
       const sizeLabels = {
         compact: text3.sizeSmall,
         regular: text3.sizeRegular,
         large: text3.sizeLarge,
         xlarge: text3.sizeExtraLarge
       };
-      for (const select of [sidebarFontSize, codeFontSize])
-        for (const option of Array.from(select.options))
+      for (const select of [sidebarFontSize, codeFontSize]) {
+        for (const option of Array.from(select.options)) {
           option.textContent = sizeLabels[option.value] || option.value;
+        }
+      }
     }
     function sync() {
       if (!root) return;
       applyText();
       const values = deps.getValues();
-      setFieldValue(language, values.language);
-      setFieldValue(sidebarFontSize, values.sidebarFontSize);
-      setFieldValue(codeFontSize, values.codeFontSize);
-      setFieldValue(omitDirs, values.omitDirs);
-      setFieldValue(excludeNames, values.excludeNames);
       watchLimitNumber.min = String(values.watchLimitMin);
       watchLimitNumber.max = String(values.watchLimitMax);
       watchLimitRange.min = String(values.watchLimitMin);
       watchLimitRange.max = String(values.watchLimitMax);
-      setFieldValue(watchLimitNumber, String(values.watchLimit));
-      setFieldValue(watchLimitRange, String(values.watchLimit));
-      upload.input.checked = values.uploadEnabled;
-      inferFk.input.checked = values.inferFkRails;
-      s3Tooltip.input.checked = values.s3TooltipEnabled;
+      if (!generalDirty && !generalSavePending) applyGeneralFields(values);
       scopeSource.textContent = values.scopeSource;
+      if (!agentRulesDirty && !agentRulesPending) {
+        setFieldValue(agentRules, values.agentRulesJson);
+        syncAgentRulesHighlight();
+      }
+      if (!agentRulesPending) {
+        agentRulesSource.textContent = values.agentRulesSource === "saved" ? deps.getText().agentRulesSourceSaved : deps.getText().agentRulesSourceDefault;
+        agentRulesError.textContent = values.agentRulesErrors;
+        agentRulesError.hidden = !values.agentRulesErrors;
+      }
     }
     function mount(host) {
       if (!root) root = build();
@@ -42550,11 +43116,19 @@ ${formatErrorDetail(error2)}`);
       sync();
       refreshError.hidden = true;
       refreshError.textContent = "";
-      void deps.refresh().then(sync, (error2) => {
-        console.error("[code-viewer] viewer settings refresh failed", error2);
-        refreshError.textContent = formatErrorDetail(error2);
-        refreshError.hidden = false;
-      });
+      const generation = ++refreshGeneration;
+      void deps.refresh().then(
+        () => {
+          if (generation !== refreshGeneration) return;
+          sync();
+        },
+        (error2) => {
+          if (generation !== refreshGeneration) return;
+          console.error("[code-viewer] viewer settings refresh failed", error2);
+          refreshError.textContent = formatErrorDetail(error2);
+          refreshError.hidden = false;
+        }
+      );
     }
     function localize() {
       if (!root) return;
@@ -42584,6 +43158,11 @@ ${formatErrorDetail(error2)}`);
     let PROJECT_BRANCH = "";
     let REPO_WEB_URL = null;
     let APP_SETTINGS = { version: 1 };
+    let AGENT_SCREEN_RULES = formatAgentScreenRuleSet(DEFAULT_AGENT_SCREEN_RULES);
+    let AGENT_SCREEN_RULES_SOURCE = "default";
+    let AGENT_SCREEN_RULE_ERRORS = [];
+    let AGENT_SCREEN_RULES_GENERATION = 0;
+    let AGENT_SCREEN_RULE_REQUEST_GENERATION = 0;
     let VIEW_STATE = {
       version: 1,
       collapsedDirs: [],
@@ -42752,6 +43331,13 @@ ${formatErrorDetail(error2)}`);
         "X-Code-Viewer-Action": "1"
       };
     }
+    function reportPersistenceError(operation, error2) {
+      const failure = errorWithCause(`${operation} failed`, error2);
+      console.error(failure);
+      setStatus("error");
+      const statusEl = document.querySelector("#status");
+      if (statusEl) statusEl.title = formatErrorDetail(failure);
+    }
     let cachedKeymapOverrides;
     let cachedKeyBindings = DEFAULT_KEY_BINDINGS;
     function activeKeyBindings() {
@@ -42761,29 +43347,95 @@ ${formatErrorDetail(error2)}`);
       }
       return cachedKeyBindings;
     }
-    function patchSettings(patch, options = {}) {
-      mergeLocalSettings(patch);
-      const body = JSON.stringify(patch);
-      void fetch("/_state/settings", {
-        method: "PATCH",
-        headers: actionHeaders(),
-        body,
-        keepalive: options.keepalive
-      }).catch(() => void 0);
+    let pendingSettingsPatch = null;
+    let pendingSettingsKeepalive = false;
+    let settingsPatchInFlight = null;
+    async function flushSettingsPatch() {
+      if (settingsPatchInFlight) {
+        await settingsPatchInFlight;
+        if (pendingSettingsPatch) await flushSettingsPatch();
+        return;
+      }
+      if (!pendingSettingsPatch) return;
+      const patch = pendingSettingsPatch;
+      const keepalive = pendingSettingsKeepalive;
+      pendingSettingsPatch = null;
+      pendingSettingsKeepalive = false;
+      const operation = sendSettingsPatch(patch, keepalive).then(() => void 0);
+      settingsPatchInFlight = operation;
+      try {
+        await operation;
+      } catch (error2) {
+        pendingSettingsPatch = {
+          ...patch,
+          ...pendingSettingsPatch || {}
+        };
+        pendingSettingsKeepalive ||= keepalive;
+        throw error2;
+      } finally {
+        if (settingsPatchInFlight === operation) settingsPatchInFlight = null;
+      }
+      if (pendingSettingsPatch) await flushSettingsPatch();
     }
-    async function persistGrepSettings(patch) {
+    async function sendSettingsPatch(patch, keepalive = false) {
       const response = await trackLoad(
         fetch("/_state/settings", {
           method: "PATCH",
           headers: actionHeaders(),
-          body: JSON.stringify(patch)
+          body: JSON.stringify(patch),
+          keepalive
         })
       );
-      if (!response.ok) throw new Error(await response.text());
-      APP_SETTINGS = await response.json();
+      if (!response.ok) {
+        throw new Error(
+          await responseErrorMessage(response, "save viewer settings")
+        );
+      }
+      try {
+        return await response.json();
+      } catch (error2) {
+        throw errorWithCause(
+          "save viewer settings: response is not valid JSON",
+          error2
+        );
+      }
+    }
+    function patchSettings(patch, options = {}) {
+      mergeLocalSettings(patch);
+      pendingSettingsPatch = {
+        ...pendingSettingsPatch || {},
+        ...patch
+      };
+      pendingSettingsKeepalive ||= options.keepalive === true;
+      if (!settingsPatchInFlight) {
+        void flushSettingsPatch().catch((error2) => {
+          reportPersistenceError("save viewer settings", error2);
+        });
+      }
+    }
+    async function persistSettingsPatch(patch) {
+      await flushSettingsPatch();
+      while (settingsPatchInFlight) await settingsPatchInFlight;
+      const operation = sendSettingsPatch(patch).then((state) => {
+        APP_SETTINGS = state;
+        if (pendingSettingsPatch) mergeLocalSettings(pendingSettingsPatch);
+      });
+      settingsPatchInFlight = operation;
+      try {
+        await operation;
+      } finally {
+        if (settingsPatchInFlight === operation) settingsPatchInFlight = null;
+        if (pendingSettingsPatch) {
+          void flushSettingsPatch().catch((error2) => {
+            reportPersistenceError("save viewer settings", error2);
+          });
+        }
+      }
     }
     let pendingViewPatch = null;
     let pendingViewTimer = null;
+    let pendingViewKeepalive = false;
+    let viewPatchInFlight = false;
     function mergePathDelta(next, base2, patch, addKey, removeKey) {
       const added = new Set(base2?.[addKey] || []);
       const removed = new Set(base2?.[removeKey] || []);
@@ -42845,19 +43497,44 @@ ${formatErrorDetail(error2)}`);
         viewedFiles: [...viewedFiles]
       };
     }
+    async function sendPendingViewPatch() {
+      if (viewPatchInFlight || !pendingViewPatch) return;
+      const patch = pendingViewPatch;
+      const keepalive = pendingViewKeepalive;
+      pendingViewPatch = null;
+      pendingViewKeepalive = false;
+      viewPatchInFlight = true;
+      let saved = false;
+      try {
+        const response = await trackLoad(
+          fetch("/_state/view", {
+            method: "PATCH",
+            headers: actionHeaders(),
+            body: JSON.stringify(patch),
+            keepalive
+          })
+        );
+        if (!response.ok) {
+          throw new Error(
+            await responseErrorMessage(response, "save viewer state")
+          );
+        }
+        saved = true;
+      } catch (error2) {
+        pendingViewPatch = mergeViewPatch(patch, pendingViewPatch || {});
+        reportPersistenceError("save viewer state", error2);
+      } finally {
+        viewPatchInFlight = false;
+      }
+      if (saved && pendingViewPatch) void sendPendingViewPatch();
+    }
     function patchViewState(patch, options = {}) {
       VIEW_STATE = mergeLocalViewState(VIEW_STATE, patch);
       pendingViewPatch = mergeViewPatch(pendingViewPatch, patch);
       const send = (keepalive = false) => {
         if (!pendingViewPatch) return;
-        const body = JSON.stringify(pendingViewPatch);
-        pendingViewPatch = null;
-        void fetch("/_state/view", {
-          method: "PATCH",
-          headers: actionHeaders(),
-          body,
-          keepalive
-        }).catch(() => void 0);
+        pendingViewKeepalive ||= keepalive;
+        void sendPendingViewPatch();
       };
       if (options.keepalive) {
         if (pendingViewTimer !== null) clearTimeout(pendingViewTimer);
@@ -42881,14 +43558,8 @@ ${formatErrorDetail(error2)}`);
       if (!pendingViewPatch) return;
       if (pendingViewTimer !== null) clearTimeout(pendingViewTimer);
       pendingViewTimer = null;
-      const body = JSON.stringify(pendingViewPatch);
-      pendingViewPatch = null;
-      void fetch("/_state/view", {
-        method: "PATCH",
-        headers: actionHeaders(),
-        body,
-        keepalive
-      }).catch(() => void 0);
+      pendingViewKeepalive ||= keepalive;
+      void sendPendingViewPatch();
     }
     function savedScopeOmitDirs() {
       return APP_SETTINGS.scopeOmitDirs ? normalizeScopeOmitDirs(APP_SETTINGS.scopeOmitDirs) : null;
@@ -42968,50 +43639,152 @@ ${formatErrorDetail(error2)}`);
       return `${ref}\0${omit ? omit.join("\0") : "server"}\0${exclude ? exclude.join("\0") : "server"}`;
     }
     async function loadSettings() {
+      const res = await trackLoad(fetch("/_settings"));
+      if (!res.ok) {
+        throw new Error(
+          await responseErrorMessage(res, "settings request failed")
+        );
+      }
+      let settings;
       try {
-        const res = await fetch("/_settings");
-        if (!res.ok) return null;
-        const settings = await res.json();
-        setProjectName(settings.project || "");
-        setProjectBranch(settings.branch || "");
-        REPO_WEB_URL = settings.repo_web_url;
-        const repoLink = document.querySelector("#repo-web-link");
-        if (repoLink) {
-          repoLink.href = settings.repo_web_url || "#";
-          repoLink.hidden = !settings.repo_web_url;
-        }
-        SERVER_SCOPE_OMIT_DIRS_DEFAULT = normalizeScopeOmitDirs(
-          settings.scope.omit_dirs_effective
+        settings = await res.json();
+      } catch (error2) {
+        throw errorWithCause("settings response is not valid JSON", error2);
+      }
+      setProjectName(settings.project || "");
+      setProjectBranch(settings.branch || "");
+      REPO_WEB_URL = settings.repo_web_url;
+      const repoLink = document.querySelector("#repo-web-link");
+      if (repoLink) {
+        repoLink.href = settings.repo_web_url || "#";
+        repoLink.hidden = !settings.repo_web_url;
+      }
+      SERVER_SCOPE_OMIT_DIRS_DEFAULT = normalizeScopeOmitDirs(
+        settings.scope.omit_dirs_effective
+      );
+      SERVER_SCOPE_EXCLUDE_NAMES_DEFAULT = normalizeScopeExcludeNames(
+        settings.scope.exclude_names_effective
+      );
+      if (typeof settings.scope.watch_limit_default === "number")
+        SERVER_SCOPE_WATCH_LIMIT_DEFAULT = settings.scope.watch_limit_default;
+      if (typeof settings.scope.watch_limit_min === "number")
+        SERVER_SCOPE_WATCH_LIMIT_MIN = settings.scope.watch_limit_min;
+      if (typeof settings.scope.watch_limit_max === "number")
+        SERVER_SCOPE_WATCH_LIMIT_MAX = settings.scope.watch_limit_max;
+      if (typeof settings.scope.watch_recursive === "boolean") {
+        const watchSection = document.querySelector(
+          "#watch-settings-section"
+        );
+        if (watchSection) watchSection.hidden = settings.scope.watch_recursive;
+      }
+      return settings;
+    }
+    function agentScreenRuleErrorsText(errors2) {
+      return errors2.map(
+        (error2) => `${error2.path} [${error2.code}] ${error2.message}${error2.stack ? `
+${error2.stack}` : ""}`
+      ).join("\n\n");
+    }
+    async function agentScreenRuleResponse(response) {
+      let body;
+      try {
+        body = await response.json();
+      } catch (error2) {
+        throw errorWithCause(
+          `terminal rule request returned ${response.status} with invalid JSON`,
+          error2
         );
-        SERVER_SCOPE_EXCLUDE_NAMES_DEFAULT = normalizeScopeExcludeNames(
-          settings.scope.exclude_names_effective
+      }
+      if (!response.ok) {
+        throw Object.assign(
+          new Error(
+            `terminal rule request failed with status ${response.status}`
+          ),
+          { status: response.status, response: body }
         );
-        if (typeof settings.scope.watch_limit_default === "number")
-          SERVER_SCOPE_WATCH_LIMIT_DEFAULT = settings.scope.watch_limit_default;
-        if (typeof settings.scope.watch_limit_min === "number")
-          SERVER_SCOPE_WATCH_LIMIT_MIN = settings.scope.watch_limit_min;
-        if (typeof settings.scope.watch_limit_max === "number")
-          SERVER_SCOPE_WATCH_LIMIT_MAX = settings.scope.watch_limit_max;
-        if (typeof settings.scope.watch_recursive === "boolean") {
-          const watchSection = document.querySelector(
-            "#watch-settings-section"
-          );
-          if (watchSection) watchSection.hidden = settings.scope.watch_recursive;
-        }
-        return settings;
-      } catch {
-        return null;
+      }
+      if (!body || typeof body !== "object" || !("rules" in body)) {
+        throw Object.assign(new Error("terminal rule response is incomplete"), {
+          response: body
+        });
+      }
+      if (!("generation" in body) || typeof body.generation !== "number") {
+        throw Object.assign(
+          new Error("terminal rule response has no generation"),
+          { response: body }
+        );
+      }
+      return body;
+    }
+    function applyAgentScreenRuleResponse(response) {
+      if (response.generation < AGENT_SCREEN_RULES_GENERATION) return;
+      AGENT_SCREEN_RULES = formatAgentScreenRuleSet(response.rules);
+      AGENT_SCREEN_RULES_SOURCE = response.source;
+      AGENT_SCREEN_RULE_ERRORS = response.errors;
+      AGENT_SCREEN_RULES_GENERATION = response.generation;
+    }
+    async function loadAgentScreenRules() {
+      const generation = ++AGENT_SCREEN_RULE_REQUEST_GENERATION;
+      const response = await agentScreenRuleResponse(
+        await trackLoad(fetch("/_agent/rules"))
+      );
+      if (generation !== AGENT_SCREEN_RULE_REQUEST_GENERATION) return;
+      applyAgentScreenRuleResponse(response);
+    }
+    async function saveAgentScreenRules(value) {
+      let rules;
+      try {
+        rules = JSON.parse(value);
+      } catch (error2) {
+        throw errorWithCause("terminal rules are not valid JSON", error2);
+      }
+      const generation = ++AGENT_SCREEN_RULE_REQUEST_GENERATION;
+      const response = await agentScreenRuleResponse(
+        await trackLoad(
+          fetch("/_agent/rules", {
+            method: "PUT",
+            headers: actionHeaders(),
+            body: JSON.stringify(rules)
+          })
+        )
+      );
+      if (generation !== AGENT_SCREEN_RULE_REQUEST_GENERATION) return;
+      applyAgentScreenRuleResponse(response);
+    }
+    async function resetAgentScreenRuleSettings() {
+      const generation = ++AGENT_SCREEN_RULE_REQUEST_GENERATION;
+      const response = await agentScreenRuleResponse(
+        await trackLoad(
+          fetch("/_agent/rules", {
+            method: "DELETE",
+            headers: actionHeaders()
+          })
+        )
+      );
+      if (generation !== AGENT_SCREEN_RULE_REQUEST_GENERATION) return;
+      applyAgentScreenRuleResponse(response);
+    }
+    async function loadStateResponse(url, operation) {
+      const response = await trackLoad(fetch(url));
+      if (!response.ok) {
+        throw new Error(await responseErrorMessage(response, operation));
+      }
+      try {
+        return await response.json();
+      } catch (error2) {
+        throw errorWithCause(`${operation}: response is not valid JSON`, error2);
       }
     }
     async function loadPersistedState() {
       const [settings, view] = await Promise.all([
-        fetch("/_state/settings").then(
-          (res) => res.ok ? res.json() : null
-        ).catch(() => null),
-        fetch("/_state/view").then((res) => res.ok ? res.json() : null).catch(() => null)
+        loadStateResponse(
+          "/_state/settings",
+          "settings state request failed"
+        ),
+        loadStateResponse("/_state/view", "view state request failed")
       ]);
-      if (settings) APP_SETTINGS = settings;
-      if (view) VIEW_STATE = view;
+      APP_SETTINGS = settings;
+      VIEW_STATE = view;
     }
     function routeFromLocation() {
       const savedLanguage = viewerLanguageFromSearch(window.location.search) || savedViewerLanguage();
@@ -43421,7 +44194,7 @@ ${formatErrorDetail(error2)}`);
       getGrepGroupByFile: () => APP_SETTINGS.grepGroupByFile === true,
       getGrepPaletteWidth: () => APP_SETTINGS.grepPaletteWidth,
       getGrepPaletteHeight: () => APP_SETTINGS.grepPaletteHeight,
-      persistGrepSettings,
+      persistGrepSettings: persistSettingsPatch,
       applyGrepHideTests: (hidden) => {
         STATE.hideTests = hidden;
         applyHideTests();
@@ -43707,7 +44480,12 @@ ${formatErrorDetail(error2)}`);
           excludeNames: "Hide these file or directory names completely",
           excludeNamesHelp: "Removes matching files or directories from the sidebar, search, and grep results entirely. Unlike Skip, the names themselves disappear from the UI. Supports gitignore-style wildcards (*, ?, [abc], [!abc]).",
           reset: "Restore defaults",
-          autosaveNote: "Changes save automatically.",
+          save: "Save changes",
+          saving: "Saving…",
+          saved: "Saved.",
+          unsaved: "Unsaved changes.",
+          saveNote: "Edits are not applied until you select Save changes.",
+          watchLimitInvalid: (min, max) => `Enter a whole number from ${min} to ${max}.`,
           scopeSource: (project, source) => `Saved for project "${project}" in this browser. Source: ${source}. Used by the sidebar, Ctrl+K, Ctrl+G, Datastores, and the file change watcher. Restore defaults removes the browser override.`,
           browserOverride: "Browser override",
           serverDefault: "Server default",
@@ -43721,7 +44499,34 @@ ${formatErrorDetail(error2)}`);
           datastoreS3TooltipHelp: "Hovering an S3 object row shows the full key path and a content preview.",
           watchTitle: "File change watcher",
           watchLimit: "Maximum directories to watch",
-          watchLimitHelp: (defaultLimit) => `Higher values reduce missed updates in deep trees at the cost of file handles. Combine with the Skip list above to keep heavy folders (node_modules, .git, dist...) out of the watch budget. Default: ${defaultLimit}.`
+          watchLimitHelp: (defaultLimit) => `Higher values reduce missed updates in deep trees at the cost of file handles. Combine with the Skip list above to keep heavy folders (node_modules, .git, dist...) out of the watch budget. Default: ${defaultLimit}.`,
+          agentRulesTitle: "Terminal status detection",
+          agentRulesLabel: "Screen matching rules (JSON)",
+          agentRulesHelp: "Rules can report working, waiting, idle, or skip. Configure priority, region, contains, regex, lineRegex, and nested all/any/not conditions. contains ignores letter case; regex accepts a leading (?i) for case-insensitive matching. To keep matching responsive, regex allows at most one variable-length repetition and rejects groups, alternation, and backreferences; express AND/OR with all/any. The highest-priority match wins; equal priorities keep the earlier rule. Save validates every rule before replacing the active set.",
+          agentRulesGuideTitle: "JSON format and example",
+          agentRulesGuideIntro: "Enter one object with version 1 and a rules array. Each rule needs the required fields listed below plus at least one matcher.",
+          agentRulesGuideFields: "Required fields: id (unique name), state (working, waiting, idle, or skip), priority (higher wins), and region. lines is also required when region is bottom_non_empty.",
+          agentRulesGuideMatchers: "Matchers: contains and regex test the selected region; lineRegex tests each line. Combine matcher objects with all, any, and not.",
+          agentRulesGuideRegions: "Regions: osc_title checks the terminal title, whole_recent checks the recent screen, bottom_non_empty checks the last non-empty lines, and last_non_empty checks only the final non-empty line.",
+          agentRulesGuideExample: `{
+  "version": 1,
+  "rules": [
+    {
+      "id": "waiting_for_confirmation",
+      "state": "waiting",
+      "priority": 900,
+      "region": "bottom_non_empty",
+      "lines": 12,
+      "contains": ["enter to confirm"],
+      "not": [{ "contains": ["finished"] }]
+    }
+  ]
+}`,
+          agentRulesSave: "Validate and save",
+          agentRulesReset: "Use built-in rules",
+          agentRulesSaving: "Validating and saving…",
+          agentRulesSourceDefault: "Source: built-in rules",
+          agentRulesSourceSaved: "Source: saved rules (active immediately)"
         },
         annotations: {
           title: "Code annotations",
@@ -44010,7 +44815,12 @@ ${formatErrorDetail(error2)}`);
           excludeNames: "完全に非表示にするファイル名またはディレクトリ名",
           excludeNamesHelp: "リスト中の名前に一致するファイル/ディレクトリを、サイドバー・検索結果・grep 結果から完全に消します。Skip と違い、名前自体が UI に出なくなります。gitignore方式のワイルドカード（*, ?, [abc], [!abc]）に対応しています。",
           reset: "デフォルトに戻す",
-          autosaveNote: "変更は自動で保存されます。",
+          save: "変更を保存",
+          saving: "保存しています…",
+          saved: "保存しました。",
+          unsaved: "未保存の変更があります。",
+          saveNote: "「変更を保存」を押すまで、編集内容は適用されません。",
+          watchLimitInvalid: (min, max) => `${min}〜${max}の整数を入力してください。`,
           scopeSource: (project, source) => `このブラウザのプロジェクト "${project}" に保存されます。ソース: ${source}。サイドバー、Ctrl+K、Ctrl+G、Datastores、File change watcher で使われます。「デフォルトに戻す」でブラウザ側の上書きを削除します。`,
           browserOverride: "ブラウザ側の上書き",
           serverDefault: "サーバ既定値",
@@ -44024,7 +44834,34 @@ ${formatErrorDetail(error2)}`);
           datastoreS3TooltipHelp: "S3 オブジェクト行にホバーすると、完全な key とコンテンツプレビューを表示します。",
           watchTitle: "ファイル変更の監視",
           watchLimit: "監視するディレクトリ数の上限",
-          watchLimitHelp: (defaultLimit) => `値を大きくすると深いツリーの変更を取りこぼしにくくなりますが、ファイルハンドル数を消費します。上の Skip リストと併用すると、重いフォルダ（node_modules, .git, dist など）を監視枠から外せます。既定値: ${defaultLimit}。`
+          watchLimitHelp: (defaultLimit) => `値を大きくすると深いツリーの変更を取りこぼしにくくなりますが、ファイルハンドル数を消費します。上の Skip リストと併用すると、重いフォルダ（node_modules, .git, dist など）を監視枠から外せます。既定値: ${defaultLimit}。`,
+          agentRulesTitle: "ターミナルのAI状態判定",
+          agentRulesLabel: "画面の一致ルール（JSON）",
+          agentRulesHelp: "各ルールで working（作業中）・waiting（入力待ち）・idle（待機中）・skip（状態を維持）を指定できます。priority、region、contains、regex、lineRegex、入れ子の all/any/not を編集できます。contains は大文字小文字を区別せず、regex は先頭の (?i) による大小無視に対応します。判定処理を止めないため、regex の可変長の繰返しは1個までで、グループ・選択・後方参照は使えません。AND/OR は all/any で表します。優先度が最大の一致が採用され、同点は上にあるルールが優先されます。保存前に全ルールを検証します。",
+          agentRulesGuideTitle: "JSONの書式と入力例",
+          agentRulesGuideIntro: "version が 1、rules が配列のJSONオブジェクトを入力します。各ルールには下記の必須項目と、1個以上の一致条件が必要です。",
+          agentRulesGuideFields: "必須項目: id（一意の名前）、state（working / waiting / idle / skip）、priority（大きい値を優先）、region。region が bottom_non_empty の場合は lines も必要です。",
+          agentRulesGuideMatchers: "一致条件: contains と regex は選択した領域全体、lineRegex は各行を調べます。一致条件のオブジェクトは all / any / not で組み合わせられます。",
+          agentRulesGuideRegions: "region: osc_title はターミナルタイトル、whole_recent は直近の画面全体、bottom_non_empty は末尾の非空行、last_non_empty は最後の非空行だけを調べます。",
+          agentRulesGuideExample: `{
+  "version": 1,
+  "rules": [
+    {
+      "id": "waiting_for_confirmation",
+      "state": "waiting",
+      "priority": 900,
+      "region": "bottom_non_empty",
+      "lines": 12,
+      "contains": ["enter to confirm"],
+      "not": [{ "contains": ["finished"] }]
+    }
+  ]
+}`,
+          agentRulesSave: "検証して保存",
+          agentRulesReset: "組み込みルールに戻す",
+          agentRulesSaving: "検証して保存しています…",
+          agentRulesSourceDefault: "適用中: 組み込みルール",
+          agentRulesSourceSaved: "適用中: 保存したルール（即時反映）"
         },
         annotations: {
           title: "コード注釈",
@@ -44403,12 +45240,6 @@ ${formatErrorDetail(error2)}`);
       const target = sourceTargetFromRoute();
       if (target) renderRepoBlobSidebar(target.path, target.ref || "worktree");
     }
-    function saveSidebarFontSize(value) {
-      const next = normalizeViewerFontSize(value);
-      mergeLocalSettings({ sidebarFontSize: next });
-      applySidebarFontSize();
-      patchSettings({ sidebarFontSize: next });
-    }
     const CODE_FONT_STEPS = [
       "compact",
       "regular",
@@ -44437,22 +45268,6 @@ ${formatErrorDetail(error2)}`);
       applyCodeFontSize();
       patchSettings({ codeFontSize: next });
     }
-    function saveUploadEnabled(checked) {
-      mergeLocalSettings({ uploadEnabled: checked });
-      patchSettings({ uploadEnabled: checked });
-    }
-    function saveScopeOmitDirsField(value) {
-      const next = normalizeScopeOmitDirs(value);
-      mergeLocalSettings({ scopeOmitDirs: next });
-      patchSettings({ scopeOmitDirs: next });
-      refreshRepositoryTreeAfterSettings();
-    }
-    function saveScopeExcludeNamesField(value) {
-      const next = normalizeScopeExcludeNames(value);
-      mergeLocalSettings({ scopeExcludeNames: next });
-      patchSettings({ scopeExcludeNames: next });
-      refreshRepositoryTreeAfterSettings();
-    }
     function normalizeScopeWatchLimit(value) {
       const parsed = typeof value === "number" ? value : typeof value === "string" ? Number(value) : Number.NaN;
       if (!Number.isFinite(parsed)) return null;
@@ -44467,34 +45282,94 @@ ${formatErrorDetail(error2)}`);
       const saved = normalizeScopeWatchLimit(APP_SETTINGS.scopeWatchLimit);
       return saved ?? SERVER_SCOPE_WATCH_LIMIT_DEFAULT;
     }
-    function saveScopeWatchLimitField(value) {
-      const next = normalizeScopeWatchLimit(value);
-      const resolved = next ?? SERVER_SCOPE_WATCH_LIMIT_DEFAULT;
-      mergeLocalSettings({ scopeWatchLimit: resolved });
-      patchSettings({ scopeWatchLimit: resolved });
-    }
-    function resetScopeSettings() {
-      setViewerLanguage("en", false);
-      mergeLocalSettings({
-        sidebarFontSize: null,
-        codeFontSize: null,
-        scopeOmitDirs: null,
-        scopeExcludeNames: null,
-        scopeWatchLimit: null,
-        uploadEnabled: null
-      });
-      applySidebarFontSize("regular");
-      applyCodeFontSize("regular");
-      patchSettings({
-        language: STATE.language,
-        sidebarFontSize: null,
-        codeFontSize: null,
-        scopeOmitDirs: null,
-        scopeExcludeNames: null,
-        scopeWatchLimit: null,
-        uploadEnabled: null
-      });
-      refreshRepositoryTreeAfterSettings();
+    function defaultViewerSettingsDraft() {
+      return {
+        language: "en",
+        sidebarFontSize: "regular",
+        codeFontSize: "regular",
+        omitDirs: serverScopeOmitDirsDefault().join("\n"),
+        excludeNames: serverScopeExcludeNamesDefault().join("\n"),
+        watchLimit: SERVER_SCOPE_WATCH_LIMIT_DEFAULT,
+        uploadEnabled: true,
+        inferFkRails: false,
+        s3TooltipEnabled: true
+      };
+    }
+    async function saveViewerSettings(draft, options) {
+      const normalizedLanguage = normalizeViewerLanguage(draft.language);
+      const normalizedSidebarFontSize = normalizeViewerFontSize(
+        draft.sidebarFontSize
+      );
+      const normalizedCodeFontSize = normalizeViewerFontSize(draft.codeFontSize);
+      const normalizedOmitDirs = normalizeScopeOmitDirs(draft.omitDirs);
+      const normalizedExcludeNames = normalizeScopeExcludeNames(
+        draft.excludeNames
+      );
+      const normalized = {
+        language: normalizedLanguage,
+        sidebarFontSize: normalizedSidebarFontSize,
+        codeFontSize: normalizedCodeFontSize,
+        omitDirs: normalizedOmitDirs.join("\n"),
+        excludeNames: normalizedExcludeNames.join("\n"),
+        watchLimit: normalizeScopeWatchLimit(draft.watchLimit) ?? SERVER_SCOPE_WATCH_LIMIT_DEFAULT,
+        uploadEnabled: draft.uploadEnabled,
+        inferFkRails: draft.inferFkRails,
+        s3TooltipEnabled: draft.s3TooltipEnabled
+      };
+      const changed = new Set(options.changedFields);
+      const appPatch = {};
+      const dbPrefsPatch = {};
+      if (options.restoreDefaults) {
+        Object.assign(appPatch, {
+          language: "en",
+          sidebarFontSize: null,
+          codeFontSize: null,
+          scopeOmitDirs: null,
+          scopeExcludeNames: null,
+          scopeWatchLimit: null,
+          uploadEnabled: null
+        });
+        dbPrefsPatch.inferFkRails = null;
+        dbPrefsPatch.s3TooltipEnabled = null;
+      } else {
+        if (changed.has("language")) appPatch.language = normalizedLanguage;
+        if (changed.has("sidebarFontSize"))
+          appPatch.sidebarFontSize = normalizedSidebarFontSize;
+        if (changed.has("codeFontSize"))
+          appPatch.codeFontSize = normalizedCodeFontSize;
+        if (changed.has("omitDirs")) appPatch.scopeOmitDirs = normalizedOmitDirs;
+        if (changed.has("excludeNames"))
+          appPatch.scopeExcludeNames = normalizedExcludeNames;
+        if (changed.has("watchLimit"))
+          appPatch.scopeWatchLimit = normalized.watchLimit;
+        if (changed.has("uploadEnabled"))
+          appPatch.uploadEnabled = normalized.uploadEnabled;
+        if (changed.has("inferFkRails"))
+          dbPrefsPatch.inferFkRails = normalized.inferFkRails;
+        if (changed.has("s3TooltipEnabled"))
+          dbPrefsPatch.s3TooltipEnabled = normalized.s3TooltipEnabled;
+      }
+      const operations = [];
+      if (Object.keys(appPatch).length > 0)
+        operations.push(persistSettingsPatch(appPatch));
+      if (Object.keys(dbPrefsPatch).length > 0)
+        operations.push(DATABASE_VIEW.saveDbUiPrefs(dbPrefsPatch));
+      const results = await Promise.allSettled(operations);
+      const errors2 = results.flatMap(
+        (result) => result.status === "rejected" ? [result.reason] : []
+      );
+      if (errors2.length > 0) {
+        throw errorWithCauses("save viewer settings failed", errors2);
+      }
+      if (options.restoreDefaults || changed.has("language"))
+        setViewerLanguage(normalizedLanguage, false);
+      if (options.restoreDefaults || changed.has("sidebarFontSize"))
+        applySidebarFontSize();
+      if (options.restoreDefaults || changed.has("codeFontSize"))
+        applyCodeFontSize();
+      if (options.restoreDefaults || changed.has("omitDirs") || changed.has("excludeNames")) {
+        refreshRepositoryTreeAfterSettings();
+      }
     }
     function createRefSelectorInput(options) {
       const wrap = document.createElement("div");
@@ -45006,30 +45881,22 @@ ${formatErrorDetail(error2)}`);
         scopeSource: uiText().settings.scopeSource(
           PROJECT_NAME || "default",
           scopeOmitSourceLabel()
-        )
+        ),
+        agentRulesJson: AGENT_SCREEN_RULES,
+        agentRulesSource: AGENT_SCREEN_RULES_SOURCE,
+        agentRulesErrors: agentScreenRuleErrorsText(AGENT_SCREEN_RULE_ERRORS)
       }),
+      getDefaultValues: defaultViewerSettingsDraft,
       refresh: async () => {
-        await loadSettings();
-      },
-      onLanguageChange: (value) => {
-        setViewerLanguage(normalizeViewerLanguage(value));
-        VIEWER_SETTINGS.sync();
-      },
-      onSidebarFontSizeChange: saveSidebarFontSize,
-      onCodeFontSizeChange: saveCodeFontSize,
-      onUploadEnabledChange: saveUploadEnabled,
-      onOmitDirsChange: (value) => {
-        saveScopeOmitDirsField(value);
-        VIEWER_SETTINGS.sync();
-      },
-      onExcludeNamesChange: (value) => {
-        saveScopeExcludeNamesField(value);
-        VIEWER_SETTINGS.sync();
+        await Promise.all([
+          loadSettings(),
+          loadAgentScreenRules(),
+          DATABASE_VIEW.loadDbUiPrefs()
+        ]);
       },
-      onWatchLimitChange: saveScopeWatchLimitField,
-      onInferFkChange: (checked) => DATABASE_VIEW.setDbUiPref("inferFkRails", checked),
-      onS3TooltipChange: (checked) => DATABASE_VIEW.setDbUiPref("s3TooltipEnabled", checked),
-      onReset: resetScopeSettings
+      onSave: saveViewerSettings,
+      onAgentRulesSave: saveAgentScreenRules,
+      onAgentRulesReset: resetAgentScreenRuleSettings
     });
     relocalizeViewerSettings = () => VIEWER_SETTINGS.localize();
     const KEYBINDING_EDITOR = createHelpKeybindingEditor({