@him666233/dsh-inline-diff 1.3.0 → 1.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.en.md +28 -9
- package/README.md +28 -9
- package/client.js +2665 -337
- package/index.js +1509 -740
- package/package.json +1 -1
package/client.js
CHANGED
|
@@ -1583,10 +1583,213 @@ __export(index_exports, {
|
|
|
1583
1583
|
inject: () => inject
|
|
1584
1584
|
});
|
|
1585
1585
|
module.exports = __toCommonJS(index_exports);
|
|
1586
|
-
var
|
|
1586
|
+
var import_react7 = require("react");
|
|
1587
|
+
|
|
1588
|
+
// src/client/api.js
|
|
1589
|
+
var API_PREFIX = "/dsh-inline-diff/api";
|
|
1590
|
+
function resolveApiPath(action, baseUri = typeof document !== "undefined" ? document.baseURI : void 0) {
|
|
1591
|
+
const suffix = String(action ?? "").replace(/^\/+/, "");
|
|
1592
|
+
const rootPath = `${API_PREFIX}/${suffix}`;
|
|
1593
|
+
if (typeof baseUri !== "string" || baseUri === "") return rootPath;
|
|
1594
|
+
try {
|
|
1595
|
+
const base = new URL(baseUri);
|
|
1596
|
+
const dir = base.pathname.endsWith("/") ? base.pathname : base.pathname.slice(0, base.pathname.lastIndexOf("/") + 1);
|
|
1597
|
+
return `${dir}${API_PREFIX.replace(/^\/+/, "")}/${suffix}`.replace(/\/{2,}/g, "/");
|
|
1598
|
+
} catch {
|
|
1599
|
+
return rootPath;
|
|
1600
|
+
}
|
|
1601
|
+
}
|
|
1602
|
+
var TIMEOUT_MS = 1e4;
|
|
1603
|
+
async function call(action, payload2) {
|
|
1604
|
+
const controller = new AbortController();
|
|
1605
|
+
const timer = setTimeout(() => controller.abort(), TIMEOUT_MS);
|
|
1606
|
+
try {
|
|
1607
|
+
const response = await fetch(resolveApiPath(action), {
|
|
1608
|
+
method: "POST",
|
|
1609
|
+
headers: { "content-type": "application/json" },
|
|
1610
|
+
body: JSON.stringify(payload2 ?? {}),
|
|
1611
|
+
signal: controller.signal
|
|
1612
|
+
});
|
|
1613
|
+
if (!response.ok) return null;
|
|
1614
|
+
const data = await response.json();
|
|
1615
|
+
return data !== null && typeof data === "object" ? data : null;
|
|
1616
|
+
} catch {
|
|
1617
|
+
return null;
|
|
1618
|
+
} finally {
|
|
1619
|
+
clearTimeout(timer);
|
|
1620
|
+
}
|
|
1621
|
+
}
|
|
1622
|
+
async function fetchSnapshot(sessionId, callId) {
|
|
1623
|
+
if (typeof sessionId !== "string" || sessionId === "" || callId === void 0 || callId === null) return null;
|
|
1624
|
+
const data = await call("snapshot", { sessionId, callId: String(callId) });
|
|
1625
|
+
if (data === null || data.ok !== true) return null;
|
|
1626
|
+
const snapshot = data.snapshot;
|
|
1627
|
+
if (snapshot === null || typeof snapshot !== "object") return null;
|
|
1628
|
+
if (typeof snapshot.after !== "string") return null;
|
|
1629
|
+
return {
|
|
1630
|
+
path: typeof snapshot.path === "string" ? snapshot.path : "",
|
|
1631
|
+
before: typeof snapshot.before === "string" ? snapshot.before : null,
|
|
1632
|
+
after: snapshot.after,
|
|
1633
|
+
operation: typeof snapshot.operation === "string" ? snapshot.operation : snapshot.before === null ? "create" : "update"
|
|
1634
|
+
};
|
|
1635
|
+
}
|
|
1636
|
+
async function fetchFileText(cwd, path) {
|
|
1637
|
+
if (typeof cwd !== "string" || cwd === "" || typeof path !== "string" || path === "") return null;
|
|
1638
|
+
const data = await call("read", { cwd, path });
|
|
1639
|
+
if (data === null || data.ok !== true) return null;
|
|
1640
|
+
if (data.kind === "text" && typeof data.text === "string") return { kind: "text", text: data.text, size: data.size };
|
|
1641
|
+
if (data.kind === "binary") return { kind: "binary", size: data.size };
|
|
1642
|
+
if (data.kind === "oversized") return { kind: "oversized", size: data.size };
|
|
1643
|
+
return null;
|
|
1644
|
+
}
|
|
1645
|
+
async function fetchToolNames() {
|
|
1646
|
+
const controller = new AbortController();
|
|
1647
|
+
const timer = setTimeout(() => controller.abort(), TIMEOUT_MS);
|
|
1648
|
+
try {
|
|
1649
|
+
const response = await fetch(resolveApiPath("tools"), {
|
|
1650
|
+
credentials: "include",
|
|
1651
|
+
signal: controller.signal,
|
|
1652
|
+
headers: { accept: "application/json" }
|
|
1653
|
+
});
|
|
1654
|
+
if (!response.ok) return null;
|
|
1655
|
+
const data = await response.json();
|
|
1656
|
+
if (data === null || typeof data !== "object" || data.ok !== true || !Array.isArray(data.tools)) return null;
|
|
1657
|
+
const names = [];
|
|
1658
|
+
for (const name of data.tools) {
|
|
1659
|
+
if (typeof name === "string" && name !== "" && name.length <= 200) names.push(name);
|
|
1660
|
+
}
|
|
1661
|
+
return names;
|
|
1662
|
+
} catch {
|
|
1663
|
+
return null;
|
|
1664
|
+
} finally {
|
|
1665
|
+
clearTimeout(timer);
|
|
1666
|
+
}
|
|
1667
|
+
}
|
|
1668
|
+
async function fetchReadRoots() {
|
|
1669
|
+
const controller = new AbortController();
|
|
1670
|
+
const timer = setTimeout(() => controller.abort(), TIMEOUT_MS);
|
|
1671
|
+
try {
|
|
1672
|
+
const response = await fetch(resolveApiPath("read-roots"), {
|
|
1673
|
+
credentials: "include",
|
|
1674
|
+
signal: controller.signal,
|
|
1675
|
+
headers: { accept: "application/json" }
|
|
1676
|
+
});
|
|
1677
|
+
if (!response.ok) return null;
|
|
1678
|
+
const data = await response.json();
|
|
1679
|
+
if (data === null || typeof data !== "object" || data.ok !== true || !Array.isArray(data.roots)) return null;
|
|
1680
|
+
return {
|
|
1681
|
+
roots: data.roots.filter((root) => typeof root === "string" && root !== ""),
|
|
1682
|
+
max: Number.isInteger(data.max) && data.max > 0 ? data.max : 12
|
|
1683
|
+
};
|
|
1684
|
+
} catch {
|
|
1685
|
+
return null;
|
|
1686
|
+
} finally {
|
|
1687
|
+
clearTimeout(timer);
|
|
1688
|
+
}
|
|
1689
|
+
}
|
|
1690
|
+
async function saveReadRoots(roots) {
|
|
1691
|
+
const controller = new AbortController();
|
|
1692
|
+
const timer = setTimeout(() => controller.abort(), 15e3);
|
|
1693
|
+
try {
|
|
1694
|
+
const response = await fetch(resolveApiPath("read-roots"), {
|
|
1695
|
+
method: "POST",
|
|
1696
|
+
credentials: "include",
|
|
1697
|
+
signal: controller.signal,
|
|
1698
|
+
headers: { "content-type": "application/json", accept: "application/json" },
|
|
1699
|
+
body: JSON.stringify({ roots: Array.isArray(roots) ? roots : [] })
|
|
1700
|
+
});
|
|
1701
|
+
const data = await response.json().catch(() => null);
|
|
1702
|
+
if (data === null || typeof data !== "object") return null;
|
|
1703
|
+
if (data.ok === true && Array.isArray(data.roots)) {
|
|
1704
|
+
return { ok: true, roots: data.roots.filter((root) => typeof root === "string" && root !== "") };
|
|
1705
|
+
}
|
|
1706
|
+
return { ok: false, code: typeof data.code === "string" ? data.code : "invalid-roots" };
|
|
1707
|
+
} catch {
|
|
1708
|
+
return null;
|
|
1709
|
+
} finally {
|
|
1710
|
+
clearTimeout(timer);
|
|
1711
|
+
}
|
|
1712
|
+
}
|
|
1713
|
+
var FILE_CACHE_LIMIT = 24;
|
|
1714
|
+
var FILE_CACHE_TTL = 15e3;
|
|
1715
|
+
var fileCache = /* @__PURE__ */ new Map();
|
|
1716
|
+
function trimCache(map, limit) {
|
|
1717
|
+
while (map.size > limit) {
|
|
1718
|
+
const oldest = map.keys().next().value;
|
|
1719
|
+
if (oldest === void 0) break;
|
|
1720
|
+
map.delete(oldest);
|
|
1721
|
+
}
|
|
1722
|
+
}
|
|
1723
|
+
async function cachedFileText(cwd, path) {
|
|
1724
|
+
const key = `${cwd ?? ""}\0${path ?? ""}`;
|
|
1725
|
+
const now = Date.now();
|
|
1726
|
+
const hit = fileCache.get(key);
|
|
1727
|
+
if (hit !== void 0 && now - hit.at < FILE_CACHE_TTL) {
|
|
1728
|
+
fileCache.delete(key);
|
|
1729
|
+
fileCache.set(key, hit);
|
|
1730
|
+
return hit.value;
|
|
1731
|
+
}
|
|
1732
|
+
const value = await fetchFileText(cwd, path);
|
|
1733
|
+
fileCache.set(key, { value, at: now });
|
|
1734
|
+
trimCache(fileCache, FILE_CACHE_LIMIT);
|
|
1735
|
+
return value;
|
|
1736
|
+
}
|
|
1737
|
+
var SNAPSHOT_CACHE_LIMIT = 160;
|
|
1738
|
+
var snapshotCache = /* @__PURE__ */ new Map();
|
|
1739
|
+
async function cachedSnapshot(sessionId, callId) {
|
|
1740
|
+
const key = `${sessionId ?? ""}\0${callId ?? ""}`;
|
|
1741
|
+
if (snapshotCache.has(key)) return snapshotCache.get(key) ?? null;
|
|
1742
|
+
let snapshot = await fetchSnapshot(sessionId, callId);
|
|
1743
|
+
if (snapshot === null) {
|
|
1744
|
+
await new Promise((resolve) => setTimeout(resolve, 180));
|
|
1745
|
+
snapshot = await fetchSnapshot(sessionId, callId);
|
|
1746
|
+
}
|
|
1747
|
+
snapshotCache.set(key, snapshot);
|
|
1748
|
+
trimCache(snapshotCache, SNAPSHOT_CACHE_LIMIT);
|
|
1749
|
+
return snapshot;
|
|
1750
|
+
}
|
|
1751
|
+
async function fetchUpdateInfo(refresh) {
|
|
1752
|
+
const controller = new AbortController();
|
|
1753
|
+
const timer = setTimeout(() => controller.abort(), 25e3);
|
|
1754
|
+
try {
|
|
1755
|
+
const suffix = refresh === true ? "?refresh=1" : "";
|
|
1756
|
+
const response = await fetch(`${resolveApiPath("update/versions")}${suffix}`, {
|
|
1757
|
+
credentials: "include",
|
|
1758
|
+
signal: controller.signal,
|
|
1759
|
+
headers: { accept: "application/json" }
|
|
1760
|
+
});
|
|
1761
|
+
if (!response.ok) return null;
|
|
1762
|
+
const data = await response.json();
|
|
1763
|
+
return data !== null && typeof data === "object" && data.ok === true ? data : null;
|
|
1764
|
+
} catch {
|
|
1765
|
+
return null;
|
|
1766
|
+
} finally {
|
|
1767
|
+
clearTimeout(timer);
|
|
1768
|
+
}
|
|
1769
|
+
}
|
|
1770
|
+
async function performUpdate(version) {
|
|
1771
|
+
const controller = new AbortController();
|
|
1772
|
+
const timer = setTimeout(() => controller.abort(), 26e4);
|
|
1773
|
+
try {
|
|
1774
|
+
const response = await fetch(resolveApiPath("update/install"), {
|
|
1775
|
+
method: "POST",
|
|
1776
|
+
credentials: "include",
|
|
1777
|
+
signal: controller.signal,
|
|
1778
|
+
headers: { "content-type": "application/json", accept: "application/json" },
|
|
1779
|
+
body: JSON.stringify({ version })
|
|
1780
|
+
});
|
|
1781
|
+
if (!response.ok) return null;
|
|
1782
|
+
const data = await response.json();
|
|
1783
|
+
return data !== null && typeof data === "object" ? data : null;
|
|
1784
|
+
} catch {
|
|
1785
|
+
return null;
|
|
1786
|
+
} finally {
|
|
1787
|
+
clearTimeout(timer);
|
|
1788
|
+
}
|
|
1789
|
+
}
|
|
1587
1790
|
|
|
1588
1791
|
// src/client/enhanced-shell.jsx
|
|
1589
|
-
var
|
|
1792
|
+
var import_react4 = require("react");
|
|
1590
1793
|
|
|
1591
1794
|
// src/client/diff.js
|
|
1592
1795
|
var CONTEXT_LINES = 3;
|
|
@@ -2479,6 +2682,16 @@ function exceedsAlignBudget(beforeText, afterText) {
|
|
|
2479
2682
|
const newMetric = measureTextBudget(afterText);
|
|
2480
2683
|
return oldMetric.lines > ALIGN_MAX_SIDE_LINES || newMetric.lines > ALIGN_MAX_SIDE_LINES || oldMetric.lines * newMetric.lines > ALIGN_MAX_CELLS || exceedsMaterializationBudget([oldMetric, newMetric]);
|
|
2481
2684
|
}
|
|
2685
|
+
function sameContentAfterEolNormalization(left, right) {
|
|
2686
|
+
if (left === right) return true;
|
|
2687
|
+
const leftLines = contentLines(left);
|
|
2688
|
+
const rightLines = contentLines(right);
|
|
2689
|
+
if (leftLines.length !== rightLines.length) return false;
|
|
2690
|
+
for (let index = 0; index < leftLines.length; index += 1) {
|
|
2691
|
+
if (leftLines[index] !== rightLines[index]) return false;
|
|
2692
|
+
}
|
|
2693
|
+
return true;
|
|
2694
|
+
}
|
|
2482
2695
|
function buildCardModel({ block, toolName, cwd, home, snapshot, fileText, loading }) {
|
|
2483
2696
|
const call2 = deriveCall(block);
|
|
2484
2697
|
const resolvedToolName = resolveToolName(call2, toolName);
|
|
@@ -2518,6 +2731,9 @@ function buildCardModel({ block, toolName, cwd, home, snapshot, fileText, loadin
|
|
|
2518
2731
|
if (before !== null && before === after) {
|
|
2519
2732
|
return { ...base, status: "nochange", operation, source: "snapshot", diff: diffText(before, after) };
|
|
2520
2733
|
}
|
|
2734
|
+
if (before !== null && !overMaterialization && sameContentAfterEolNormalization(before, after)) {
|
|
2735
|
+
return { ...base, status: "nochange", operation, source: "snapshot", diff: diffText(before, after) };
|
|
2736
|
+
}
|
|
2521
2737
|
if (overMaterialization || before !== null && exceedsAlignBudget(before, after)) {
|
|
2522
2738
|
const oldCount = oldMetric.lines;
|
|
2523
2739
|
const newCount = newMetric.lines;
|
|
@@ -2629,9 +2845,163 @@ function pulsePhase(key) {
|
|
|
2629
2845
|
}
|
|
2630
2846
|
return `${-(hash % PULSE_DURATION_MS)}ms`;
|
|
2631
2847
|
}
|
|
2848
|
+
var PULSE_ANIMATION_NAMES = Object.freeze(["dsh-inline-diff-pulse", "dsh-inline-diff-bar-pulse"]);
|
|
2849
|
+
function isPulseAnimation(animation) {
|
|
2850
|
+
const name = animation?.animationName;
|
|
2851
|
+
return typeof name === "string" && PULSE_ANIMATION_NAMES.includes(name);
|
|
2852
|
+
}
|
|
2853
|
+
function syncPulseAnimations(root) {
|
|
2854
|
+
if (root === null || root === void 0 || typeof root.getAnimations !== "function") return false;
|
|
2855
|
+
let animations;
|
|
2856
|
+
try {
|
|
2857
|
+
animations = root.getAnimations({ subtree: true });
|
|
2858
|
+
} catch {
|
|
2859
|
+
return false;
|
|
2860
|
+
}
|
|
2861
|
+
const pulses = animations.filter((animation) => isPulseAnimation(animation) && typeof animation.startTime === "number");
|
|
2862
|
+
if (pulses.length < 2) return false;
|
|
2863
|
+
let base = Infinity;
|
|
2864
|
+
for (const animation of pulses) if (animation.startTime < base) base = animation.startTime;
|
|
2865
|
+
if (!Number.isFinite(base)) return false;
|
|
2866
|
+
let aligned = false;
|
|
2867
|
+
for (const animation of pulses) {
|
|
2868
|
+
if (animation.startTime === base) continue;
|
|
2869
|
+
try {
|
|
2870
|
+
animation.startTime = base;
|
|
2871
|
+
aligned = true;
|
|
2872
|
+
} catch {
|
|
2873
|
+
}
|
|
2874
|
+
}
|
|
2875
|
+
return aligned || pulses.length >= 2;
|
|
2876
|
+
}
|
|
2877
|
+
function isLiveToolState(state2) {
|
|
2878
|
+
return state2 === "running" || state2 === "preparing";
|
|
2879
|
+
}
|
|
2880
|
+
|
|
2881
|
+
// src/client/surfaces.js
|
|
2882
|
+
var EFFECT_NATIVE = "native";
|
|
2883
|
+
var EFFECT_GLASS = "glass";
|
|
2884
|
+
var EFFECT_LIQUID = "liquid";
|
|
2885
|
+
var EFFECTS = Object.freeze([EFFECT_NATIVE, EFFECT_GLASS, EFFECT_LIQUID]);
|
|
2886
|
+
var LIQUID_CLEAR = "clear";
|
|
2887
|
+
var LIQUID_FROSTED = "frosted";
|
|
2888
|
+
var LIQUID_MODES = Object.freeze([LIQUID_CLEAR, LIQUID_FROSTED]);
|
|
2889
|
+
var FX_LIMITS = Object.freeze({
|
|
2890
|
+
opacityMin: 0.05,
|
|
2891
|
+
opacityMax: 1,
|
|
2892
|
+
opacityStep: 0.05,
|
|
2893
|
+
blurMin: 0,
|
|
2894
|
+
blurMax: 40,
|
|
2895
|
+
blurStep: 1
|
|
2896
|
+
});
|
|
2897
|
+
var DEFAULT_EFFECT = Object.freeze({
|
|
2898
|
+
effect: EFFECT_NATIVE,
|
|
2899
|
+
opacity: 0.55,
|
|
2900
|
+
blur: 14,
|
|
2901
|
+
mode: LIQUID_FROSTED
|
|
2902
|
+
});
|
|
2903
|
+
var SURFACES = Object.freeze([
|
|
2904
|
+
{ id: "fileCardHeader", labelKey: "fx.surface.fileCardHeader", descKey: "fx.surface.fileCardHeaderDesc" },
|
|
2905
|
+
{ id: "fileCardBody", labelKey: "fx.surface.fileCardBody", descKey: "fx.surface.fileCardBodyDesc" },
|
|
2906
|
+
{ id: "diffModal", labelKey: "fx.surface.diffModal", descKey: "fx.surface.diffModalDesc" },
|
|
2907
|
+
{ id: "commandHeader", labelKey: "fx.surface.commandHeader", descKey: "fx.surface.commandHeaderDesc" },
|
|
2908
|
+
{ id: "commandIO", labelKey: "fx.surface.commandIO", descKey: "fx.surface.commandIODesc" },
|
|
2909
|
+
{ id: "toolHeader", labelKey: "fx.surface.toolHeader", descKey: "fx.surface.toolHeaderDesc" },
|
|
2910
|
+
{ id: "toolIO", labelKey: "fx.surface.toolIO", descKey: "fx.surface.toolIODesc" },
|
|
2911
|
+
{ id: "readRangeChip", labelKey: "fx.surface.readRangeChip", descKey: "fx.surface.readRangeChipDesc" },
|
|
2912
|
+
{ id: "settingsPanel", labelKey: "fx.surface.settingsPanel", descKey: "fx.surface.settingsPanelDesc" }
|
|
2913
|
+
]);
|
|
2914
|
+
var SURFACE_IDS = Object.freeze(SURFACES.map((surface) => surface.id));
|
|
2915
|
+
function clampNumber(value, min, max, fallback) {
|
|
2916
|
+
const number = typeof value === "number" && Number.isFinite(value) ? value : fallback;
|
|
2917
|
+
if (number < min) return min;
|
|
2918
|
+
if (number > max) return max;
|
|
2919
|
+
return number;
|
|
2920
|
+
}
|
|
2921
|
+
function normalizeSurfaceEffect(value) {
|
|
2922
|
+
const source3 = value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
|
|
2923
|
+
const effect = EFFECTS.includes(source3.effect) ? source3.effect : DEFAULT_EFFECT.effect;
|
|
2924
|
+
const mode = LIQUID_MODES.includes(source3.mode) ? source3.mode : DEFAULT_EFFECT.mode;
|
|
2925
|
+
const opacity = clampNumber(source3.opacity, FX_LIMITS.opacityMin, FX_LIMITS.opacityMax, DEFAULT_EFFECT.opacity);
|
|
2926
|
+
const blur = clampNumber(source3.blur, FX_LIMITS.blurMin, FX_LIMITS.blurMax, DEFAULT_EFFECT.blur);
|
|
2927
|
+
return { effect, opacity, blur, mode };
|
|
2928
|
+
}
|
|
2929
|
+
function normalizeEffects(value) {
|
|
2930
|
+
const source3 = value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
|
|
2931
|
+
const next = {};
|
|
2932
|
+
for (const id of SURFACE_IDS) next[id] = normalizeSurfaceEffect(source3[id]);
|
|
2933
|
+
return next;
|
|
2934
|
+
}
|
|
2935
|
+
function defaultEffects() {
|
|
2936
|
+
return normalizeEffects(void 0);
|
|
2937
|
+
}
|
|
2938
|
+
function effectOf(settings, surfaceId) {
|
|
2939
|
+
const effects = settings !== null && settings !== void 0 ? settings.effects : void 0;
|
|
2940
|
+
const raw = effects !== null && effects !== void 0 ? effects[surfaceId] : void 0;
|
|
2941
|
+
if (raw === void 0) return DEFAULT_EFFECT;
|
|
2942
|
+
return normalizeSurfaceEffect(raw);
|
|
2943
|
+
}
|
|
2944
|
+
function surfaceProps(settings, surfaceId) {
|
|
2945
|
+
const config = effectOf(settings, surfaceId);
|
|
2946
|
+
const props = {
|
|
2947
|
+
"data-fx": config.effect,
|
|
2948
|
+
"data-fx-surface": surfaceId,
|
|
2949
|
+
style: {
|
|
2950
|
+
"--did-fx-alpha": String(config.opacity),
|
|
2951
|
+
"--did-fx-blur": `${config.blur}px`
|
|
2952
|
+
}
|
|
2953
|
+
};
|
|
2954
|
+
if (config.effect === EFFECT_LIQUID) props["data-liquid-mode"] = config.mode;
|
|
2955
|
+
return props;
|
|
2956
|
+
}
|
|
2957
|
+
function fxRootProps(settings, surfaceIds) {
|
|
2958
|
+
for (const id of surfaceIds) {
|
|
2959
|
+
if (effectOf(settings, id).effect !== EFFECT_NATIVE) return { "data-fx-root": "true" };
|
|
2960
|
+
}
|
|
2961
|
+
return {};
|
|
2962
|
+
}
|
|
2963
|
+
function surfaceDomValues(settings, surfaceId) {
|
|
2964
|
+
return effectOf(settings, surfaceId);
|
|
2965
|
+
}
|
|
2966
|
+
function backdropProxyProps(settings, surfaceId) {
|
|
2967
|
+
const config = effectOf(settings, surfaceId);
|
|
2968
|
+
if (config.effect === EFFECT_NATIVE) return {};
|
|
2969
|
+
const props = {
|
|
2970
|
+
"data-fx-backdrop": config.effect,
|
|
2971
|
+
style: { "--did-fx-blur": `${config.blur}px` }
|
|
2972
|
+
};
|
|
2973
|
+
if (config.effect === EFFECT_LIQUID) props["data-liquid-mode"] = config.mode;
|
|
2974
|
+
return props;
|
|
2975
|
+
}
|
|
2976
|
+
|
|
2977
|
+
// src/client/use-pulse-sync.js
|
|
2978
|
+
var import_react = require("react");
|
|
2979
|
+
var LATE_SYNC_MS = 320;
|
|
2980
|
+
function usePulseSync() {
|
|
2981
|
+
const ref = (0, import_react.useRef)(null);
|
|
2982
|
+
(0, import_react.useEffect)(() => {
|
|
2983
|
+
const root = ref.current;
|
|
2984
|
+
if (root === null) return void 0;
|
|
2985
|
+
syncPulseAnimations(root);
|
|
2986
|
+
let frame = null;
|
|
2987
|
+
let timer = null;
|
|
2988
|
+
const run = () => {
|
|
2989
|
+
syncPulseAnimations(root);
|
|
2990
|
+
};
|
|
2991
|
+
if (typeof requestAnimationFrame === "function") frame = requestAnimationFrame(run);
|
|
2992
|
+
else timer = setTimeout(run, 16);
|
|
2993
|
+
const late = setTimeout(run, LATE_SYNC_MS);
|
|
2994
|
+
return () => {
|
|
2995
|
+
if (frame !== null && typeof cancelAnimationFrame === "function") cancelAnimationFrame(frame);
|
|
2996
|
+
if (timer !== null) clearTimeout(timer);
|
|
2997
|
+
clearTimeout(late);
|
|
2998
|
+
};
|
|
2999
|
+
});
|
|
3000
|
+
return ref;
|
|
3001
|
+
}
|
|
2632
3002
|
|
|
2633
3003
|
// src/client/enhanced-tools.jsx
|
|
2634
|
-
var
|
|
3004
|
+
var import_react3 = require("react");
|
|
2635
3005
|
|
|
2636
3006
|
// src/client/tool-status.js
|
|
2637
3007
|
var INPUT_FAILURE_CODES = Object.freeze([
|
|
@@ -2731,13 +3101,14 @@ function shellSectionStates(call2, exitFailed) {
|
|
|
2731
3101
|
}
|
|
2732
3102
|
|
|
2733
3103
|
// src/client/use-settings.js
|
|
2734
|
-
var
|
|
3104
|
+
var import_react2 = require("react");
|
|
2735
3105
|
|
|
2736
3106
|
// src/client/locales.js
|
|
2737
3107
|
var NS = "inline-diff";
|
|
2738
3108
|
var SUPPORTED_LANGUAGES = Object.freeze(["zh", "en"]);
|
|
2739
3109
|
var LANGUAGE_SETTINGS = Object.freeze(["zh", "en", "auto"]);
|
|
2740
3110
|
var DEFAULT_LANGUAGE = "zh";
|
|
3111
|
+
var DEFAULT_LANGUAGE_SETTING = "auto";
|
|
2741
3112
|
var zh = {
|
|
2742
3113
|
"title.edit": "编辑",
|
|
2743
3114
|
"title.write": "写入",
|
|
@@ -2815,10 +3186,10 @@ var zh = {
|
|
|
2815
3186
|
// 插件级语言选择(1.3.0)。这一行的文案本身也按“当前插件语言”渲染,
|
|
2816
3187
|
// 因此切换语言后立刻就能看出效果。
|
|
2817
3188
|
"settings.language": "语言",
|
|
2818
|
-
"settings.languageDesc": "
|
|
3189
|
+
"settings.languageDesc": "插件界面的显示语言。默认「跟随 DSH」:DSH 为中文时显示中文,其他语言时显示英文;也可以固定中文/英文。切换后立即生效,无需刷新。",
|
|
2819
3190
|
"settings.languageZh": "中文",
|
|
2820
3191
|
"settings.languageEn": "English",
|
|
2821
|
-
"settings.languageAuto": "跟随 DSH",
|
|
3192
|
+
"settings.languageAuto": "跟随 DSH(默认)",
|
|
2822
3193
|
// 两个设置界面(设置页 + 设置弹窗)顶部展示的原创声明文案。
|
|
2823
3194
|
"originality.title": "原创声明",
|
|
2824
3195
|
"originality.body": "本项目(DSH Inline Diff)完全原创,与 {repo} 以及任何其他同名插件或仓库均无任何关联。部分功能雷同纯属巧合;实现方式与代码效果完全不同;开发时没有参考任何同类插件;本项目不是对方的衍生作品或复刻作品。",
|
|
@@ -2865,8 +3236,81 @@ var zh = {
|
|
|
2865
3236
|
"settings.subagentNote": "子代理会话与主会话共用这套设置;差异快照按各自 Session 独立记录,互不影响。",
|
|
2866
3237
|
"settings.dsmCurrent": "当前 DSH 对话记录模式:{mode}",
|
|
2867
3238
|
"settings.reset": "恢复默认",
|
|
3239
|
+
"settings.readRoots": "额外可读目录(工作区外)",
|
|
3240
|
+
"settings.readRootsDesc": "历史回放或 str_replace_editor 需要读取“当前文件”补齐行号;工作区外文件默认只显示修改块。这里添加的目录允许本插件的只读展示 API 读取其中的文本文件(≤2MB)。",
|
|
3241
|
+
"settings.readRootsNote": "目录保存在 Host(~/.dsh/dsh-inline-diff/read-roots.json),不会上传文件;只影响历史回放的当前文件读取。添加后同源脚本也能通过本插件读取该目录内的文本,请只添加可信目录。",
|
|
3242
|
+
"settings.readRootsPlaceholder": "例如 D:\\projects\\shared 或 /Users/me/projects",
|
|
3243
|
+
"settings.readRootsAdd": "添加目录",
|
|
3244
|
+
"settings.readRootsRemove": "移除",
|
|
3245
|
+
"settings.readRootsEmpty": "尚未添加任何目录",
|
|
3246
|
+
"settings.readRootsBusy": "保存中…",
|
|
3247
|
+
"settings.readRootsSaved": "已保存",
|
|
3248
|
+
"settings.readRootsError": "保存失败({code})",
|
|
3249
|
+
"settings.readRootsLimit": "最多 {max} 个目录",
|
|
3250
|
+
"update.title": "版本与更新",
|
|
3251
|
+
"update.current": "当前版本 v{version}",
|
|
3252
|
+
"update.latest": "最新",
|
|
3253
|
+
"update.installed": "当前",
|
|
3254
|
+
"update.deprecated": "已废弃",
|
|
3255
|
+
"update.unavailable": "不可安装",
|
|
3256
|
+
"update.check": "检查更新",
|
|
3257
|
+
"update.checking": "正在查询…",
|
|
3258
|
+
"update.versions": "版本列表",
|
|
3259
|
+
"update.selectVersion": "选择版本",
|
|
3260
|
+
"update.updateTo": "更新到 v{version}",
|
|
3261
|
+
"update.rollbackTo": "回退到 v{version}",
|
|
3262
|
+
"update.reinstall": "重新安装 v{version}",
|
|
3263
|
+
"update.installing": "正在安装…",
|
|
3264
|
+
"update.restartHint": "安装后需要重启 DSH 才会生效",
|
|
3265
|
+
"update.manualHint": "当前环境需手动安装(见下方命令)",
|
|
3266
|
+
"update.manualCommandHint": "请先完全退出 DSH,然后在命令行执行(profile:{profile})",
|
|
3267
|
+
"update.idleHint": "点击「检查更新」查看 npm 上的全部版本",
|
|
3268
|
+
"update.installOk": "已安装 v{version},重启 DSH 后生效",
|
|
3269
|
+
"update.installFailed": "安装失败({code})",
|
|
3270
|
+
"update.log": "安装日志",
|
|
3271
|
+
"update.errorNetwork": "无法获取版本信息(网络或 registry 不可用)",
|
|
2868
3272
|
"settings.saving": "正在保存…",
|
|
2869
3273
|
"settings.live": "设置自动生效",
|
|
3274
|
+
// ---- 逐表面外观效果(1.4.0)----
|
|
3275
|
+
// 设置面板末尾的「外观效果」折叠分组。表面 id → 文案键的映射在 surfaces.js
|
|
3276
|
+
// 的 SURFACES 里(labelKey / descKey),键名必须与那边完全一致。
|
|
3277
|
+
"fx.sectionTitle": "外观效果",
|
|
3278
|
+
"fx.sectionDesc": "为每个可视表面单独选择材质。原生保持现有外观(默认);磨砂玻璃为半透明高斯模糊材质,可调透明度与模糊;液态玻璃为 iOS 26 风格,另有「完全通透 / 带一点模糊」两种液态模式。改动即时保存并生效。",
|
|
3279
|
+
"fx.note": "玻璃效果依赖浏览器的 backdrop-filter,现代 Chromium / Safari 可用;不支持时会自动退回半透明底色,文字仍然可读。「恢复默认」会同时把所有表面恢复为原生。",
|
|
3280
|
+
// 折叠标题 = fx.sectionTitle + 下面两条(键里自带本语言习惯的括号,标题因此
|
|
3281
|
+
// 在两种语言下都是自然写法:「外观效果(3 个表面已启用)」)。
|
|
3282
|
+
"fx.summaryCount": "({n} 个表面已启用)",
|
|
3283
|
+
"fx.summaryNone": "(全部原生)",
|
|
3284
|
+
"fx.effect": "效果",
|
|
3285
|
+
"fx.effectNative": "原生",
|
|
3286
|
+
"fx.effectGlass": "磨砂玻璃",
|
|
3287
|
+
"fx.effectLiquid": "液态玻璃",
|
|
3288
|
+
"fx.effectNativeDesc": "保持当前外观,不做任何材质处理(默认)。",
|
|
3289
|
+
"fx.effectGlassDesc": "半透明磨砂玻璃:背景高斯模糊 + 细高光描边,透明度与模糊可调。",
|
|
3290
|
+
"fx.effectLiquidDesc": "液态玻璃:更通透的折射观感与边缘高光,可选「完全通透」或「带一点模糊」。",
|
|
3291
|
+
"fx.opacity": "透明度",
|
|
3292
|
+
"fx.blur": "模糊",
|
|
3293
|
+
"fx.liquidMode": "液态模式",
|
|
3294
|
+
"fx.liquidClear": "完全通透",
|
|
3295
|
+
"fx.liquidFrosted": "带一点模糊",
|
|
3296
|
+
"fx.surface.fileCardHeader": "文件卡片头部",
|
|
3297
|
+
"fx.surface.fileCardHeaderDesc": "文件修改卡片顶部可展开 / 收起的一行。",
|
|
3298
|
+
"fx.surface.fileCardBody": "文件卡片内容区",
|
|
3299
|
+
"fx.surface.fileCardBodyDesc": "文件修改卡片的差异内容与底部状态条。",
|
|
3300
|
+
"fx.surface.diffModal": "放大对照弹窗",
|
|
3301
|
+
"fx.surface.diffModalDesc": "在卡片上点「放大」后打开的整窗差异对照。",
|
|
3302
|
+
"fx.surface.commandHeader": "命令卡片头部",
|
|
3303
|
+
"fx.surface.commandHeaderDesc": "bash / pwsh 等命令执行卡片的标题行。",
|
|
3304
|
+
"fx.surface.commandIO": "命令 IN/OUT",
|
|
3305
|
+
"fx.surface.commandIODesc": "命令卡片的输入与输出面板。",
|
|
3306
|
+
"fx.surface.toolHeader": "工具卡片头部",
|
|
3307
|
+
"fx.surface.toolHeaderDesc": "其它工具调用卡片的标题行。",
|
|
3308
|
+
"fx.surface.toolIO": "工具 IN/OUT",
|
|
3309
|
+
"fx.surface.toolIODesc": "其它工具调用卡片的输入与输出面板。",
|
|
3310
|
+
"fx.surface.readRangeChip": "读取行范围徽标",
|
|
3311
|
+
"fx.surface.readRangeChipDesc": "读取文件时显示行范围的小徽标。",
|
|
3312
|
+
"fx.surface.settingsPanel": "设置面板",
|
|
3313
|
+
"fx.surface.settingsPanelDesc": "本设置弹窗与设置页的整个面板。",
|
|
2870
3314
|
"shell.in": "IN",
|
|
2871
3315
|
"shell.out": "OUT",
|
|
2872
3316
|
// 命令行退出码 / 信号徽标([exit code: N] 标记文本由 Host 产生,这里是 UI 文案)。
|
|
@@ -3006,10 +3450,10 @@ var en = {
|
|
|
3006
3450
|
"settings.description": "Presentation only: session records, model input, and tool execution are unchanged. The expanded style gives flat, transparent output — per-edit inline diffs for file changes and IN/OUT expanded by default for commands and other tools; DSH native keeps the stock presentation.",
|
|
3007
3451
|
// 插件级语言选择(1.3.0):英文界面下的同一组选项。
|
|
3008
3452
|
"settings.language": "Language",
|
|
3009
|
-
"settings.languageDesc": "Display language for this plugin. “Follow DSH” mirrors the DSH language setting: Chinese shows Chinese and any other language shows English. The switch applies immediately — no reload needed.",
|
|
3453
|
+
"settings.languageDesc": "Display language for this plugin. Default “Follow DSH” mirrors the DSH language setting: Chinese shows Chinese and any other language shows English; you can also pin Chinese or English. The switch applies immediately — no reload needed.",
|
|
3010
3454
|
"settings.languageZh": "中文",
|
|
3011
3455
|
"settings.languageEn": "English",
|
|
3012
|
-
"settings.languageAuto": "Follow DSH",
|
|
3456
|
+
"settings.languageAuto": "Follow DSH (default)",
|
|
3013
3457
|
// 两个设置界面(设置页 + 设置弹窗)顶部展示的原创声明文案(英文)。
|
|
3014
3458
|
"originality.title": "Originality",
|
|
3015
3459
|
"originality.body": "This project (DSH Inline Diff) is a fully original work and has no affiliation with {repo} or with any other plugin or repository of a similar name. Any similarity in functionality is purely coincidental; the implementation and code behavior are entirely different; no reference was made to any such plugin during development; and this project is neither a derivative nor a replica of it.",
|
|
@@ -3056,8 +3500,83 @@ var en = {
|
|
|
3056
3500
|
"settings.subagentNote": "Subagent sessions use the same settings; diff snapshots are recorded per Session and never interfere.",
|
|
3057
3501
|
"settings.dsmCurrent": "Current DSH transcript mode: {mode}",
|
|
3058
3502
|
"settings.reset": "Reset to defaults",
|
|
3503
|
+
"settings.readRoots": "Extra readable folders (outside workspace)",
|
|
3504
|
+
"settings.readRootsDesc": "History replay or str_replace_editor reads the current file to fill in line numbers; files outside the workspace otherwise stop at changed hunks. Folders added here allow this plugin’s read-only display API to read text files (≤2 MB) inside them.",
|
|
3505
|
+
"settings.readRootsNote": "The list is stored by the Host (~/.dsh/dsh-inline-diff/read-roots.json) and no files are uploaded; it only affects current-file reads for history replay. Same-origin scripts can also use this plugin to read those folders, so only add trusted directories.",
|
|
3506
|
+
"settings.readRootsPlaceholder": "e.g. D:\\projects\\shared or /Users/me/projects",
|
|
3507
|
+
"settings.readRootsAdd": "Add folder",
|
|
3508
|
+
"settings.readRootsRemove": "Remove",
|
|
3509
|
+
"settings.readRootsEmpty": "No folders added yet",
|
|
3510
|
+
"settings.readRootsBusy": "Saving…",
|
|
3511
|
+
"settings.readRootsSaved": "Saved",
|
|
3512
|
+
"settings.readRootsError": "Save failed ({code})",
|
|
3513
|
+
"settings.readRootsLimit": "At most {max} folders",
|
|
3514
|
+
"update.title": "Version & updates",
|
|
3515
|
+
"update.current": "Current version v{version}",
|
|
3516
|
+
"update.latest": "Latest",
|
|
3517
|
+
"update.installed": "Installed",
|
|
3518
|
+
"update.deprecated": "Deprecated",
|
|
3519
|
+
"update.unavailable": "Unavailable",
|
|
3520
|
+
"update.check": "Check for updates",
|
|
3521
|
+
"update.checking": "Checking…",
|
|
3522
|
+
"update.versions": "Version list",
|
|
3523
|
+
"update.selectVersion": "Select a version",
|
|
3524
|
+
"update.updateTo": "Update to v{version}",
|
|
3525
|
+
"update.rollbackTo": "Roll back to v{version}",
|
|
3526
|
+
"update.reinstall": "Reinstall v{version}",
|
|
3527
|
+
"update.installing": "Installing…",
|
|
3528
|
+
"update.restartHint": "Restart DSH after installing to take effect",
|
|
3529
|
+
"update.manualHint": "Manual install required here (see command below)",
|
|
3530
|
+
"update.manualCommandHint": "Quit DSH completely, then run in a terminal (profile: {profile})",
|
|
3531
|
+
"update.idleHint": "Click “Check for updates” to list all npm versions",
|
|
3532
|
+
"update.installOk": "Installed v{version}; restart DSH to take effect",
|
|
3533
|
+
"update.installFailed": "Install failed ({code})",
|
|
3534
|
+
"update.log": "Install log",
|
|
3535
|
+
"update.errorNetwork": "Could not load versions (network or registry unavailable)",
|
|
3059
3536
|
"settings.saving": "Saving…",
|
|
3060
3537
|
"settings.live": "Settings apply automatically",
|
|
3538
|
+
// ---- Per-surface appearance effects (1.4.0) ----
|
|
3539
|
+
// Labels/descriptions for the “Appearance effects” group at the end of the
|
|
3540
|
+
// settings panel. The surface id → key mapping lives in surfaces.js
|
|
3541
|
+
// (SURFACES[].labelKey / descKey) and must stay in sync with these keys.
|
|
3542
|
+
"fx.sectionTitle": "Appearance effects",
|
|
3543
|
+
"fx.sectionDesc": "Choose a material for each visible surface. Native keeps the current look (default). Frosted glass is a translucent, blurred material with adjustable opacity and blur. Liquid glass follows the iOS 26 look with its own Clear / Slightly frosted liquid modes. Changes save and apply immediately.",
|
|
3544
|
+
"fx.note": "Glass effects rely on the browser backdrop-filter, available in modern Chromium / Safari; unsupported browsers fall back to a translucent color so text stays readable. “Reset to defaults” also returns every surface to native.",
|
|
3545
|
+
// Collapsible title = fx.sectionTitle + one of these; the brackets live in the
|
|
3546
|
+
// translated string so both languages read naturally (“Appearance effects (3
|
|
3547
|
+
// surfaces enabled)”).
|
|
3548
|
+
"fx.summaryCount": " ({n} surfaces enabled)",
|
|
3549
|
+
"fx.summaryNone": " (all native)",
|
|
3550
|
+
"fx.effect": "Effect",
|
|
3551
|
+
"fx.effectNative": "Native",
|
|
3552
|
+
"fx.effectGlass": "Frosted glass",
|
|
3553
|
+
"fx.effectLiquid": "Liquid glass",
|
|
3554
|
+
"fx.effectNativeDesc": "Keeps the current look with no material treatment (default).",
|
|
3555
|
+
"fx.effectGlassDesc": "Translucent frosted glass: a blurred backdrop with a thin highlight edge; opacity and blur are adjustable.",
|
|
3556
|
+
"fx.effectLiquidDesc": "Liquid glass: a clearer, refractive look with edge highlights; choose Clear or Slightly frosted.",
|
|
3557
|
+
"fx.opacity": "Opacity",
|
|
3558
|
+
"fx.blur": "Blur",
|
|
3559
|
+
"fx.liquidMode": "Liquid mode",
|
|
3560
|
+
"fx.liquidClear": "Clear",
|
|
3561
|
+
"fx.liquidFrosted": "Slightly frosted",
|
|
3562
|
+
"fx.surface.fileCardHeader": "File card header",
|
|
3563
|
+
"fx.surface.fileCardHeaderDesc": "The clickable row at the top of a file-change card.",
|
|
3564
|
+
"fx.surface.fileCardBody": "File card body",
|
|
3565
|
+
"fx.surface.fileCardBodyDesc": "The diff content and footer status strip of a file-change card.",
|
|
3566
|
+
"fx.surface.diffModal": "Comparison dialog",
|
|
3567
|
+
"fx.surface.diffModalDesc": "The full-window diff view opened from a card.",
|
|
3568
|
+
"fx.surface.commandHeader": "Command card header",
|
|
3569
|
+
"fx.surface.commandHeaderDesc": "The title row of a command card (bash, pwsh, …).",
|
|
3570
|
+
"fx.surface.commandIO": "Command IN/OUT",
|
|
3571
|
+
"fx.surface.commandIODesc": "The input and output panels of a command card.",
|
|
3572
|
+
"fx.surface.toolHeader": "Tool card header",
|
|
3573
|
+
"fx.surface.toolHeaderDesc": "The title row of other tool-call cards.",
|
|
3574
|
+
"fx.surface.toolIO": "Tool IN/OUT",
|
|
3575
|
+
"fx.surface.toolIODesc": "The input and output panels of other tool-call cards.",
|
|
3576
|
+
"fx.surface.readRangeChip": "Read range chip",
|
|
3577
|
+
"fx.surface.readRangeChipDesc": "The small line-range chip shown for file reads.",
|
|
3578
|
+
"fx.surface.settingsPanel": "Settings panel",
|
|
3579
|
+
"fx.surface.settingsPanelDesc": "The whole settings dialog and settings page.",
|
|
3061
3580
|
"shell.in": "IN",
|
|
3062
3581
|
"shell.out": "OUT",
|
|
3063
3582
|
// 命令行退出码 / 信号徽标(英文)。
|
|
@@ -3124,20 +3643,32 @@ var en = {
|
|
|
3124
3643
|
var dicts = { zh, en };
|
|
3125
3644
|
|
|
3126
3645
|
// src/client/settings.js
|
|
3127
|
-
var STORAGE_KEY = "dsh-inline-diff.settings.
|
|
3128
|
-
var
|
|
3129
|
-
|
|
3130
|
-
|
|
3646
|
+
var STORAGE_KEY = "dsh-inline-diff.settings.v5";
|
|
3647
|
+
var LEGACY_KEYS = Object.freeze([
|
|
3648
|
+
"dsh-inline-diff.settings.v4",
|
|
3649
|
+
"dsh-inline-diff.settings.v3",
|
|
3650
|
+
"dsh-inline-diff.settings.v2"
|
|
3651
|
+
]);
|
|
3652
|
+
var RETIRED_KEYS = Object.freeze(["dsh-inline-diff.settings.v1"]);
|
|
3131
3653
|
var DEFAULTS = {
|
|
3132
3654
|
/**
|
|
3133
3655
|
* 插件级界面语言(1.3.0 新增):
|
|
3134
|
-
* '
|
|
3135
|
-
*
|
|
3656
|
+
* 'auto'(默认)跟随 DSH 全局语言(DSH 中文→中文,其它语言→英文);
|
|
3657
|
+
* 'zh' 固定中文;'en' 固定英文。
|
|
3136
3658
|
* 这是插件自己的显示偏好,与 DSH 的全局 locale 相互独立:客户端文案从
|
|
3137
3659
|
* src/client/locales.js 取字典,由插件语言选择;宿主渲染的 slot label 在
|
|
3138
|
-
*
|
|
3660
|
+
* 语言变化时重新注册。
|
|
3661
|
+
* 默认值在 1.3.x 之后从固定中文改为 auto;旧存档若从未明确选择过语言,
|
|
3662
|
+
* 迁移时也落到 auto(用户曾经明确选过的 zh/en 会保留,见 languageChosen)。
|
|
3139
3663
|
*/
|
|
3140
|
-
language:
|
|
3664
|
+
language: DEFAULT_LANGUAGE_SETTING,
|
|
3665
|
+
/**
|
|
3666
|
+
* 内部字段:用户是否在设置页明确选择过语言。
|
|
3667
|
+
* 旧版本没有该字段,因此无法区分“默认值 zh”和“用户手动选了 zh”;迁移时
|
|
3668
|
+
* 把没有该标记的旧 zh 视为“从未选择”→ 迁移到新默认 auto。用户一旦在 UI
|
|
3669
|
+
* 里切换语言(updateSettings 收到合法 language),该标记即置 true。
|
|
3670
|
+
*/
|
|
3671
|
+
languageChosen: false,
|
|
3141
3672
|
/** 'enhanced' = 内联差异卡片;'native' = DSH 原生文件修改行。 */
|
|
3142
3673
|
fileCards: "enhanced",
|
|
3143
3674
|
/** 'enhanced' = 平铺展开的 Bash/PowerShell 行;'native' = DSH 原生行。 */
|
|
@@ -3154,6 +3685,13 @@ var DEFAULTS = {
|
|
|
3154
3685
|
fileInnerTone: "auto",
|
|
3155
3686
|
shellInnerTone: "auto",
|
|
3156
3687
|
toolInnerTone: "auto",
|
|
3688
|
+
/**
|
|
3689
|
+
* 逐表面外观效果(1.4.0 新增):
|
|
3690
|
+
* { [surfaceId]: { effect: 'native'|'glass'|'liquid', opacity, blur, mode } }
|
|
3691
|
+
* 表面清单与归一化规则在 ./surfaces.js(唯一事实来源)。旧存档(v4 及更早)
|
|
3692
|
+
* 没有该字段,迁移后全部为 native,即外观与旧版本完全一致。
|
|
3693
|
+
*/
|
|
3694
|
+
effects: defaultEffects(),
|
|
3157
3695
|
/** 差异代码的语法高亮开关(语言识别与配色见 languages.js / highlight.js)。 */
|
|
3158
3696
|
syntaxHighlight: true,
|
|
3159
3697
|
/** 语言徽章样式:'short' 短代码、'full' 全名、'hidden' 隐藏。 */
|
|
@@ -3212,6 +3750,9 @@ var SETTING_VALIDATORS = {
|
|
|
3212
3750
|
fileInnerTone: enumGuard(INNER_TONE_VALUES),
|
|
3213
3751
|
shellInnerTone: enumGuard(INNER_TONE_VALUES),
|
|
3214
3752
|
toolInnerTone: enumGuard(INNER_TONE_VALUES),
|
|
3753
|
+
// 逐表面外观效果:整份对象做归一化(未知表面丢弃、非法字段回退默认),
|
|
3754
|
+
// 因此 updateSettings 收到 `{ effects: 任意值 }` 也只会写入合法配置。
|
|
3755
|
+
effects: (value) => normalizeEffects(value),
|
|
3215
3756
|
syntaxHighlight: (value) => typeof value === "boolean" ? value : void 0,
|
|
3216
3757
|
languageBadge: enumGuard(LANGUAGE_BADGE_VALUES),
|
|
3217
3758
|
unknownLanguage: enumGuard(UNKNOWN_LANGUAGE_VALUES),
|
|
@@ -3257,14 +3798,28 @@ function load() {
|
|
|
3257
3798
|
const storage = globalThis.localStorage;
|
|
3258
3799
|
if (storage === void 0 || storage === null) return { ...DEFAULTS };
|
|
3259
3800
|
let raw = storage.getItem(STORAGE_KEY);
|
|
3260
|
-
if (typeof raw !== "string" || raw === "")
|
|
3261
|
-
|
|
3801
|
+
if (typeof raw !== "string" || raw === "") {
|
|
3802
|
+
for (const legacyKey of LEGACY_KEYS) {
|
|
3803
|
+
raw = storage.getItem(legacyKey);
|
|
3804
|
+
if (typeof raw === "string" && raw !== "") break;
|
|
3805
|
+
}
|
|
3806
|
+
}
|
|
3262
3807
|
if (typeof raw !== "string" || raw === "") return { ...DEFAULTS };
|
|
3263
3808
|
if (raw.length > MAX_STORED_SETTINGS_CHARS) return { ...DEFAULTS };
|
|
3264
3809
|
const parsed = JSON.parse(raw);
|
|
3265
3810
|
if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) return { ...DEFAULTS };
|
|
3266
3811
|
const next = { ...DEFAULTS };
|
|
3267
|
-
|
|
3812
|
+
const storedLanguage = normalizeEnum(parsed.language, LANGUAGE_SETTINGS, void 0);
|
|
3813
|
+
if (parsed.languageChosen === true) {
|
|
3814
|
+
next.language = storedLanguage ?? DEFAULTS.language;
|
|
3815
|
+
next.languageChosen = true;
|
|
3816
|
+
} else if (storedLanguage === "en" || storedLanguage === "auto") {
|
|
3817
|
+
next.language = storedLanguage;
|
|
3818
|
+
next.languageChosen = true;
|
|
3819
|
+
} else {
|
|
3820
|
+
next.language = DEFAULTS.language;
|
|
3821
|
+
next.languageChosen = false;
|
|
3822
|
+
}
|
|
3268
3823
|
const fileCards = normalizeMode(parsed.fileCards);
|
|
3269
3824
|
const shellRows = normalizeMode(parsed.shellRows);
|
|
3270
3825
|
const toolCalls = normalizeMode(parsed.toolCalls);
|
|
@@ -3279,6 +3834,7 @@ function load() {
|
|
|
3279
3834
|
if (parsed.fileInnerTone !== void 0) next.fileInnerTone = normalizeInnerTone(parsed.fileInnerTone);
|
|
3280
3835
|
if (parsed.shellInnerTone !== void 0) next.shellInnerTone = normalizeInnerTone(parsed.shellInnerTone);
|
|
3281
3836
|
if (parsed.toolInnerTone !== void 0) next.toolInnerTone = normalizeInnerTone(parsed.toolInnerTone);
|
|
3837
|
+
next.effects = normalizeEffects(parsed.effects);
|
|
3282
3838
|
next.syntaxHighlight = normalizeBoolean(parsed.syntaxHighlight, DEFAULTS.syntaxHighlight);
|
|
3283
3839
|
next.languageBadge = normalizeEnum(parsed.languageBadge, LANGUAGE_BADGE_VALUES, DEFAULTS.languageBadge);
|
|
3284
3840
|
next.unknownLanguage = normalizeEnum(parsed.unknownLanguage, UNKNOWN_LANGUAGE_VALUES, DEFAULTS.unknownLanguage);
|
|
@@ -3295,9 +3851,8 @@ function persist() {
|
|
|
3295
3851
|
...state,
|
|
3296
3852
|
...previousTranscript === void 0 ? {} : { previousTranscript }
|
|
3297
3853
|
}));
|
|
3298
|
-
globalThis.localStorage?.removeItem(
|
|
3299
|
-
globalThis.localStorage?.removeItem(
|
|
3300
|
-
globalThis.localStorage?.removeItem(RETIRED_KEY);
|
|
3854
|
+
for (const legacyKey of LEGACY_KEYS) globalThis.localStorage?.removeItem(legacyKey);
|
|
3855
|
+
for (const retiredKey of RETIRED_KEYS) globalThis.localStorage?.removeItem(retiredKey);
|
|
3301
3856
|
} catch {
|
|
3302
3857
|
}
|
|
3303
3858
|
}
|
|
@@ -3323,6 +3878,7 @@ function updateSettings(patch) {
|
|
|
3323
3878
|
if (value !== void 0) next[key] = value;
|
|
3324
3879
|
}
|
|
3325
3880
|
if (Object.keys(next).length === 0) return;
|
|
3881
|
+
if (next.language !== void 0) next.languageChosen = true;
|
|
3326
3882
|
state = { ...state, ...next };
|
|
3327
3883
|
persist();
|
|
3328
3884
|
emit();
|
|
@@ -3398,7 +3954,7 @@ async function adoptTranscriptPreference() {
|
|
|
3398
3954
|
|
|
3399
3955
|
// src/client/use-settings.js
|
|
3400
3956
|
function useSettingsSnapshot() {
|
|
3401
|
-
return (0,
|
|
3957
|
+
return (0, import_react2.useSyncExternalStore)(subscribeSettings, getSettings, getSettings);
|
|
3402
3958
|
}
|
|
3403
3959
|
|
|
3404
3960
|
// src/client/enhanced-tools.jsx
|
|
@@ -3447,7 +4003,24 @@ function summaryOf(args, call2) {
|
|
|
3447
4003
|
if (args === null || typeof args !== "object") return "";
|
|
3448
4004
|
const specific = call2 === void 0 ? "" : searchSummary(call2);
|
|
3449
4005
|
if (specific !== "") return specific;
|
|
3450
|
-
const keys = [
|
|
4006
|
+
const keys = [
|
|
4007
|
+
"description",
|
|
4008
|
+
"command",
|
|
4009
|
+
"file_path",
|
|
4010
|
+
"path",
|
|
4011
|
+
"localPath",
|
|
4012
|
+
"remotePath",
|
|
4013
|
+
"url",
|
|
4014
|
+
"query",
|
|
4015
|
+
"queries",
|
|
4016
|
+
"prompt",
|
|
4017
|
+
"objective",
|
|
4018
|
+
"skill",
|
|
4019
|
+
"title",
|
|
4020
|
+
"name",
|
|
4021
|
+
"tool",
|
|
4022
|
+
"alias"
|
|
4023
|
+
];
|
|
3451
4024
|
for (const key of keys) {
|
|
3452
4025
|
const value = args[key];
|
|
3453
4026
|
if (Array.isArray(value)) {
|
|
@@ -3521,12 +4094,18 @@ function genericModel(block, toolName, t) {
|
|
|
3521
4094
|
}
|
|
3522
4095
|
function EnhancedExpandedTool({ block, toolName, t, inspect }) {
|
|
3523
4096
|
const tone = useSettingsSnapshot();
|
|
3524
|
-
const model = (0,
|
|
3525
|
-
const [open, setOpen] = (0,
|
|
4097
|
+
const model = (0, import_react3.useMemo)(() => genericModel(block, toolName, t), [block, toolName, t]);
|
|
4098
|
+
const [open, setOpen] = (0, import_react3.useState)(true);
|
|
4099
|
+
const [enter] = (0, import_react3.useState)(() => isLiveToolState(model.state));
|
|
4100
|
+
const waitingRef = (0, import_react3.useRef)(model.waitingForOutput);
|
|
4101
|
+
const outputAppeared = (0, import_react3.useRef)(false);
|
|
4102
|
+
if (model.output !== "" && waitingRef.current) outputAppeared.current = true;
|
|
4103
|
+
waitingRef.current = model.waitingForOutput;
|
|
4104
|
+
const pulseRef = usePulseSync();
|
|
3526
4105
|
const stateLabel = stateKeyOf(model.state);
|
|
3527
4106
|
const hasBody = model.input !== "" || model.output !== "";
|
|
3528
|
-
return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "enhanced-tool enhanced-generic", "data-variant": "tool", "data-kind": model.kind, "data-state": model.state, "data-tool": toolName, "data-shell-tone": tone.toolShellTone, "data-inner-tone": tone.toolInnerTone, "data-body": hasBody && open ? "true" : "false", style: { "--did-pulse-phase": pulsePhase(model.callId) }, children: [
|
|
3529
|
-
/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "enhanced-head", children: [
|
|
4107
|
+
return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "enhanced-tool enhanced-generic", ref: pulseRef, ...fxRootProps(tone, ["toolHeader", "toolIO"]), "data-variant": "tool", "data-kind": model.kind, "data-state": model.state, "data-tool": toolName, "data-shell-tone": tone.toolShellTone, "data-inner-tone": tone.toolInnerTone, "data-body": hasBody && open ? "true" : "false", "data-enter": enter ? "" : void 0, style: { "--did-pulse-phase": pulsePhase(model.callId) }, children: [
|
|
4108
|
+
/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "enhanced-head", ...surfaceProps(tone, "toolHeader"), children: [
|
|
3530
4109
|
/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "enhanced-kind", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(KindIcon, { kind: model.kind }) }),
|
|
3531
4110
|
hasBody ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
3532
4111
|
"button",
|
|
@@ -3549,13 +4128,13 @@ function EnhancedExpandedTool({ block, toolName, t, inspect }) {
|
|
|
3549
4128
|
/* @__PURE__ */ (0, import_jsx_runtime.jsx)(InspectButton, { inspect, t })
|
|
3550
4129
|
] })
|
|
3551
4130
|
] }),
|
|
3552
|
-
open && hasBody ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "enhanced-io", children: [
|
|
4131
|
+
open && hasBody ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "enhanced-io", ...surfaceProps(tone, "toolIO"), children: [
|
|
3553
4132
|
model.input !== "" ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "enhanced-section", "data-section": "in", "data-state": model.inputState, children: [
|
|
3554
4133
|
/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "enhanced-label", children: t("tool.in") }),
|
|
3555
4134
|
/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "enhanced-scroll enhanced-scroll-in", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("pre", { className: "enhanced-code", "data-error": model.inputState === "error" ? "" : void 0, children: model.input }) })
|
|
3556
4135
|
] }) : null,
|
|
3557
4136
|
model.input !== "" && model.output !== "" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "enhanced-divider", "aria-hidden": "true" }) : null,
|
|
3558
|
-
model.output !== "" ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "enhanced-section", "data-section": "out", "data-state": model.outputState, children: [
|
|
4137
|
+
model.output !== "" ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "enhanced-section", "data-section": "out", "data-state": model.outputState, "data-appear": outputAppeared.current ? "" : void 0, children: [
|
|
3559
4138
|
/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "enhanced-label", children: t("tool.out") }),
|
|
3560
4139
|
/* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "enhanced-scroll", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("pre", { className: "enhanced-code", "data-error": model.outputState === "error" ? "" : void 0, children: model.output }) })
|
|
3561
4140
|
] }) : model.waitingForOutput ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "enhanced-section", "data-section": "out", "data-state": model.outputState, children: [
|
|
@@ -3754,11 +4333,17 @@ function shellModel(block, toolName) {
|
|
|
3754
4333
|
function EnhancedShellCard(props) {
|
|
3755
4334
|
const { block, toolName, phase, t, inspect } = props;
|
|
3756
4335
|
const tone = useSettingsSnapshot();
|
|
3757
|
-
const
|
|
4336
|
+
const pulseRef = usePulseSync();
|
|
4337
|
+
const model = (0, import_react4.useMemo)(() => shellModel(block, toolName), [block, toolName]);
|
|
4338
|
+
const [enter] = (0, import_react4.useState)(() => isLiveToolState(model.state));
|
|
4339
|
+
const waitingRef = (0, import_react4.useRef)(model.waitingForOutput);
|
|
4340
|
+
const outputAppeared = (0, import_react4.useRef)(false);
|
|
4341
|
+
if (model.output !== "" && waitingRef.current) outputAppeared.current = true;
|
|
4342
|
+
waitingRef.current = model.waitingForOutput;
|
|
3758
4343
|
const hasIO = model.input !== "" || model.output !== "" || model.waitingForOutput;
|
|
3759
4344
|
const stateLabel = model.state === "error" ? t("state.error") : model.state === "stopped" ? t("state.stopped") : model.state === "running" ? t("state.running") : model.state === "preparing" ? t("state.preparing") : "";
|
|
3760
|
-
return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "enhanced-tool enhanced-command", "data-variant": "command", "data-state": model.state, "data-tool": toolName, "data-shell-tone": tone.shellShellTone, "data-inner-tone": tone.shellInnerTone, "data-body": hasIO ? "true" : "false", style: { "--did-pulse-phase": pulsePhase(model.callId) }, children: [
|
|
3761
|
-
/* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "enhanced-head", children: [
|
|
4345
|
+
return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "enhanced-tool enhanced-command", ref: pulseRef, ...fxRootProps(tone, ["commandHeader", "commandIO"]), "data-variant": "command", "data-state": model.state, "data-tool": toolName, "data-shell-tone": tone.shellShellTone, "data-inner-tone": tone.shellInnerTone, "data-body": hasIO ? "true" : "false", "data-enter": enter ? "" : void 0, style: { "--did-pulse-phase": pulsePhase(model.callId) }, children: [
|
|
4346
|
+
/* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "enhanced-head", ...surfaceProps(tone, "commandHeader"), children: [
|
|
3762
4347
|
/* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "enhanced-kind", children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(KindIcon, { kind: "command" }) }),
|
|
3763
4348
|
/* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "enhanced-dot", "aria-hidden": "true" }),
|
|
3764
4349
|
/* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "enhanced-name", children: model.title }),
|
|
@@ -3769,13 +4354,13 @@ function EnhancedShellCard(props) {
|
|
|
3769
4354
|
/* @__PURE__ */ (0, import_jsx_runtime2.jsx)(InspectButton, { inspect, t })
|
|
3770
4355
|
] })
|
|
3771
4356
|
] }),
|
|
3772
|
-
hasIO ? /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "enhanced-io", children: [
|
|
4357
|
+
hasIO ? /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "enhanced-io", ...surfaceProps(tone, "commandIO"), children: [
|
|
3773
4358
|
model.input !== "" ? /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "enhanced-section", "data-section": "in", "data-state": model.inputState, children: [
|
|
3774
4359
|
/* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "enhanced-label", children: t("shell.in") }),
|
|
3775
4360
|
/* @__PURE__ */ (0, import_jsx_runtime2.jsx)("div", { className: "enhanced-scroll enhanced-scroll-in", children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("pre", { className: "enhanced-code", "data-error": model.inputState === "error" ? "" : void 0, children: model.input }) })
|
|
3776
4361
|
] }) : null,
|
|
3777
4362
|
model.input !== "" && model.output !== "" ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("div", { className: "enhanced-divider", "aria-hidden": "true" }) : null,
|
|
3778
|
-
model.output !== "" ? /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "enhanced-section", "data-section": "out", "data-state": model.outputState, children: [
|
|
4363
|
+
model.output !== "" ? /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "enhanced-section", "data-section": "out", "data-state": model.outputState, "data-appear": outputAppeared.current ? "" : void 0, children: [
|
|
3779
4364
|
/* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "enhanced-label", children: t("shell.out") }),
|
|
3780
4365
|
/* @__PURE__ */ (0, import_jsx_runtime2.jsx)("div", { className: "enhanced-scroll", children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("pre", { className: "enhanced-code", "data-error": model.outputState === "error" ? "" : void 0, children: model.output }) })
|
|
3781
4366
|
] }) : model.waitingForOutput ? /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "enhanced-section", "data-section": "out", "data-state": model.outputState, children: [
|
|
@@ -3790,103 +4375,19 @@ function EnhancedShellCard(props) {
|
|
|
3790
4375
|
}
|
|
3791
4376
|
|
|
3792
4377
|
// src/client/components.jsx
|
|
3793
|
-
var
|
|
4378
|
+
var import_react5 = require("react");
|
|
3794
4379
|
var import_react_dom = require("react-dom");
|
|
3795
4380
|
|
|
3796
|
-
//
|
|
3797
|
-
var
|
|
3798
|
-
var
|
|
3799
|
-
|
|
3800
|
-
|
|
3801
|
-
|
|
3802
|
-
|
|
3803
|
-
|
|
3804
|
-
|
|
3805
|
-
|
|
3806
|
-
body: JSON.stringify(payload2 ?? {}),
|
|
3807
|
-
signal: controller.signal
|
|
3808
|
-
});
|
|
3809
|
-
if (!response.ok) return null;
|
|
3810
|
-
const data = await response.json();
|
|
3811
|
-
return data !== null && typeof data === "object" ? data : null;
|
|
3812
|
-
} catch {
|
|
3813
|
-
return null;
|
|
3814
|
-
} finally {
|
|
3815
|
-
clearTimeout(timer);
|
|
3816
|
-
}
|
|
3817
|
-
}
|
|
3818
|
-
async function fetchSnapshot(sessionId, callId) {
|
|
3819
|
-
if (typeof sessionId !== "string" || sessionId === "" || callId === void 0 || callId === null) return null;
|
|
3820
|
-
const data = await call("snapshot", { sessionId, callId: String(callId) });
|
|
3821
|
-
if (data === null || data.ok !== true) return null;
|
|
3822
|
-
const snapshot = data.snapshot;
|
|
3823
|
-
if (snapshot === null || typeof snapshot !== "object") return null;
|
|
3824
|
-
if (typeof snapshot.after !== "string") return null;
|
|
3825
|
-
return {
|
|
3826
|
-
path: typeof snapshot.path === "string" ? snapshot.path : "",
|
|
3827
|
-
before: typeof snapshot.before === "string" ? snapshot.before : null,
|
|
3828
|
-
after: snapshot.after,
|
|
3829
|
-
operation: typeof snapshot.operation === "string" ? snapshot.operation : snapshot.before === null ? "create" : "update"
|
|
3830
|
-
};
|
|
3831
|
-
}
|
|
3832
|
-
async function fetchFileText(cwd, path) {
|
|
3833
|
-
if (typeof cwd !== "string" || cwd === "" || typeof path !== "string" || path === "") return null;
|
|
3834
|
-
const data = await call("read", { cwd, path });
|
|
3835
|
-
if (data === null || data.ok !== true) return null;
|
|
3836
|
-
if (data.kind === "text" && typeof data.text === "string") return { kind: "text", text: data.text, size: data.size };
|
|
3837
|
-
if (data.kind === "binary") return { kind: "binary", size: data.size };
|
|
3838
|
-
if (data.kind === "oversized") return { kind: "oversized", size: data.size };
|
|
3839
|
-
return null;
|
|
3840
|
-
}
|
|
3841
|
-
var FILE_CACHE_LIMIT = 24;
|
|
3842
|
-
var FILE_CACHE_TTL = 15e3;
|
|
3843
|
-
var fileCache = /* @__PURE__ */ new Map();
|
|
3844
|
-
function trimCache(map, limit) {
|
|
3845
|
-
while (map.size > limit) {
|
|
3846
|
-
const oldest = map.keys().next().value;
|
|
3847
|
-
if (oldest === void 0) break;
|
|
3848
|
-
map.delete(oldest);
|
|
3849
|
-
}
|
|
3850
|
-
}
|
|
3851
|
-
async function cachedFileText(cwd, path) {
|
|
3852
|
-
const key = `${cwd ?? ""}\0${path ?? ""}`;
|
|
3853
|
-
const now = Date.now();
|
|
3854
|
-
const hit = fileCache.get(key);
|
|
3855
|
-
if (hit !== void 0 && now - hit.at < FILE_CACHE_TTL) {
|
|
3856
|
-
fileCache.delete(key);
|
|
3857
|
-
fileCache.set(key, hit);
|
|
3858
|
-
return hit.value;
|
|
3859
|
-
}
|
|
3860
|
-
const value = await fetchFileText(cwd, path);
|
|
3861
|
-
fileCache.set(key, { value, at: now });
|
|
3862
|
-
trimCache(fileCache, FILE_CACHE_LIMIT);
|
|
3863
|
-
return value;
|
|
3864
|
-
}
|
|
3865
|
-
var SNAPSHOT_CACHE_LIMIT = 160;
|
|
3866
|
-
var snapshotCache = /* @__PURE__ */ new Map();
|
|
3867
|
-
async function cachedSnapshot(sessionId, callId) {
|
|
3868
|
-
const key = `${sessionId ?? ""}\0${callId ?? ""}`;
|
|
3869
|
-
if (snapshotCache.has(key)) return snapshotCache.get(key) ?? null;
|
|
3870
|
-
let snapshot = await fetchSnapshot(sessionId, callId);
|
|
3871
|
-
if (snapshot === null) {
|
|
3872
|
-
await new Promise((resolve) => setTimeout(resolve, 180));
|
|
3873
|
-
snapshot = await fetchSnapshot(sessionId, callId);
|
|
3874
|
-
}
|
|
3875
|
-
snapshotCache.set(key, snapshot);
|
|
3876
|
-
trimCache(snapshotCache, SNAPSHOT_CACHE_LIMIT);
|
|
3877
|
-
return snapshot;
|
|
3878
|
-
}
|
|
3879
|
-
|
|
3880
|
-
// node_modules/highlight.js/es/core.js
|
|
3881
|
-
var import_core = __toESM(require_core(), 1);
|
|
3882
|
-
var core_default = import_core.default;
|
|
3883
|
-
|
|
3884
|
-
// node_modules/highlight.js/es/languages/asciidoc.js
|
|
3885
|
-
function asciidoc(hljs) {
|
|
3886
|
-
const regex = hljs.regex;
|
|
3887
|
-
const HORIZONTAL_RULE = {
|
|
3888
|
-
begin: "^'{3,}[ \\t]*$",
|
|
3889
|
-
relevance: 10
|
|
4381
|
+
// node_modules/highlight.js/es/core.js
|
|
4382
|
+
var import_core = __toESM(require_core(), 1);
|
|
4383
|
+
var core_default = import_core.default;
|
|
4384
|
+
|
|
4385
|
+
// node_modules/highlight.js/es/languages/asciidoc.js
|
|
4386
|
+
function asciidoc(hljs) {
|
|
4387
|
+
const regex = hljs.regex;
|
|
4388
|
+
const HORIZONTAL_RULE = {
|
|
4389
|
+
begin: "^'{3,}[ \\t]*$",
|
|
4390
|
+
relevance: 10
|
|
3890
4391
|
};
|
|
3891
4392
|
const ESCAPED_FORMATTING = [
|
|
3892
4393
|
// escaped constrained formatting marks (i.e., \* \_ or \`)
|
|
@@ -22128,7 +22629,7 @@ function RowText({ row, fallback, tokens }) {
|
|
|
22128
22629
|
if (colorable !== null && hasSegments) {
|
|
22129
22630
|
const groups = splitTokensBySegments(colorable, segments);
|
|
22130
22631
|
if (groups !== null) {
|
|
22131
|
-
return groups.map((group, index) => group.changed ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("span", { className: "did-seg", "data-changed": "true", children: group.pieces.map((piece, pieceIndex) => /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(TokenSpan, { token: piece }, pieceIndex)) }, index) : /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
|
|
22632
|
+
return groups.map((group, index) => group.changed ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("span", { className: "did-seg", "data-changed": "true", children: group.pieces.map((piece, pieceIndex) => /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(TokenSpan, { token: piece }, pieceIndex)) }, index) : /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_react5.Fragment, { children: group.pieces.map((piece, pieceIndex) => /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(TokenSpan, { token: piece }, pieceIndex)) }, index));
|
|
22132
22633
|
}
|
|
22133
22634
|
}
|
|
22134
22635
|
if (!hasSegments) return fallback;
|
|
@@ -22283,7 +22784,7 @@ function SideBySide({ diff: diff2, mode, pathLabel, t, highlighter }) {
|
|
|
22283
22784
|
}
|
|
22284
22785
|
return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("div", { className: "did-sbs", "data-mode": "hunks", children: diff2.hunks.map((hunk) => {
|
|
22285
22786
|
const { pairs } = pairRows(hunk.rows, Number.POSITIVE_INFINITY);
|
|
22286
|
-
return /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(
|
|
22787
|
+
return /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_react5.Fragment, { children: [
|
|
22287
22788
|
hunk.gapBefore !== null && hunk.gapBefore !== void 0 ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(GapBand, { gap: hunk.gapBefore, t }) : null,
|
|
22288
22789
|
/* @__PURE__ */ (0, import_jsx_runtime3.jsxs)("div", { className: "did-bar", children: [
|
|
22289
22790
|
/* @__PURE__ */ (0, import_jsx_runtime3.jsx)("span", { className: "did-bar-file", title: pathLabel || void 0, children: pathLabel }),
|
|
@@ -22336,12 +22837,13 @@ function modalPayloadOf(model) {
|
|
|
22336
22837
|
function InlineDiffCard(props) {
|
|
22337
22838
|
const { block, toolName, cwd, home, openFile, inspect, sessionId, t } = props;
|
|
22338
22839
|
const tone = useSettingsSnapshot();
|
|
22339
|
-
const
|
|
22340
|
-
const
|
|
22341
|
-
const [
|
|
22342
|
-
const [
|
|
22343
|
-
const
|
|
22344
|
-
(0,
|
|
22840
|
+
const pulseRef = usePulseSync();
|
|
22841
|
+
const call2 = (0, import_react5.useMemo)(() => deriveCall(block), [block]);
|
|
22842
|
+
const [snapshot, setSnapshot] = (0, import_react5.useState)(void 0);
|
|
22843
|
+
const [fileText, setFileText] = (0, import_react5.useState)(null);
|
|
22844
|
+
const [collapsed, setCollapsed] = (0, import_react5.useState)(false);
|
|
22845
|
+
const requested = (0, import_react5.useRef)(false);
|
|
22846
|
+
(0, import_react5.useEffect)(() => {
|
|
22345
22847
|
if (requested.current) return;
|
|
22346
22848
|
if (!call2.settled || call2.isError) return;
|
|
22347
22849
|
requested.current = true;
|
|
@@ -22363,7 +22865,7 @@ function InlineDiffCard(props) {
|
|
|
22363
22865
|
alive = false;
|
|
22364
22866
|
};
|
|
22365
22867
|
}, [call2.settled, call2.isError, call2.callId, call2.meta, cwd, sessionId]);
|
|
22366
|
-
const model = (0,
|
|
22868
|
+
const model = (0, import_react5.useMemo)(() => buildCardModel({
|
|
22367
22869
|
block,
|
|
22368
22870
|
toolName,
|
|
22369
22871
|
cwd,
|
|
@@ -22373,18 +22875,18 @@ function InlineDiffCard(props) {
|
|
|
22373
22875
|
loading: snapshot === void 0 && call2.settled && !call2.isError
|
|
22374
22876
|
}), [block, toolName, cwd, home, snapshot, fileText, call2.settled, call2.isError]);
|
|
22375
22877
|
const diff2 = model.diff;
|
|
22376
|
-
const languageId = (0,
|
|
22878
|
+
const languageId = (0, import_react5.useMemo)(
|
|
22377
22879
|
() => detectLanguage(model.absolutePath ?? model.filePath, model.diff?.afterText ?? model.diff?.beforeText ?? ""),
|
|
22378
22880
|
[model.absolutePath, model.filePath, model.diff]
|
|
22379
22881
|
);
|
|
22380
|
-
const highlighter = (0,
|
|
22882
|
+
const highlighter = (0, import_react5.useMemo)(
|
|
22381
22883
|
() => tone.syntaxHighlight !== false && languageId !== null && diff2 !== null && diff2 !== void 0 ? getDiffHighlighter(diff2, languageId) : null,
|
|
22382
22884
|
[diff2, languageId, tone.syntaxHighlight]
|
|
22383
22885
|
);
|
|
22384
22886
|
const hasHunks = diff2 !== null && diff2 !== void 0 && diff2.hunks.length > 0;
|
|
22385
22887
|
const stateKey = stateKeyOf(model.status);
|
|
22386
22888
|
const totalHunks = hasHunks ? diff2.hunks.length : 0;
|
|
22387
|
-
const plan = (0,
|
|
22889
|
+
const plan = (0, import_react5.useMemo)(() => hasHunks ? buildInlinePlan(diff2) : null, [diff2, hasHunks]);
|
|
22388
22890
|
const hidden = plan === null ? 0 : plan.total - plan.shown;
|
|
22389
22891
|
const truncated = diff2 !== null && diff2 !== void 0 && diff2.truncated === true;
|
|
22390
22892
|
const cardNotice = (() => {
|
|
@@ -22424,11 +22926,12 @@ function InlineDiffCard(props) {
|
|
|
22424
22926
|
] });
|
|
22425
22927
|
return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("div", { className: "did-empty", children: t("noDiff") });
|
|
22426
22928
|
};
|
|
22427
|
-
return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
|
|
22929
|
+
return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_react5.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)("div", { className: "did-card", ref: pulseRef, ...fxRootProps(tone, ["fileCardHeader", "fileCardBody"]), "data-state": model.status, "data-tool": model.toolName, "data-call-id": model.callId, "data-inline-diff": "row", "data-shell-tone": tone.fileShellTone, "data-inner-tone": tone.fileInnerTone, "data-language": languageId ?? "unknown", "data-syn-emphasis": tone.syntaxEmphasis, style: { "--did-pulse-phase": pulsePhase(model.callId) }, children: [
|
|
22428
22930
|
/* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(
|
|
22429
22931
|
"div",
|
|
22430
22932
|
{
|
|
22431
22933
|
className: "did-head",
|
|
22934
|
+
...surfaceProps(tone, "fileCardHeader"),
|
|
22432
22935
|
role: "button",
|
|
22433
22936
|
tabIndex: 0,
|
|
22434
22937
|
"aria-expanded": !collapsed,
|
|
@@ -22495,8 +22998,8 @@ function InlineDiffCard(props) {
|
|
|
22495
22998
|
}
|
|
22496
22999
|
),
|
|
22497
23000
|
cardNotice !== null ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("div", { className: "did-notice", children: cardNotice }) : null,
|
|
22498
|
-
!collapsed ? hasHunks ? /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(
|
|
22499
|
-
/* @__PURE__ */ (0, import_jsx_runtime3.jsx)("div", { className: "did-body", children: plan.parts.map((part) => {
|
|
23001
|
+
!collapsed ? hasHunks ? /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_react5.Fragment, { children: [
|
|
23002
|
+
/* @__PURE__ */ (0, import_jsx_runtime3.jsx)("div", { className: "did-body", ...surfaceProps(tone, "fileCardBody"), children: plan.parts.map((part) => {
|
|
22500
23003
|
if (part.type === "gap") return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(GapBand, { gap: part.gap, t }, part.key);
|
|
22501
23004
|
return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
|
|
22502
23005
|
InlineHunk,
|
|
@@ -22510,7 +23013,7 @@ function InlineDiffCard(props) {
|
|
|
22510
23013
|
part.key
|
|
22511
23014
|
);
|
|
22512
23015
|
}) }),
|
|
22513
|
-
/* @__PURE__ */ (0, import_jsx_runtime3.jsxs)("div", { className: "did-foot", children: [
|
|
23016
|
+
/* @__PURE__ */ (0, import_jsx_runtime3.jsxs)("div", { className: "did-foot", ...surfaceProps(tone, "fileCardBody"), children: [
|
|
22514
23017
|
/* @__PURE__ */ (0, import_jsx_runtime3.jsx)("span", { children: sourceLabel(model.source, t) }),
|
|
22515
23018
|
/* @__PURE__ */ (0, import_jsx_runtime3.jsx)("span", { className: "did-grow" }),
|
|
22516
23019
|
hidden > 0 ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("span", { children: t("inlineMore", { n: hidden }) }) : null,
|
|
@@ -22520,27 +23023,27 @@ function InlineDiffCard(props) {
|
|
|
22520
23023
|
] }) });
|
|
22521
23024
|
}
|
|
22522
23025
|
function DiffModal({ t }) {
|
|
22523
|
-
const payload2 = (0,
|
|
23026
|
+
const payload2 = (0, import_react5.useSyncExternalStore)(subscribeDiffModal, getDiffModal, getDiffModal);
|
|
22524
23027
|
const settings = useSettingsSnapshot();
|
|
22525
|
-
const [tab, setTab] = (0,
|
|
22526
|
-
const [portalHost, setPortalHost] = (0,
|
|
22527
|
-
const dialogRef = (0,
|
|
23028
|
+
const [tab, setTab] = (0, import_react5.useState)("hunks");
|
|
23029
|
+
const [portalHost, setPortalHost] = (0, import_react5.useState)(null);
|
|
23030
|
+
const dialogRef = (0, import_react5.useRef)(null);
|
|
22528
23031
|
const callId = payload2 === null ? null : payload2.callId;
|
|
22529
|
-
const languageId = (0,
|
|
23032
|
+
const languageId = (0, import_react5.useMemo)(
|
|
22530
23033
|
() => payload2 === null ? null : detectLanguage(payload2.absolutePath ?? payload2.filePath, payload2.diff?.afterText ?? payload2.diff?.beforeText ?? ""),
|
|
22531
23034
|
[payload2]
|
|
22532
23035
|
);
|
|
22533
|
-
const highlighter = (0,
|
|
23036
|
+
const highlighter = (0, import_react5.useMemo)(
|
|
22534
23037
|
() => settings.syntaxHighlight !== false && languageId !== null && payload2?.diff !== null && payload2?.diff !== void 0 ? getDiffHighlighter(payload2.diff, languageId) : null,
|
|
22535
23038
|
[payload2, languageId, settings.syntaxHighlight]
|
|
22536
23039
|
);
|
|
22537
|
-
(0,
|
|
23040
|
+
(0, import_react5.useEffect)(() => {
|
|
22538
23041
|
setPortalHost(document.body);
|
|
22539
23042
|
}, []);
|
|
22540
|
-
(0,
|
|
23043
|
+
(0, import_react5.useEffect)(() => {
|
|
22541
23044
|
setTab("hunks");
|
|
22542
23045
|
}, [callId]);
|
|
22543
|
-
(0,
|
|
23046
|
+
(0, import_react5.useEffect)(() => {
|
|
22544
23047
|
if (payload2 === null) return;
|
|
22545
23048
|
const onKeyDown = (event) => {
|
|
22546
23049
|
if (event.key !== "Escape") return;
|
|
@@ -22551,7 +23054,7 @@ function DiffModal({ t }) {
|
|
|
22551
23054
|
window.addEventListener("keydown", onKeyDown, true);
|
|
22552
23055
|
return () => window.removeEventListener("keydown", onKeyDown, true);
|
|
22553
23056
|
}, [payload2]);
|
|
22554
|
-
(0,
|
|
23057
|
+
(0, import_react5.useEffect)(() => {
|
|
22555
23058
|
if (payload2 === null) return;
|
|
22556
23059
|
dialogRef.current?.focus?.();
|
|
22557
23060
|
}, [payload2]);
|
|
@@ -22564,10 +23067,12 @@ function DiffModal({ t }) {
|
|
|
22564
23067
|
const oldLines = diff2.oldLineCount;
|
|
22565
23068
|
const newLines = diff2.newLineCount;
|
|
22566
23069
|
const close = () => closeDiffModal();
|
|
22567
|
-
const overlay = /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
|
|
23070
|
+
const overlay = /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_react5.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("div", { className: "did-overlay-root", "data-open": "true", "data-enter": "", children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("div", { className: "did-overlay", ...backdropProxyProps(settings, "diffModal"), onClick: close, children: /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(
|
|
22568
23071
|
"div",
|
|
22569
23072
|
{
|
|
22570
23073
|
className: "did-dialog",
|
|
23074
|
+
"data-enter": "",
|
|
23075
|
+
...surfaceProps(settings, "diffModal"),
|
|
22571
23076
|
role: "dialog",
|
|
22572
23077
|
"aria-modal": "true",
|
|
22573
23078
|
"aria-label": t("modal.title"),
|
|
@@ -22637,6 +23142,97 @@ function DiffModal({ t }) {
|
|
|
22637
23142
|
return portalHost === null ? overlay : (0, import_react_dom.createPortal)(overlay, portalHost);
|
|
22638
23143
|
}
|
|
22639
23144
|
|
|
23145
|
+
// src/client/glass-filters.js
|
|
23146
|
+
var FILTER_DEFS_ID = "dsh-inline-diff-glass-filters";
|
|
23147
|
+
var REFRACTION_GATE_CLASS = "did-glass-refract-ok";
|
|
23148
|
+
var MIN_CHROMIUM_MAJOR = 152;
|
|
23149
|
+
var FILTERS_MARKUP = `
|
|
23150
|
+
<defs>
|
|
23151
|
+
<filter id="did-glass-refract-sm" x="-15%" y="-15%" width="130%" height="130%" color-interpolation-filters="sRGB">
|
|
23152
|
+
<feTurbulence type="fractalNoise" baseFrequency="0.010 0.013" numOctaves="2" seed="7" result="noise" />
|
|
23153
|
+
<feGaussianBlur in="noise" stdDeviation="1.4" result="soft" />
|
|
23154
|
+
<feDisplacementMap in="SourceGraphic" in2="soft" scale="9" xChannelSelector="R" yChannelSelector="G" />
|
|
23155
|
+
</filter>
|
|
23156
|
+
<filter id="did-glass-refract-md" x="-18%" y="-18%" width="136%" height="136%" color-interpolation-filters="sRGB">
|
|
23157
|
+
<feTurbulence type="fractalNoise" baseFrequency="0.009 0.011" numOctaves="2" seed="13" result="noise" />
|
|
23158
|
+
<feGaussianBlur in="noise" stdDeviation="1.8" result="soft" />
|
|
23159
|
+
<feDisplacementMap in="SourceGraphic" in2="soft" scale="18" xChannelSelector="R" yChannelSelector="G" />
|
|
23160
|
+
</filter>
|
|
23161
|
+
<filter id="did-glass-refract-lg" x="-22%" y="-22%" width="144%" height="144%" color-interpolation-filters="sRGB">
|
|
23162
|
+
<feTurbulence type="fractalNoise" baseFrequency="0.0075 0.0095" numOctaves="3" seed="21" result="noise" />
|
|
23163
|
+
<feGaussianBlur in="noise" stdDeviation="2.2" result="soft" />
|
|
23164
|
+
<feDisplacementMap in="SourceGraphic" in2="soft" scale="30" xChannelSelector="R" yChannelSelector="G" />
|
|
23165
|
+
</filter>
|
|
23166
|
+
</defs>
|
|
23167
|
+
`;
|
|
23168
|
+
function chromiumMajor(userAgent = globalThis.navigator?.userAgent) {
|
|
23169
|
+
if (typeof userAgent !== "string") return 0;
|
|
23170
|
+
const match = userAgent.match(/Chrom(?:e|ium)\/(\d+)/);
|
|
23171
|
+
if (match === null) return 0;
|
|
23172
|
+
const major = Number(match[1]);
|
|
23173
|
+
return Number.isFinite(major) ? major : 0;
|
|
23174
|
+
}
|
|
23175
|
+
function supportsBackdropRefraction(userAgent = globalThis.navigator?.userAgent, css2 = globalThis.CSS) {
|
|
23176
|
+
try {
|
|
23177
|
+
if (chromiumMajor(userAgent) < MIN_CHROMIUM_MAJOR) return false;
|
|
23178
|
+
if (css2 === void 0 || css2 === null || typeof css2.supports !== "function") return false;
|
|
23179
|
+
return css2.supports("backdrop-filter", "url(#did-glass-refract-sm)") === true || css2.supports("-webkit-backdrop-filter", "url(#did-glass-refract-sm)") === true;
|
|
23180
|
+
} catch {
|
|
23181
|
+
return false;
|
|
23182
|
+
}
|
|
23183
|
+
}
|
|
23184
|
+
function installGlassRefraction() {
|
|
23185
|
+
const doc = globalThis.document;
|
|
23186
|
+
if (doc === void 0 || doc === null) return () => {
|
|
23187
|
+
};
|
|
23188
|
+
const root = doc.documentElement;
|
|
23189
|
+
const host = doc.body ?? root;
|
|
23190
|
+
if (root === null || root === void 0 || host === null || host === void 0) return () => {
|
|
23191
|
+
};
|
|
23192
|
+
let container = null;
|
|
23193
|
+
try {
|
|
23194
|
+
if (doc.getElementById(FILTER_DEFS_ID) === null) {
|
|
23195
|
+
container = doc.createElement("svg");
|
|
23196
|
+
container.id = FILTER_DEFS_ID;
|
|
23197
|
+
container.setAttribute("width", "0");
|
|
23198
|
+
container.setAttribute("height", "0");
|
|
23199
|
+
container.setAttribute("aria-hidden", "true");
|
|
23200
|
+
container.setAttribute("focusable", "false");
|
|
23201
|
+
container.setAttribute("style", "position:absolute;width:0;height:0;pointer-events:none");
|
|
23202
|
+
container.innerHTML = FILTERS_MARKUP;
|
|
23203
|
+
host.appendChild(container);
|
|
23204
|
+
}
|
|
23205
|
+
} catch {
|
|
23206
|
+
container = null;
|
|
23207
|
+
}
|
|
23208
|
+
let gated = false;
|
|
23209
|
+
try {
|
|
23210
|
+
if (supportsBackdropRefraction()) {
|
|
23211
|
+
root.classList.add(REFRACTION_GATE_CLASS);
|
|
23212
|
+
gated = true;
|
|
23213
|
+
} else {
|
|
23214
|
+
root.classList.remove(REFRACTION_GATE_CLASS);
|
|
23215
|
+
}
|
|
23216
|
+
} catch {
|
|
23217
|
+
}
|
|
23218
|
+
let disposed = false;
|
|
23219
|
+
return () => {
|
|
23220
|
+
if (disposed) return;
|
|
23221
|
+
disposed = true;
|
|
23222
|
+
try {
|
|
23223
|
+
if (container !== null && container.isConnected) container.remove();
|
|
23224
|
+
else doc.getElementById(FILTER_DEFS_ID)?.remove();
|
|
23225
|
+
} catch {
|
|
23226
|
+
}
|
|
23227
|
+
if (gated) {
|
|
23228
|
+
try {
|
|
23229
|
+
root.classList.remove(REFRACTION_GATE_CLASS);
|
|
23230
|
+
} catch {
|
|
23231
|
+
}
|
|
23232
|
+
}
|
|
23233
|
+
};
|
|
23234
|
+
}
|
|
23235
|
+
|
|
22640
23236
|
// src/client/i18n.js
|
|
22641
23237
|
function hostLanguageKind(hostLanguage) {
|
|
22642
23238
|
if (typeof hostLanguage !== "string") return void 0;
|
|
@@ -22650,7 +23246,6 @@ function hostLanguageKind(hostLanguage) {
|
|
|
22650
23246
|
function resolveLanguage(setting, hostLanguage) {
|
|
22651
23247
|
if (setting === "zh") return "zh";
|
|
22652
23248
|
if (setting === "en") return "en";
|
|
22653
|
-
if (setting !== "auto") return DEFAULT_LANGUAGE;
|
|
22654
23249
|
const host = hostLanguageKind(hostLanguage);
|
|
22655
23250
|
if (host === "zh") return "zh";
|
|
22656
23251
|
if (host === "en") return "en";
|
|
@@ -22906,9 +23501,13 @@ body[data-dsh-inline-diff-appearance='light'] {
|
|
|
22906
23501
|
}
|
|
22907
23502
|
[data-shell-tone='dark'] {
|
|
22908
23503
|
--did-shell-base: #101216;
|
|
22909
|
-
|
|
22910
|
-
|
|
22911
|
-
|
|
23504
|
+
/* 强制深色外壳时,表面底色默认使用中性深色而不是主题 token:浅色外观(以及
|
|
23505
|
+
第三方浅色主题)下 --dsw-alias-bg-layer-* 是浅色,用主题 token 会把「深色
|
|
23506
|
+
外壳」做成白底 + 浅色文字(不可读)。下面的外观作用域规则在深色外观下再把
|
|
23507
|
+
主题的深色表面色相接回来,兼顾「强制基调」与「跟随主题」。 */
|
|
23508
|
+
--did-surface-1: #1a1c22;
|
|
23509
|
+
--did-surface-2: #202329;
|
|
23510
|
+
--did-surface-elevated: #202329;
|
|
22912
23511
|
--did-fg-primary: #eef1f8;
|
|
22913
23512
|
--did-fg-secondary: #c3cade;
|
|
22914
23513
|
--did-fg-tertiary: #94a1bc;
|
|
@@ -22917,6 +23516,19 @@ body[data-dsh-inline-diff-appearance='light'] {
|
|
|
22917
23516
|
--did-seg-bg: var(--dsw-alias-bg-layer-2, #202329);
|
|
22918
23517
|
--did-seg-active: color-mix(in srgb, var(--dsw-alias-brand-primary, #5686fe) 30%, #1e2128);
|
|
22919
23518
|
}
|
|
23519
|
+
/* 强制外壳色调与当前外观一致时,沿用主题自己的表面色相(第三方主题也能带出自己的
|
|
23520
|
+
蓝/紫/金等色调);外观相反时保持上面的中性强制色,保证文字对比度不被浅色 token
|
|
23521
|
+
冲掉。 */
|
|
23522
|
+
body[data-dsh-inline-diff-appearance='dark'] [data-shell-tone='dark'] {
|
|
23523
|
+
--did-surface-1: var(--dsw-alias-bg-layer-1, #1a1c22);
|
|
23524
|
+
--did-surface-2: var(--dsw-alias-bg-layer-2, #202329);
|
|
23525
|
+
--did-surface-elevated: var(--dsw-alias-bg-layer-2, #202329);
|
|
23526
|
+
}
|
|
23527
|
+
body[data-dsh-inline-diff-appearance='light'] [data-shell-tone='light'] {
|
|
23528
|
+
--did-surface-1: var(--dsw-alias-bg-layer-1, #f4f6f9);
|
|
23529
|
+
--did-surface-2: var(--dsw-alias-bg-layer-2, #edf0f4);
|
|
23530
|
+
--did-surface-elevated: var(--dsw-alias-bg-layer-2, #edf0f4);
|
|
23531
|
+
}
|
|
22920
23532
|
[data-inner-tone='light'] {
|
|
22921
23533
|
--did-io-bg: #f8f9fb;
|
|
22922
23534
|
--did-io-fg: #1b1c1e;
|
|
@@ -22937,7 +23549,11 @@ body[data-dsh-inline-diff-appearance='light'] {
|
|
|
22937
23549
|
}
|
|
22938
23550
|
/* ---- 增强风格平铺命令执行行(bash / pwsh / win_bash) ---- */
|
|
22939
23551
|
.enhanced-tool {
|
|
22940
|
-
|
|
23552
|
+
/* 代码字体只取“字体族”token:--dsw-font-markdown-code-block-small 是 font 简写
|
|
23553
|
+
(字号/行高/字族),直接当 font-family 用会得到非法值并回退宿主正文字体。
|
|
23554
|
+
DSH 主题在 body 上提供 --ds-font-family-code,:root 上提供
|
|
23555
|
+
--dsh-font-family-code-default 作为内置字体栈兜底。 */
|
|
23556
|
+
--enhanced-mono: var(--ds-font-family-code, var(--dsh-font-family-code-default, ui-monospace, SFMono-Regular, Menlo, Consolas, monospace));
|
|
22941
23557
|
display: flex;
|
|
22942
23558
|
flex-direction: column;
|
|
22943
23559
|
/* 头部与 IO 面板之间不留 gap:IN 状态条必须直接顶到标题条,中间不能有空白带。
|
|
@@ -23336,7 +23952,7 @@ body[data-dsh-inline-diff-appearance='light'] {
|
|
|
23336
23952
|
.did-settings-scroll { padding: 12px 10px 14px 16px; }
|
|
23337
23953
|
}
|
|
23338
23954
|
.did-card {
|
|
23339
|
-
--did-mono: var(--
|
|
23955
|
+
--did-mono: var(--ds-font-family-code, var(--dsh-font-family-code-default, ui-monospace, SFMono-Regular, Menlo, Consolas, monospace));
|
|
23340
23956
|
--did-inset-x: 9px;
|
|
23341
23957
|
display: flex;
|
|
23342
23958
|
flex-direction: column;
|
|
@@ -23615,7 +24231,7 @@ body[data-dsh-inline-diff-appearance='light'] {
|
|
|
23615
24231
|
padding: 0 5px;
|
|
23616
24232
|
border: 0.5px solid currentColor;
|
|
23617
24233
|
border-radius: 999px;
|
|
23618
|
-
font-family: var(--
|
|
24234
|
+
font-family: var(--dsw-font-family, system-ui, sans-serif);
|
|
23619
24235
|
font-size: 10px;
|
|
23620
24236
|
line-height: 14px;
|
|
23621
24237
|
white-space: nowrap;
|
|
@@ -23832,7 +24448,7 @@ body[data-dsh-inline-diff-appearance='light'] {
|
|
|
23832
24448
|
border: 0.5px solid var(--did-border-2);
|
|
23833
24449
|
border-radius: 999px;
|
|
23834
24450
|
color: var(--did-fg-tertiary);
|
|
23835
|
-
font-family: var(--enhanced-mono, var(--
|
|
24451
|
+
font-family: var(--enhanced-mono, var(--ds-font-family-code, ui-monospace, monospace));
|
|
23836
24452
|
font-size: 10.5px;
|
|
23837
24453
|
line-height: 16px;
|
|
23838
24454
|
white-space: nowrap;
|
|
@@ -23848,7 +24464,7 @@ body[data-dsh-inline-diff-appearance='light'] {
|
|
|
23848
24464
|
grid-template-columns: 2.7em minmax(0, 1fr) auto;
|
|
23849
24465
|
min-width: 0;
|
|
23850
24466
|
padding: 0 var(--did-inset-x) 0 14px;
|
|
23851
|
-
font-family: var(--did-mono,
|
|
24467
|
+
font-family: var(--did-mono, var(--ds-font-family-code, ui-monospace, SFMono-Regular, Menlo, Consolas, monospace));
|
|
23852
24468
|
font-size: calc(var(--dsh-content-font-size-secondary, 13px) - 1px);
|
|
23853
24469
|
line-height: 18px;
|
|
23854
24470
|
border-left: 0.5px solid transparent;
|
|
@@ -23903,150 +24519,1370 @@ body[data-dsh-inline-diff-appearance='light'] {
|
|
|
23903
24519
|
}
|
|
23904
24520
|
.did-langs { display: flex; flex-wrap: wrap; gap: 4px; margin-top: 8px; }
|
|
23905
24521
|
.did-langs .did-lang { font-size: 10.5px; line-height: 18px; }
|
|
23906
|
-
`;
|
|
23907
24522
|
|
|
23908
|
-
|
|
23909
|
-
|
|
23910
|
-
|
|
23911
|
-
|
|
23912
|
-
|
|
23913
|
-
|
|
23914
|
-
|
|
23915
|
-
|
|
23916
|
-
|
|
23917
|
-
|
|
23918
|
-
|
|
23919
|
-
|
|
23920
|
-
|
|
23921
|
-
|
|
23922
|
-
|
|
23923
|
-
|
|
23924
|
-
|
|
23925
|
-
|
|
23926
|
-
|
|
23927
|
-
|
|
23928
|
-
|
|
23929
|
-
|
|
23930
|
-
|
|
23931
|
-
|
|
23932
|
-
|
|
23933
|
-
|
|
23934
|
-
|
|
23935
|
-
|
|
24523
|
+
/* ============================================================================
|
|
24524
|
+
---- 外观效果:原生 / 磨砂玻璃 / 液态玻璃 ----
|
|
24525
|
+
----------------------------------------------------------------------------
|
|
24526
|
+
本区段是「外观效果」的唯一 CSS 实现,**只追加、不改上面的任何旧规则**:
|
|
24527
|
+
所有规则都以 [data-fx='glass'|'liquid'] / [data-liquid-mode] / [data-fx-root='true']
|
|
24528
|
+
为前缀,因此全 native(默认)时一条都不会命中,1.3.0 的既有外观零回归。
|
|
24529
|
+
|
|
24530
|
+
DOM 契约(surfaces.js 与 .team/glass-contract.md):
|
|
24531
|
+
· 每个可视表面元素带 data-fx(native/glass/liquid 三值都写)、data-fx-surface;
|
|
24532
|
+
liquid 时另有 data-liquid-mode="clear|frosted";
|
|
24533
|
+
内联变量 --did-fx-alpha(0.05–1,无单位)与 --did-fx-blur(px)。
|
|
24534
|
+
· 卡片根 .did-card / .enhanced-tool 在任一子表面非 native 时带 data-fx-root="true"。
|
|
24535
|
+
· 9 个表面:fileCardHeader / fileCardBody / diffModal / commandHeader /
|
|
24536
|
+
commandIO / toolHeader / toolIO / readRangeChip / settingsPanel。
|
|
24537
|
+
|
|
24538
|
+
实现要点:
|
|
24539
|
+
1) 材质画在**子表面自己**身上(头部 / IO / 差异区 / 弹窗 / 徽标)。卡片根在
|
|
24540
|
+
fx-root 上下文里交出底色与边框,否则子表面的 backdrop-filter 只能看到卡片
|
|
24541
|
+
自己的不透明底,看不到背后的页面壁纸(§4);
|
|
24542
|
+
2) fx-root 上下文里的 native 子表面把原底色补回来(§4.2),保证“一半玻璃
|
|
24543
|
+
一半原生”自然。无 data-fx-root 时一律命中不到这些规则;
|
|
24544
|
+
3) 液态玻璃的折射使用 Chromium 的 backdrop-filter: url(#…)(研究结论:折射
|
|
24545
|
+
必须与 blur 写在**同一条** backdrop-filter 声明里,嵌套 backdrop-filter 会被
|
|
24546
|
+
忽略;@supports 对 url() 会误报,所以由 index.jsx 启动时探测并给 <html>
|
|
24547
|
+
加 .did-glass-refract-ok 门控类)。不支持折射的引擎自动退回“只有模糊”的材质;
|
|
24548
|
+
4) 不支持 backdrop-filter 的引擎(@supports not …)退回更高不透明度的半透明
|
|
24549
|
+
底色,保证可读;prefers-reduced-transparency / forced-colors 同理降级(§7);
|
|
24550
|
+
5) 性能:backdrop-filter 只挂在真正 glass/liquid 的表面元素上,不加
|
|
24551
|
+
will-change;卡片根只画一条 0.5px 轮廓(::after),不做模糊。
|
|
24552
|
+
|
|
24553
|
+
主题:材质底色全部来自现有 --did-* token(--did-surface-1 / --did-io-bg /
|
|
24554
|
+
--did-dialog-surface / --did-surface-elevated),高光/内阴影按深浅外观与每张卡片
|
|
24555
|
+
自己的外壳色调(data-shell-tone)切换;文字颜色一律不动,靠半透明底色保证可读。
|
|
24556
|
+
========================================================================== */
|
|
24557
|
+
|
|
24558
|
+
/* ---- 外观效果 1. 派生变量(材质参数) --------------------------------- */
|
|
24559
|
+
[data-fx] {
|
|
24560
|
+
/* 用户可调项:markup 以内联 style 写入;这里给兜底值,避免纯 DOM 侧
|
|
24561
|
+
(read-range-dom.js)漏写时 var() 解析失败把整条声明丢掉。 */
|
|
24562
|
+
--did-fx-alpha: 0.55;
|
|
24563
|
+
--did-fx-blur: 14px;
|
|
24564
|
+
|
|
24565
|
+
/* 系数:磨砂玻璃 = 1:1;液态玻璃两种模式在 §1.2 覆盖 */
|
|
24566
|
+
--did-fx-alpha-k: 1;
|
|
24567
|
+
--did-fx-blur-k: 1;
|
|
24568
|
+
|
|
24569
|
+
/* 最终生效的透明度(0.02–1)与模糊半径 */
|
|
24570
|
+
--did-fx-alpha-eff: clamp(0.02, calc(var(--did-fx-alpha) * var(--did-fx-alpha-k)), 1);
|
|
24571
|
+
--did-fx-blur-eff: calc(var(--did-fx-blur) * var(--did-fx-blur-k));
|
|
24572
|
+
/* 可读性底衬:代码类表面额外叠一小段固定浓度。公式 α' = α + boost × (1 − α)
|
|
24573
|
+
随滑杆线性收敛(α=1 时仍是 1、α 越小增补越多),所以滑杆始终有效,只是避免
|
|
24574
|
+
用户把透明度拉到很低时大片代码直接糊在壁纸上。逐表面取值见本节下方。 */
|
|
24575
|
+
--did-fx-alpha-boost: 0;
|
|
24576
|
+
--did-fx-alpha-final: calc(var(--did-fx-alpha-eff) + var(--did-fx-alpha-boost) * (1 - var(--did-fx-alpha-eff)));
|
|
24577
|
+
|
|
24578
|
+
/* backdrop-filter 调色:base 是“原始值”,k 是模式/外观的乘数,分开声明是为了
|
|
24579
|
+
让浅色外观覆盖 base 时不会把 clear/frosted 的相对差异冲掉。 */
|
|
24580
|
+
--did-fx-sat-base: 1.6;
|
|
24581
|
+
--did-fx-bright-base: 1.04;
|
|
24582
|
+
--did-fx-sat-k: 1;
|
|
24583
|
+
--did-fx-bright-k: 1;
|
|
24584
|
+
--did-fx-sat: calc(var(--did-fx-sat-base) * var(--did-fx-sat-k));
|
|
24585
|
+
--did-fx-bright: calc(var(--did-fx-bright-base) * var(--did-fx-bright-k));
|
|
24586
|
+
|
|
24587
|
+
/* 材质底色来源:外壳类表面用主题表面色,代码/IO 类表面在下面换成代码块底色。
|
|
24588
|
+
用 rgb(from …) 相对色语法在“用户透明度”上重新取 alpha,因此主题 token 自带
|
|
24589
|
+
的透明度不会叠加。 */
|
|
24590
|
+
--did-fx-tint-base: var(--did-surface-1);
|
|
24591
|
+
|
|
24592
|
+
/* 深浅外观共用的高光/内阴影色板(浅色外观在 §1.3 覆盖) */
|
|
24593
|
+
--did-fx-sheen-strong: rgb(255 255 255 / 0.55);
|
|
24594
|
+
--did-fx-sheen-mid: rgb(255 255 255 / 0.16);
|
|
24595
|
+
--did-fx-sheen-soft: rgb(255 255 255 / 0.30);
|
|
24596
|
+
--did-fx-shade: rgb(0 0 0 / 0.20);
|
|
24597
|
+
--did-fx-hairline: rgb(255 255 255 / 0.13);
|
|
24598
|
+
--did-fx-rim-k: 1;
|
|
24599
|
+
--did-fx-rim-opacity: min(1, calc(0.95 * var(--did-fx-rim-k)));
|
|
24600
|
+
--did-fx-noise-opacity: 0.12;
|
|
24601
|
+
|
|
24602
|
+
/* 细色散:液态玻璃边缘极轻的冷暖分色(真正色散做不到,用两条 1px 半透明线近似) */
|
|
24603
|
+
--did-fx-fringe-a: rgb(130 210 255 / 0.10);
|
|
24604
|
+
--did-fx-fringe-b: rgb(255 150 210 / 0.08);
|
|
24605
|
+
|
|
24606
|
+
/* 材质的多层背景(glass / liquid 各一套;浅色外观在 §1.3 换更淡的一套) */
|
|
24607
|
+
--did-fx-glass-image:
|
|
24608
|
+
linear-gradient(180deg, rgb(255 255 255 / 0.055) 0%, rgb(255 255 255 / 0) 58%),
|
|
24609
|
+
linear-gradient(112deg, rgb(255 255 255 / 0.04) 0%, rgb(255 255 255 / 0) 42%);
|
|
24610
|
+
--did-fx-bloom: rgb(255 255 255 / calc(0.06 + 0.12 * var(--did-fx-alpha-final)));
|
|
24611
|
+
--did-fx-liquid-image:
|
|
24612
|
+
radial-gradient(120% 90% at 8% -28%, var(--did-fx-bloom), rgb(255 255 255 / 0) 56%),
|
|
24613
|
+
linear-gradient(112deg, rgb(255 255 255 / 0.10) 0%, rgb(255 255 255 / 0.028) 30%, rgb(255 255 255 / 0) 56%),
|
|
24614
|
+
linear-gradient(180deg, rgb(255 255 255 / 0.05) 0%, rgb(255 255 255 / 0) 62%);
|
|
24615
|
+
|
|
24616
|
+
/* 单独浮层(差异弹窗 / 设置面板 / 行范围徽标)的投影;卡片内子表面不投影,
|
|
24617
|
+
保持与原生一致的外轮廓。 */
|
|
24618
|
+
--did-fx-outer: 0 0 0 0 transparent;
|
|
24619
|
+
--did-fx-drop: rgb(0 0 0 / 0.22);
|
|
23936
24620
|
}
|
|
23937
|
-
|
|
23938
|
-
|
|
23939
|
-
|
|
23940
|
-
|
|
24621
|
+
|
|
24622
|
+
/* 材质底色来源:差异区 / IO 用官方代码块底色;弹窗用弹层底色;设置面板用抬升表面。 */
|
|
24623
|
+
[data-fx-surface='fileCardBody'],
|
|
24624
|
+
[data-fx-surface='commandIO'],
|
|
24625
|
+
[data-fx-surface='toolIO'] { --did-fx-tint-base: var(--did-io-bg); }
|
|
24626
|
+
[data-fx-surface='diffModal'] { --did-fx-tint-base: var(--did-dialog-surface); }
|
|
24627
|
+
[data-fx-surface='settingsPanel'] { --did-fx-tint-base: var(--did-surface-elevated); }
|
|
24628
|
+
/* 逐表面的可读性底衬:代码/IO 区最需要(大片文字直接压在壁纸上),头部等小面积
|
|
24629
|
+
元素只需要一点点,徽标更小、更要“浮”起来所以稍高。 */
|
|
24630
|
+
[data-fx-surface='fileCardHeader'],
|
|
24631
|
+
[data-fx-surface='commandHeader'],
|
|
24632
|
+
[data-fx-surface='toolHeader'] { --did-fx-alpha-boost: 0.06; }
|
|
24633
|
+
[data-fx-surface='fileCardBody'],
|
|
24634
|
+
[data-fx-surface='commandIO'],
|
|
24635
|
+
[data-fx-surface='toolIO'] { --did-fx-alpha-boost: 0.22; }
|
|
24636
|
+
[data-fx-surface='diffModal'] { --did-fx-alpha-boost: 0.08; }
|
|
24637
|
+
[data-fx-surface='settingsPanel'] { --did-fx-alpha-boost: 0.2; }
|
|
24638
|
+
[data-fx-surface='readRangeChip'] { --did-fx-alpha-boost: 0.34; }
|
|
24639
|
+
/* 卡片底部 foot 虽然也归 fileCardBody 表面,但原底色是外壳色,保持外壳色调。 */
|
|
24640
|
+
.did-card > .did-foot[data-fx-surface='fileCardBody'] { --did-fx-tint-base: var(--did-surface-1); }
|
|
24641
|
+
/* “与外壳一致”的内部配色把 --did-io-bg 设成 transparent;相对色语法从 transparent
|
|
24642
|
+
取通道会退化成黑色,浅色外观里会出现黑玻璃。这种组合改回外壳色做材质。 */
|
|
24643
|
+
[data-inner-tone='same'] [data-fx-surface='fileCardBody'],
|
|
24644
|
+
[data-inner-tone='same'] [data-fx-surface='commandIO'],
|
|
24645
|
+
[data-inner-tone='same'] [data-fx-surface='toolIO'] { --did-fx-tint-base: var(--did-surface-1); }
|
|
24646
|
+
|
|
24647
|
+
/* 外壳色调与当前外观相反时(浅色外观里把卡片外壳设为深色,或深色外观里设为浅色),
|
|
24648
|
+
头部是一小块半透明材质,13px 标题在页面背景上容易掉到 WCAG AA 以下;把这一情形
|
|
24649
|
+
的头部底衬透明度提高一档,保证深底浅字/浅底深字仍然清晰。用户手动调低的透明度
|
|
24650
|
+
仍按 alpha 系数生效,这里只做固定比例的可读性补偿。 */
|
|
24651
|
+
body[data-dsh-inline-diff-appearance='light'] [data-shell-tone='dark'] [data-fx-surface='fileCardHeader'],
|
|
24652
|
+
body[data-dsh-inline-diff-appearance='light'] [data-shell-tone='dark'] [data-fx-surface='commandHeader'],
|
|
24653
|
+
body[data-dsh-inline-diff-appearance='light'] [data-shell-tone='dark'] [data-fx-surface='toolHeader'],
|
|
24654
|
+
body[data-dsh-inline-diff-appearance='dark'] [data-shell-tone='light'] [data-fx-surface='fileCardHeader'],
|
|
24655
|
+
body[data-dsh-inline-diff-appearance='dark'] [data-shell-tone='light'] [data-fx-surface='commandHeader'],
|
|
24656
|
+
body[data-dsh-inline-diff-appearance='dark'] [data-shell-tone='light'] [data-fx-surface='toolHeader'] {
|
|
24657
|
+
--did-fx-alpha-boost: 0.32;
|
|
23941
24658
|
}
|
|
23942
|
-
|
|
23943
|
-
|
|
23944
|
-
|
|
23945
|
-
|
|
23946
|
-
|
|
23947
|
-
.did-tok[data-g='prop'] { color: var(--did-syn-prop); }
|
|
23948
|
-
.did-tok[data-g='com'] { color: var(--did-syn-com); }
|
|
23949
|
-
.did-tok[data-g='meta'] { color: var(--did-syn-meta); }
|
|
23950
|
-
.did-tok[data-g='op'] { color: var(--did-syn-op); }
|
|
23951
|
-
.did-tok[data-g='punct'] { color: var(--did-syn-punct); }
|
|
23952
|
-
/* 次级分组复用相近色相,不再增加颜色数量。 */
|
|
23953
|
-
.did-tok[data-g='fn'],
|
|
23954
|
-
.did-tok[data-g='tag'],
|
|
23955
|
-
.did-tok[data-g='head'] { color: var(--did-syn-kw); }
|
|
23956
|
-
.did-tok[data-g='attr'],
|
|
23957
|
-
.did-tok[data-g='link'] { color: var(--did-syn-str); }
|
|
23958
|
-
.did-tok[data-g='lit'] { color: var(--did-syn-num); }
|
|
23959
|
-
/* 普通标识符与强调文字保持代码默认前景色。 */
|
|
23960
|
-
.did-tok[data-g='var'],
|
|
23961
|
-
.did-tok[data-g='emph'] { color: inherit; }
|
|
23962
|
-
`.trim();
|
|
23963
|
-
var EMPHASIS_RULES = `
|
|
23964
|
-
[data-syn-emphasis='on'] .did-tok[data-g='kw'],
|
|
23965
|
-
[data-syn-emphasis='on'] .did-tok[data-g='fn'],
|
|
23966
|
-
[data-syn-emphasis='on'] .did-tok[data-g='type'],
|
|
23967
|
-
[data-syn-emphasis='on'] .did-tok[data-g='tag'],
|
|
23968
|
-
[data-syn-emphasis='on'] .did-tok[data-g='head'] { font-weight: 600; }
|
|
23969
|
-
[data-syn-emphasis='on'] .did-tok[data-g='com'] { font-style: italic; }
|
|
23970
|
-
[data-syn-emphasis='on'] .did-tok[data-g='link'] { text-decoration: underline; }
|
|
23971
|
-
/* “仅颜色”:确保没有任何字体样式从别处泄漏进来。 */
|
|
23972
|
-
[data-syn-emphasis='off'] .did-tok {
|
|
23973
|
-
font-weight: inherit;
|
|
23974
|
-
font-style: inherit;
|
|
23975
|
-
text-decoration: inherit;
|
|
24659
|
+
|
|
24660
|
+
/* 单独浮层的投影(与原生 1.3.0 的弹窗阴影保持同一观感)。 */
|
|
24661
|
+
[data-fx-surface='diffModal'],
|
|
24662
|
+
[data-fx-surface='settingsPanel'] {
|
|
24663
|
+
--did-fx-outer: 0 18px 60px color-mix(in srgb, var(--did-fg-primary) 12%, transparent);
|
|
23976
24664
|
}
|
|
23977
|
-
|
|
23978
|
-
var
|
|
23979
|
-
.did-lang {
|
|
23980
|
-
display: inline-flex;
|
|
23981
|
-
flex: none;
|
|
23982
|
-
align-items: center;
|
|
23983
|
-
padding: 0 5px;
|
|
23984
|
-
border: 0.5px solid var(--did-border-2);
|
|
23985
|
-
border-radius: 999px;
|
|
23986
|
-
background: color-mix(in srgb, var(--did-fg-primary) 5%, transparent);
|
|
23987
|
-
color: var(--did-fg-tertiary);
|
|
23988
|
-
font-family: var(--did-mono, ui-monospace, monospace);
|
|
23989
|
-
font-size: 10px;
|
|
23990
|
-
line-height: 15px;
|
|
23991
|
-
letter-spacing: 0.02em;
|
|
23992
|
-
white-space: nowrap;
|
|
23993
|
-
user-select: none;
|
|
24665
|
+
[data-fx-surface='settingsPanel'].did-settings-page {
|
|
24666
|
+
--did-fx-outer: 0 12px 36px -18px color-mix(in srgb, var(--did-fg-primary) 18%, transparent);
|
|
23994
24667
|
}
|
|
23995
|
-
|
|
23996
|
-
|
|
23997
|
-
|
|
23998
|
-
|
|
24668
|
+
[data-fx-surface='readRangeChip'] { --did-fx-outer: 0 1px 2px var(--did-fx-drop); }
|
|
24669
|
+
|
|
24670
|
+
/* ---- 外观效果 1.2. 液态模式系数与玻璃参数 ----------------------------- */
|
|
24671
|
+
[data-fx='liquid'] {
|
|
24672
|
+
--did-fx-sat-base: 1.8;
|
|
24673
|
+
--did-fx-bright-base: 1.05;
|
|
24674
|
+
}
|
|
24675
|
+
/* frosted(带一点模糊)= 用户模糊 ×1、材质更浓稠、饱和度略收(研究建议 1.15 / 0.95) */
|
|
24676
|
+
[data-fx='liquid'][data-liquid-mode='frosted'] {
|
|
24677
|
+
--did-fx-alpha-k: 1.15;
|
|
24678
|
+
--did-fx-blur-k: 1;
|
|
24679
|
+
--did-fx-sat-k: 0.95;
|
|
24680
|
+
}
|
|
24681
|
+
/* clear(完全通透)= 模糊 ×0.12(14px → 1.7px)、材质更薄、饱和度更高(接近透镜) */
|
|
24682
|
+
[data-fx='liquid'][data-liquid-mode='clear'] {
|
|
24683
|
+
--did-fx-alpha-k: 0.5;
|
|
24684
|
+
--did-fx-blur-k: 0.12;
|
|
24685
|
+
--did-fx-sat-k: 1.14;
|
|
24686
|
+
--did-fx-bright-k: 0.97;
|
|
24687
|
+
--did-fx-rim-k: 1.12;
|
|
24688
|
+
--did-fx-noise-opacity: 0.08;
|
|
23999
24689
|
}
|
|
24000
|
-
|
|
24001
|
-
|
|
24002
|
-
|
|
24003
|
-
|
|
24004
|
-
|
|
24005
|
-
|
|
24006
|
-
|
|
24007
|
-
|
|
24008
|
-
|
|
24009
|
-
|
|
24690
|
+
|
|
24691
|
+
/* ---- 外观效果 1.3. 浅色外观 / 每张卡片外壳色调的材质色板 --------------
|
|
24692
|
+
选择器同时覆盖两种情况:
|
|
24693
|
+
· body[data-dsh-inline-diff-appearance='light'] —— 宿主当前浅色外观;
|
|
24694
|
+
· [data-shell-tone='light'|'dark'] —— 设置里为单张卡片指定的外壳色调。
|
|
24695
|
+
顺序保证:卡片自己的色调覆盖宿主外观(浅色外观里的深色外壳卡片仍用白高光)。 */
|
|
24696
|
+
body[data-dsh-inline-diff-appearance='light'] [data-fx],
|
|
24697
|
+
body[data-dsh-inline-diff-appearance='light'] [data-fx-surface],
|
|
24698
|
+
[data-shell-tone='light'] [data-fx],
|
|
24699
|
+
[data-shell-tone='light'][data-fx] {
|
|
24700
|
+
--did-fx-sat-base: 1.35;
|
|
24701
|
+
--did-fx-bright-base: 1;
|
|
24702
|
+
--did-fx-sheen-strong: rgb(255 255 255 / 0.9);
|
|
24703
|
+
--did-fx-sheen-mid: rgb(255 255 255 / 0.55);
|
|
24704
|
+
--did-fx-sheen-soft: rgb(255 255 255 / 0.7);
|
|
24705
|
+
--did-fx-shade: rgb(30 40 60 / 0.12);
|
|
24706
|
+
--did-fx-hairline: rgb(20 24 32 / 0.14);
|
|
24707
|
+
--did-fx-fringe-a: rgb(90 160 220 / 0.07);
|
|
24708
|
+
--did-fx-fringe-b: rgb(220 120 170 / 0.05);
|
|
24709
|
+
--did-fx-noise-opacity: 0.09;
|
|
24710
|
+
--did-fx-glass-image:
|
|
24711
|
+
linear-gradient(180deg, rgb(255 255 255 / 0.30) 0%, rgb(255 255 255 / 0) 60%),
|
|
24712
|
+
linear-gradient(112deg, rgb(255 255 255 / 0.22) 0%, rgb(255 255 255 / 0) 45%);
|
|
24713
|
+
--did-fx-bloom: rgb(255 255 255 / calc(0.18 + 0.18 * var(--did-fx-alpha-final)));
|
|
24714
|
+
--did-fx-liquid-image:
|
|
24715
|
+
radial-gradient(120% 90% at 8% -28%, var(--did-fx-bloom), rgb(255 255 255 / 0) 58%),
|
|
24716
|
+
linear-gradient(112deg, rgb(255 255 255 / 0.34) 0%, rgb(255 255 255 / 0.10) 32%, rgb(255 255 255 / 0) 58%),
|
|
24717
|
+
linear-gradient(180deg, rgb(255 255 255 / 0.22) 0%, rgb(255 255 255 / 0) 62%);
|
|
24718
|
+
--did-fx-drop: rgb(30 40 60 / 0.22);
|
|
24719
|
+
}
|
|
24720
|
+
[data-shell-tone='dark'] [data-fx],
|
|
24721
|
+
[data-shell-tone='dark'][data-fx] {
|
|
24722
|
+
--did-fx-sat-base: 1.8;
|
|
24723
|
+
--did-fx-bright-base: 1.05;
|
|
24724
|
+
--did-fx-sheen-strong: rgb(255 255 255 / 0.55);
|
|
24725
|
+
--did-fx-sheen-mid: rgb(255 255 255 / 0.16);
|
|
24726
|
+
--did-fx-sheen-soft: rgb(255 255 255 / 0.30);
|
|
24727
|
+
--did-fx-shade: rgb(0 0 0 / 0.20);
|
|
24728
|
+
--did-fx-hairline: rgb(255 255 255 / 0.13);
|
|
24729
|
+
--did-fx-fringe-a: rgb(130 210 255 / 0.10);
|
|
24730
|
+
--did-fx-fringe-b: rgb(255 150 210 / 0.08);
|
|
24731
|
+
--did-fx-noise-opacity: 0.12;
|
|
24732
|
+
--did-fx-glass-image:
|
|
24733
|
+
linear-gradient(180deg, rgb(255 255 255 / 0.055) 0%, rgb(255 255 255 / 0) 58%),
|
|
24734
|
+
linear-gradient(112deg, rgb(255 255 255 / 0.04) 0%, rgb(255 255 255 / 0) 42%);
|
|
24735
|
+
--did-fx-bloom: rgb(255 255 255 / calc(0.06 + 0.12 * var(--did-fx-alpha-final)));
|
|
24736
|
+
--did-fx-liquid-image:
|
|
24737
|
+
radial-gradient(120% 90% at 8% -28%, var(--did-fx-bloom), rgb(255 255 255 / 0) 56%),
|
|
24738
|
+
linear-gradient(112deg, rgb(255 255 255 / 0.10) 0%, rgb(255 255 255 / 0.028) 30%, rgb(255 255 255 / 0) 56%),
|
|
24739
|
+
linear-gradient(180deg, rgb(255 255 255 / 0.05) 0%, rgb(255 255 255 / 0) 62%);
|
|
24740
|
+
--did-fx-drop: rgb(0 0 0 / 0.22);
|
|
24010
24741
|
}
|
|
24011
|
-
|
|
24012
|
-
|
|
24013
|
-
|
|
24014
|
-
|
|
24015
|
-
|
|
24016
|
-
|
|
24017
|
-
|
|
24018
|
-
|
|
24742
|
+
|
|
24743
|
+
/* ---- 外观效果 2. 磨砂玻璃(glass) ------------------------------------ */
|
|
24744
|
+
[data-fx='glass'] {
|
|
24745
|
+
position: relative;
|
|
24746
|
+
isolation: isolate;
|
|
24747
|
+
/* 三层声明是逐级增强的回退链:极旧浏览器只拿实体底色(至少可读),支持
|
|
24748
|
+
color-mix 的拿半透明材质,支持相对色语法的按滑杆透明度精确取 alpha。
|
|
24749
|
+
(相对色语法可以直接用 clamp() 得到的数字当 alpha,不受 color-mix 百分比限制。) */
|
|
24750
|
+
background-color: var(--did-fx-tint-base);
|
|
24751
|
+
background-color: color-mix(in srgb, var(--did-fx-tint-base) calc(var(--did-fx-alpha-final) * 100%), transparent);
|
|
24752
|
+
background-color: rgb(from var(--did-fx-tint-base) r g b / var(--did-fx-alpha-final));
|
|
24753
|
+
background-image: var(--did-fx-glass-image);
|
|
24754
|
+
background-repeat: no-repeat;
|
|
24755
|
+
-webkit-backdrop-filter: blur(var(--did-fx-blur-eff)) saturate(var(--did-fx-sat)) brightness(var(--did-fx-bright));
|
|
24756
|
+
backdrop-filter: blur(var(--did-fx-blur-eff)) saturate(var(--did-fx-sat)) brightness(var(--did-fx-bright));
|
|
24757
|
+
/* 细高光边框 + 玻璃厚度:顶部 1px 高光、底部 1px 暗边、四周 0.5px 发丝线,
|
|
24758
|
+
再叠两条内侧的大半径柔光,让薄片看起来有厚度。 */
|
|
24759
|
+
box-shadow:
|
|
24760
|
+
inset 0 0 0 0.5px var(--did-fx-hairline),
|
|
24761
|
+
inset 0 1px 0 0 var(--did-fx-sheen-mid),
|
|
24762
|
+
inset 0 -1px 0 0 var(--did-fx-shade),
|
|
24763
|
+
inset 0 14px 26px -22px var(--did-fx-sheen-soft),
|
|
24764
|
+
inset 0 -20px 30px -26px var(--did-fx-shade),
|
|
24765
|
+
var(--did-fx-outer);
|
|
24766
|
+
}
|
|
24767
|
+
/* 头部是可点击的折叠开关,旧规则 .did-head:hover 用 background 简写覆盖底色
|
|
24768
|
+
(还会把 background-image 一起清掉);玻璃头必须把材质原样补回去,
|
|
24769
|
+
否则悬停瞬间会闪成全透明。 */
|
|
24770
|
+
.did-head[data-fx='glass']:hover,
|
|
24771
|
+
.did-head[data-fx='liquid']:hover,
|
|
24772
|
+
.enhanced-head[data-fx='glass']:hover,
|
|
24773
|
+
.enhanced-head[data-fx='liquid']:hover {
|
|
24774
|
+
background-color: rgb(from var(--did-fx-tint-base) r g b / min(1, calc(var(--did-fx-alpha-final) + 0.06)));
|
|
24775
|
+
background-image: var(--did-fx-glass-image);
|
|
24776
|
+
}
|
|
24777
|
+
.did-head[data-fx='liquid']:hover,
|
|
24778
|
+
.enhanced-head[data-fx='liquid']:hover { background-image: var(--did-fx-liquid-image); }
|
|
24779
|
+
|
|
24780
|
+
/* ---- 外观效果 3. 液态玻璃(liquid) ----------------------------------- */
|
|
24781
|
+
/* 材质本体:半透明底色 + 三层背景(左上镜面泛光 / 斜向光泽 / 上沿提亮),
|
|
24782
|
+
backdrop-filter 负责模糊与调色;折射在 §3.2 的门控类下追加到同一条声明里。 */
|
|
24783
|
+
[data-fx='liquid'] {
|
|
24784
|
+
position: relative;
|
|
24785
|
+
isolation: isolate;
|
|
24786
|
+
background-color: var(--did-fx-tint-base);
|
|
24787
|
+
background-color: color-mix(in srgb, var(--did-fx-tint-base) calc(var(--did-fx-alpha-final) * 100%), transparent);
|
|
24788
|
+
background-color: rgb(from var(--did-fx-tint-base) r g b / var(--did-fx-alpha-final));
|
|
24789
|
+
background-image: var(--did-fx-liquid-image);
|
|
24790
|
+
background-repeat: no-repeat;
|
|
24791
|
+
-webkit-backdrop-filter: blur(var(--did-fx-blur-eff)) saturate(var(--did-fx-sat)) brightness(var(--did-fx-bright)) contrast(1.02);
|
|
24792
|
+
backdrop-filter: blur(var(--did-fx-blur-eff)) saturate(var(--did-fx-sat)) brightness(var(--did-fx-bright)) contrast(1.02);
|
|
24793
|
+
/* 边缘 specular + 厚度内阴影 + 极轻色散(色散变量在 §1 定义、浅色外观在 §1.3 覆盖)。 */
|
|
24794
|
+
box-shadow:
|
|
24795
|
+
inset 0 0.5px 0 0 var(--did-fx-sheen-strong),
|
|
24796
|
+
inset 0 -0.5px 0 0 var(--did-fx-sheen-mid),
|
|
24797
|
+
inset 0.5px 0 0 0 var(--did-fx-sheen-mid),
|
|
24798
|
+
inset -0.5px 0 0 0 var(--did-fx-sheen-mid),
|
|
24799
|
+
inset 0 1px 0 0 var(--did-fx-fringe-a),
|
|
24800
|
+
inset 0 -1px 0 0 var(--did-fx-fringe-b),
|
|
24801
|
+
inset 0 2px 4px -2px var(--did-fx-shade),
|
|
24802
|
+
inset 0 -28px 36px -32px var(--did-fx-sheen-soft),
|
|
24803
|
+
inset 0 24px 32px -34px var(--did-fx-shade),
|
|
24804
|
+
var(--did-fx-outer);
|
|
24805
|
+
}
|
|
24806
|
+
/* 噪声层:消掉“塑料感”与 8bit 色带。负 z-index + isolation 让它在材质底色之上、
|
|
24807
|
+
内容之下,因此不需要改动任何子元素的层级(也绝不会拦截点击)。 */
|
|
24808
|
+
[data-fx='liquid']::before {
|
|
24809
|
+
content: '';
|
|
24810
|
+
position: absolute;
|
|
24811
|
+
inset: 0;
|
|
24812
|
+
z-index: -2;
|
|
24813
|
+
border-radius: inherit;
|
|
24814
|
+
pointer-events: none;
|
|
24815
|
+
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='180' height='180'%3E%3Cfilter id='n' x='0' y='0'%3E%3CfeTurbulence type='fractalNoise' baseFrequency='.85' numOctaves='3' stitchTiles='stitch'/%3E%3CfeColorMatrix type='saturate' values='0'/%3E%3C/filter%3E%3Crect width='180' height='180' filter='url(%23n)'/%3E%3C/svg%3E");
|
|
24816
|
+
background-size: 180px 180px;
|
|
24817
|
+
opacity: var(--did-fx-noise-opacity);
|
|
24818
|
+
mix-blend-mode: overlay;
|
|
24819
|
+
}
|
|
24820
|
+
/* 边缘 specular 环:conic 渐变 + mask 挖空成 1px 描边。负 z-index 让它压在材质
|
|
24821
|
+
之上、内容之下;pointer-events:none 保证不拦点击。 */
|
|
24822
|
+
[data-fx='liquid']::after {
|
|
24823
|
+
content: '';
|
|
24824
|
+
position: absolute;
|
|
24825
|
+
inset: 0;
|
|
24826
|
+
z-index: -1;
|
|
24827
|
+
padding: 1px;
|
|
24828
|
+
border-radius: inherit;
|
|
24829
|
+
pointer-events: none;
|
|
24830
|
+
background: conic-gradient(from 215deg at 50% 50%,
|
|
24831
|
+
rgb(255 255 255 / 1) 0deg,
|
|
24832
|
+
rgb(255 255 255 / 0.28) 38deg,
|
|
24833
|
+
rgb(255 255 255 / 0.05) 112deg,
|
|
24834
|
+
rgb(255 255 255 / 0.5) 172deg,
|
|
24835
|
+
rgb(255 255 255 / 0.06) 232deg,
|
|
24836
|
+
rgb(255 255 255 / 0.62) 296deg,
|
|
24837
|
+
rgb(255 255 255 / 1) 360deg);
|
|
24838
|
+
opacity: var(--did-fx-rim-opacity);
|
|
24839
|
+
-webkit-mask: linear-gradient(#000 0 0) content-box, linear-gradient(#000 0 0);
|
|
24840
|
+
-webkit-mask-composite: xor;
|
|
24841
|
+
mask: linear-gradient(#000 0 0) content-box, linear-gradient(#000 0 0);
|
|
24842
|
+
mask-composite: exclude;
|
|
24019
24843
|
}
|
|
24020
|
-
`.trim();
|
|
24021
|
-
var SYNTAX_CSS = `
|
|
24022
|
-
/* ---- 语法高亮:只使用前景色 ---------------------------------------------
|
|
24023
|
-
新增/删除行背景、行号符号与行内改动底色仍由 styles.js 以红/绿表达;
|
|
24024
|
-
这里的规则只改 token 文字颜色。
|
|
24025
|
-
调色板变量声明在 body 上,原因与 styles.js 相同:宿主主题把它的 token 声明
|
|
24026
|
-
在 body,声明在 :root 的 var() 解析不到那些 token(详见 styles.js)。 */
|
|
24027
|
-
${paletteBlock("body", SYNTAX_PALETTE.dark)}
|
|
24028
|
-
/* 官方浅色外观(宿主设置):浅色内层。 */
|
|
24029
|
-
${paletteBlock("body[data-dsh-inline-diff-appearance='light']", SYNTAX_PALETTE.light)}
|
|
24030
|
-
/* 单卡片内部配色覆盖。'auto' 故意不写规则:跟随上面的文档级外观。 */
|
|
24031
|
-
${paletteBlock("[data-inner-tone='light']", SYNTAX_PALETTE.light)}
|
|
24032
|
-
${paletteBlock("[data-inner-tone='dark']", SYNTAX_PALETTE.dark)}
|
|
24033
|
-
/* “内层配色 = 跟随外壳”:代码底色即外壳表面,因此调色板跟随外壳配色。
|
|
24034
|
-
外壳配色 'auto' 同样继承文档外观,所以不需要额外规则。 */
|
|
24035
|
-
${paletteBlock("[data-inner-tone='same'][data-shell-tone='light']", SYNTAX_PALETTE.light)}
|
|
24036
|
-
${paletteBlock("[data-inner-tone='same'][data-shell-tone='dark']", SYNTAX_PALETTE.dark)}
|
|
24037
24844
|
|
|
24038
|
-
|
|
24845
|
+
/* ---- 外观效果 3.2. 折射(Chromium 专有,门控启用) --------------------
|
|
24846
|
+
结论来自 .team/liquid-glass/NOTES.md:
|
|
24847
|
+
· Chromium 支持 backdrop-filter 里的 url(#svgFilter)(真·位移折射);
|
|
24848
|
+
· 折射必须与 blur/saturate 写在**同一条** backdrop-filter 里(嵌套会被忽略);
|
|
24849
|
+
· 一旦 url() 不被识别,整条 backdrop-filter 失效(连 blur 都没了),
|
|
24850
|
+
所以只用 index.jsx 探测通过后挂在 <html> 上的 .did-glass-refract-ok 门控;
|
|
24851
|
+
· 挡位按表面尺寸选:徽标 sm(scale 9)、卡片/弹窗默认 md(scale 18)、
|
|
24852
|
+
clear 模式 lg(scale 30,透镜扭曲更明显)。
|
|
24853
|
+
不支持的引擎(Safari/Firefox/未探测通过)自然停在“只有模糊”的材质上。 */
|
|
24854
|
+
.did-glass-refract-ok [data-fx='liquid'] {
|
|
24855
|
+
-webkit-backdrop-filter: blur(var(--did-fx-blur-eff)) saturate(var(--did-fx-sat)) brightness(var(--did-fx-bright)) contrast(1.02) url(#did-glass-refract-md);
|
|
24856
|
+
backdrop-filter: blur(var(--did-fx-blur-eff)) saturate(var(--did-fx-sat)) brightness(var(--did-fx-bright)) contrast(1.02) url(#did-glass-refract-md);
|
|
24857
|
+
}
|
|
24858
|
+
.did-glass-refract-ok [data-fx='liquid'][data-liquid-mode='clear'] {
|
|
24859
|
+
-webkit-backdrop-filter: blur(var(--did-fx-blur-eff)) saturate(var(--did-fx-sat)) brightness(var(--did-fx-bright)) contrast(1.02) url(#did-glass-refract-lg);
|
|
24860
|
+
backdrop-filter: blur(var(--did-fx-blur-eff)) saturate(var(--did-fx-sat)) brightness(var(--did-fx-bright)) contrast(1.02) url(#did-glass-refract-lg);
|
|
24861
|
+
}
|
|
24862
|
+
/* 小徽标用 sm 挡位:小尺寸表面用大位移会被“吃掉”边缘(研究建议模糊 ≤10px)。
|
|
24863
|
+
选择器与上面的 clear 规则同权重、放在其后,保证徽标在 clear 模式下也用 sm 而不是 lg。 */
|
|
24864
|
+
.did-glass-refract-ok [data-fx='liquid'][data-fx-surface='readRangeChip'] {
|
|
24865
|
+
-webkit-backdrop-filter: blur(var(--did-fx-blur-eff)) saturate(var(--did-fx-sat)) brightness(var(--did-fx-bright)) contrast(1.02) url(#did-glass-refract-sm);
|
|
24866
|
+
backdrop-filter: blur(var(--did-fx-blur-eff)) saturate(var(--did-fx-sat)) brightness(var(--did-fx-bright)) contrast(1.02) url(#did-glass-refract-sm);
|
|
24867
|
+
}
|
|
24039
24868
|
|
|
24040
|
-
|
|
24869
|
+
/* ---- 外观效果 4. 卡片根的 fx-root 上下文 ------------------------------
|
|
24870
|
+
卡片根交出底色与边框,让子表面的 backdrop-filter 能采到页面壁纸;轮廓由
|
|
24871
|
+
一条 0.5px 的覆盖环(::after)负责,颜色沿用卡片原边框色,所以“全玻璃卡片”
|
|
24872
|
+
仍然有一圈完整、贴圆角的发丝线。 */
|
|
24873
|
+
[data-fx-root='true'] {
|
|
24874
|
+
--did-fx-card-ring: color-mix(in srgb, var(--did-border-2) 45%, var(--did-border-1));
|
|
24875
|
+
}
|
|
24876
|
+
.did-card[data-fx-root='true'],
|
|
24877
|
+
.enhanced-tool[data-fx-root='true'] {
|
|
24878
|
+
position: relative;
|
|
24879
|
+
isolation: isolate;
|
|
24880
|
+
background-color: transparent;
|
|
24881
|
+
background-image: none;
|
|
24882
|
+
/* border-color 置透明而不是删边框:宽度保留,布局与 native 完全一致。 */
|
|
24883
|
+
border-color: transparent;
|
|
24884
|
+
}
|
|
24885
|
+
.did-card[data-fx-root='true']::after,
|
|
24886
|
+
.enhanced-tool[data-fx-root='true']::after {
|
|
24887
|
+
content: '';
|
|
24888
|
+
position: absolute;
|
|
24889
|
+
inset: 0;
|
|
24890
|
+
z-index: 8;
|
|
24891
|
+
border-radius: inherit;
|
|
24892
|
+
pointer-events: none;
|
|
24893
|
+
box-shadow: inset 0 0 0 0.5px var(--did-fx-card-ring);
|
|
24894
|
+
}
|
|
24895
|
+
/* 出错态沿用卡片原本的红边语义。 */
|
|
24896
|
+
.did-card[data-fx-root='true'][data-state='error'] {
|
|
24897
|
+
--did-fx-card-ring: color-mix(in srgb, var(--dsw-alias-state-error-primary) 45%, var(--did-border-1));
|
|
24898
|
+
}
|
|
24899
|
+
/* .enhanced-tool 顶部有 4px 内边距(原生时由卡片自己的不透明底填充);fx-root 下
|
|
24900
|
+
卡片根透明,这 4px 会透出壁纸形成一条“断层”。把这段内边距移进头部,让材质
|
|
24901
|
+
覆盖到卡片顶边,总高度不变(折叠态同理把底部内边距移进头部)。 */
|
|
24902
|
+
.enhanced-tool[data-fx-root='true'] { padding-top: 0; }
|
|
24903
|
+
.enhanced-tool[data-fx-root='true'] > .enhanced-head { padding-top: 5px; }
|
|
24904
|
+
.enhanced-tool[data-fx-root='true'][data-body='false'] { padding-bottom: 0; }
|
|
24905
|
+
.enhanced-tool[data-fx-root='true'][data-body='false'] > .enhanced-head { padding-bottom: 5px; }
|
|
24041
24906
|
|
|
24042
|
-
|
|
24043
|
-
|
|
24907
|
+
/* ---- 外观效果 4.2. fx-root 里 native 子表面补回原底色 ------------------
|
|
24908
|
+
只补“原本由卡片根提供”的那一层:
|
|
24909
|
+
· 头部(.did-head / .enhanced-head)原本透明,依赖卡片根的
|
|
24910
|
+
--did-shell-base + --did-surface-1 渐变;
|
|
24911
|
+
· 差异内容区 / IO 面板原本就是 --did-io-bg,底部 foot 是 --did-surface-1,
|
|
24912
|
+
这里显式写回,保证“一半玻璃一半原生”时边界自然、底色不被半透明层影响。 */
|
|
24913
|
+
.did-card[data-fx-root='true'] > .did-head[data-fx='native'] {
|
|
24914
|
+
background-color: var(--did-shell-base);
|
|
24915
|
+
background-image: linear-gradient(var(--did-surface-1), var(--did-surface-1));
|
|
24916
|
+
}
|
|
24917
|
+
/* 原生头在 fx-root 下仍要保留悬停高亮:旧 .did-head:hover 只叠 4% 前景色,
|
|
24918
|
+
在透明卡片根上会变成“透出壁纸”,所以这里把底色和悬停色一起补回来。 */
|
|
24919
|
+
.did-card[data-fx-root='true'] > .did-head[data-fx='native']:hover {
|
|
24920
|
+
background-color: var(--did-shell-base);
|
|
24921
|
+
background-image: linear-gradient(
|
|
24922
|
+
color-mix(in srgb, var(--did-fg-primary) 5%, var(--did-surface-1)),
|
|
24923
|
+
color-mix(in srgb, var(--did-fg-primary) 5%, var(--did-surface-1)));
|
|
24924
|
+
}
|
|
24925
|
+
.did-card[data-fx-root='true'] > .did-body[data-fx='native'] { background: var(--did-io-bg); }
|
|
24926
|
+
.did-card[data-fx-root='true'] > .did-foot[data-fx='native'] { background: var(--did-surface-1); }
|
|
24927
|
+
.enhanced-tool[data-fx-root='true'] > .enhanced-head[data-fx='native'] {
|
|
24928
|
+
background-color: var(--did-shell-base);
|
|
24929
|
+
background-image: linear-gradient(var(--did-surface-1), var(--did-surface-1));
|
|
24930
|
+
}
|
|
24931
|
+
.enhanced-tool[data-fx-root='true'] > .enhanced-io[data-fx='native'] { background: var(--did-io-bg); }
|
|
24932
|
+
/* 内部配色 =「与外壳一致」时 --did-io-bg 是 transparent;在 fx-root 卡片里卡片根
|
|
24933
|
+
已经透明,native 子表面必须补回外壳表面色,否则会直接透出页面背景(混合模式
|
|
24934
|
+
“玻璃头部 + 原生内容区”会露出壁纸)。 */
|
|
24935
|
+
.did-card[data-fx-root='true'][data-inner-tone='same'] > .did-body[data-fx='native'],
|
|
24936
|
+
.enhanced-tool[data-fx-root='true'][data-inner-tone='same'] > .enhanced-io[data-fx='native'] {
|
|
24937
|
+
background: var(--did-surface-1);
|
|
24938
|
+
}
|
|
24044
24939
|
|
|
24045
|
-
|
|
24046
|
-
|
|
24047
|
-
|
|
24048
|
-
|
|
24049
|
-
|
|
24940
|
+
/* ---- 外观效果 4.3. 卡片内材质表面的圆角贴合 ----------------------------
|
|
24941
|
+
卡片根有 --dsw-radius-lg 圆角 + overflow:hidden;材质表面自己再取一次首/尾
|
|
24942
|
+
圆角,边缘高光与色散环才能沿圆角走(否则伪元素描边是直角、在四个角被父级
|
|
24943
|
+
裁断)。中间位置的表面(差异 body / IO)保持直角,与原生一致。
|
|
24944
|
+
只作用于非 native 表面:native 子表面继续完全由父级裁剪,保证零视觉差异。 */
|
|
24945
|
+
.did-card > [data-fx='glass']:first-child,
|
|
24946
|
+
.did-card > [data-fx='liquid']:first-child,
|
|
24947
|
+
.enhanced-tool > [data-fx='glass']:first-child,
|
|
24948
|
+
.enhanced-tool > [data-fx='liquid']:first-child {
|
|
24949
|
+
border-start-start-radius: inherit;
|
|
24950
|
+
border-start-end-radius: inherit;
|
|
24951
|
+
}
|
|
24952
|
+
.did-card > [data-fx='glass']:last-child,
|
|
24953
|
+
.did-card > [data-fx='liquid']:last-child,
|
|
24954
|
+
.enhanced-tool > [data-fx='glass']:last-child,
|
|
24955
|
+
.enhanced-tool > [data-fx='liquid']:last-child {
|
|
24956
|
+
border-end-start-radius: inherit;
|
|
24957
|
+
border-end-end-radius: inherit;
|
|
24958
|
+
}
|
|
24959
|
+
|
|
24960
|
+
/* ---- 外观效果 5. 玻璃/液态表面内部的吸顶横条 --------------------------
|
|
24961
|
+
差异卡片与放大弹窗里的 hunk 表头(.did-bar)原本是不透明的
|
|
24962
|
+
“品牌色 9% + 代码底色”;当承载它的内容区是玻璃时把它改成半透明,
|
|
24963
|
+
否则玻璃材质会被这条横条整块盖住。其它内部小元素(行号、gap、notice)
|
|
24964
|
+
本来就是半透明色,不需要处理。 */
|
|
24965
|
+
.did-body[data-fx='glass'] .did-bar,
|
|
24966
|
+
.did-body[data-fx='liquid'] .did-bar,
|
|
24967
|
+
.did-dialog[data-fx='glass'] .did-bar,
|
|
24968
|
+
.did-dialog[data-fx='liquid'] .did-bar {
|
|
24969
|
+
/* 底色取 --did-fx-tint-base(内部配色 = “与外壳一致”时它已被换成外壳色,
|
|
24970
|
+
避免 --did-io-bg: transparent 被相对色语法解析成黑色)。 */
|
|
24971
|
+
background: color-mix(in srgb,
|
|
24972
|
+
var(--dsw-alias-brand-primary) 9%,
|
|
24973
|
+
rgb(from var(--did-fx-tint-base) r g b / 0.74));
|
|
24974
|
+
}
|
|
24975
|
+
|
|
24976
|
+
/* ---- 外观效果 6. 单独浮层:差异弹窗 / 设置面板 / 行范围徽标 ------------ */
|
|
24977
|
+
/* 差异弹窗(.did-dialog)整窗即材质面:头部/底部/栏头原本是不透明外壳色,
|
|
24978
|
+
现在让材质透出来;差异正文区保留一层 58% 的代码底色作为可读性底衬,
|
|
24979
|
+
避免大片代码直接压在壁纸模糊层上。 */
|
|
24980
|
+
.did-dialog[data-fx='glass'] > .did-dialog-head,
|
|
24981
|
+
.did-dialog[data-fx='liquid'] > .did-dialog-head,
|
|
24982
|
+
.did-dialog[data-fx='glass'] > .did-panes-head,
|
|
24983
|
+
.did-dialog[data-fx='liquid'] > .did-panes-head,
|
|
24984
|
+
.did-dialog[data-fx='glass'] > .did-dialog-foot,
|
|
24985
|
+
.did-dialog[data-fx='liquid'] > .did-dialog-foot {
|
|
24986
|
+
background: transparent;
|
|
24987
|
+
}
|
|
24988
|
+
.did-dialog[data-fx='glass'] > .did-dialog-body,
|
|
24989
|
+
.did-dialog[data-fx='liquid'] > .did-dialog-body {
|
|
24990
|
+
background: color-mix(in srgb, var(--did-io-bg) 58%, transparent);
|
|
24991
|
+
}
|
|
24992
|
+
/* 设置弹窗(.did-settings-dialog)内部本来就是透明的,只需保证横幅、滚动区与
|
|
24993
|
+
身体不覆盖材质;.did-setting 的分隔线与小控件保持原样。 */
|
|
24994
|
+
.did-settings-dialog[data-fx='glass'] > .did-settings-banner,
|
|
24995
|
+
.did-settings-dialog[data-fx='liquid'] > .did-settings-banner,
|
|
24996
|
+
.did-settings-dialog[data-fx='glass'] > .did-settings-scroll,
|
|
24997
|
+
.did-settings-dialog[data-fx='liquid'] > .did-settings-scroll { background: transparent; }
|
|
24998
|
+
/* 设置页面板(.did-settings-page)原本是通栏内容;挂上材质后给它一点内边距和
|
|
24999
|
+
圆角,否则文字会贴着材质边缘。只在非 native 时生效。 */
|
|
25000
|
+
.did-settings-page[data-fx='glass'],
|
|
25001
|
+
.did-settings-page[data-fx='liquid'] {
|
|
25002
|
+
padding: 16px 18px 22px;
|
|
25003
|
+
border-radius: var(--dsw-radius-lg, 16px);
|
|
25004
|
+
}
|
|
25005
|
+
/* 读取行范围徽标:inline-flex 的胶囊,材质直接画在它身上,尺寸/内边距保持不变
|
|
25006
|
+
(原生行里必须保持原布局不跳动);文字提高一档亮度保证半透明底上可读。 */
|
|
25007
|
+
.did-read-range[data-fx='glass'],
|
|
25008
|
+
.did-read-range[data-fx='liquid'] {
|
|
25009
|
+
border-color: color-mix(in srgb, var(--did-border-2) 62%, transparent);
|
|
25010
|
+
color: var(--did-fg-secondary);
|
|
25011
|
+
}
|
|
25012
|
+
|
|
25013
|
+
/* ---- 外观效果 6.2. 设置面板里的「外观效果」分组控件 --------------------
|
|
25014
|
+
由 settings-fx-ui 在设置面板末尾渲染;这里只做渐进增强的布局与滑杆外观,
|
|
25015
|
+
没有本段样式时也能靠既有 .did-setting / .did-seg 等类正常使用。 */
|
|
25016
|
+
.did-fx-details { margin-top: 12px; }
|
|
25017
|
+
/* 与 .did-langs-details 共用 summary;这里把标题提亮成一级文字并稍加粗。 */
|
|
25018
|
+
.did-fx-details > summary {
|
|
25019
|
+
margin-top: 4px;
|
|
25020
|
+
color: var(--did-fg-primary);
|
|
25021
|
+
font-size: 13px;
|
|
25022
|
+
font-weight: 600;
|
|
25023
|
+
}
|
|
25024
|
+
.did-fx-details[open] > summary { margin-bottom: 6px; }
|
|
25025
|
+
.did-fx-content { padding-top: 8px; }
|
|
25026
|
+
.did-fx-desc { margin-top: 6px; }
|
|
25027
|
+
.did-fx-legend { margin-top: 8px; }
|
|
25028
|
+
.did-fx-legend > div + div { margin-top: 2px; }
|
|
25029
|
+
.did-fx-list { display: flex; flex-direction: column; gap: 2px; margin-top: 4px; }
|
|
25030
|
+
/* 每行本身是 .did-setting(flex:左文字列 + 右分段控件)。这里**不加** flex-wrap:
|
|
25031
|
+
参数行的 max-content 是「两个滑杆 + 液态模式」的整排宽度,一旦允许换行,右侧
|
|
25032
|
+
效果分段会被挤到下一行左侧;交给 .did-setting-text(min-width:0)收缩、参数行
|
|
25033
|
+
自己内部换行即可,窄屏由 ≤720px 的列布局处理。 */
|
|
25034
|
+
.did-fx-row { padding: 12px 0; }
|
|
25035
|
+
/* 参数行:透明度滑杆 + 模糊滑杆(+ 液态模式)自动换行,不再首尾相连。 */
|
|
25036
|
+
.did-fx-params {
|
|
25037
|
+
display: flex;
|
|
25038
|
+
flex-wrap: wrap;
|
|
25039
|
+
align-items: center;
|
|
25040
|
+
gap: 6px 16px;
|
|
25041
|
+
margin-top: 8px;
|
|
25042
|
+
}
|
|
25043
|
+
.did-fx-slider {
|
|
25044
|
+
display: inline-flex;
|
|
25045
|
+
align-items: center;
|
|
25046
|
+
gap: 6px;
|
|
25047
|
+
color: var(--did-fg-tertiary);
|
|
25048
|
+
font-size: 11px;
|
|
25049
|
+
line-height: 18px;
|
|
25050
|
+
white-space: nowrap;
|
|
25051
|
+
}
|
|
25052
|
+
.did-fx-range {
|
|
25053
|
+
width: 130px;
|
|
25054
|
+
height: 18px;
|
|
25055
|
+
margin: 0;
|
|
25056
|
+
accent-color: var(--dsw-alias-brand-primary);
|
|
25057
|
+
cursor: pointer;
|
|
25058
|
+
}
|
|
25059
|
+
.did-fx-range:focus-visible { outline: 1px solid var(--dsw-alias-brand-primary); outline-offset: 2px; }
|
|
25060
|
+
/* 数值用等宽数字 + 固定最小宽度,拖动时行宽不抖动。 */
|
|
25061
|
+
.did-fx-slider-value {
|
|
25062
|
+
min-width: 38px;
|
|
25063
|
+
color: var(--did-fg-primary);
|
|
25064
|
+
font-size: 11px;
|
|
25065
|
+
font-variant-numeric: tabular-nums;
|
|
25066
|
+
}
|
|
25067
|
+
.did-fx-mode { margin-top: 2px; }
|
|
25068
|
+
@media (max-width: 720px) {
|
|
25069
|
+
.did-fx-row { flex-direction: column; align-items: stretch; }
|
|
25070
|
+
.did-fx-row .did-setting-control { align-self: flex-start; }
|
|
25071
|
+
.did-fx-params { width: 100%; }
|
|
25072
|
+
.did-fx-range { width: 120px; }
|
|
25073
|
+
}
|
|
25074
|
+
|
|
25075
|
+
/* ---- 外观效果 7. 降级与无障碍 ---------------------------------------- */
|
|
25076
|
+
/* 7.1 不支持 backdrop-filter 的引擎:去掉模糊,换成高不透明度的半透明底色。
|
|
25077
|
+
这里不需要“玻璃感”,只需要保证文字仍然可读。 */
|
|
25078
|
+
@supports not ((backdrop-filter: blur(2px)) or (-webkit-backdrop-filter: blur(2px))) {
|
|
25079
|
+
[data-fx='glass'],
|
|
25080
|
+
[data-fx='liquid'] {
|
|
25081
|
+
-webkit-backdrop-filter: none;
|
|
25082
|
+
backdrop-filter: none;
|
|
25083
|
+
background-color: rgb(from var(--did-fx-tint-base) r g b / clamp(0.72, calc(var(--did-fx-alpha-final) + 0.4), 1));
|
|
25084
|
+
background-image: var(--did-fx-glass-image);
|
|
25085
|
+
}
|
|
25086
|
+
[data-fx='liquid']::before,
|
|
25087
|
+
[data-fx='liquid']::after { display: none; }
|
|
25088
|
+
}
|
|
25089
|
+
/* 7.2 系统“降低透明度”:完全不模糊,材质接近实体(苹果在 same 设置下也是这么做的)。 */
|
|
25090
|
+
@media (prefers-reduced-transparency: reduce) {
|
|
25091
|
+
[data-fx='glass'],
|
|
25092
|
+
[data-fx='liquid'] {
|
|
25093
|
+
-webkit-backdrop-filter: none !important;
|
|
25094
|
+
backdrop-filter: none !important;
|
|
25095
|
+
background-color: rgb(from var(--did-fx-tint-base) r g b / clamp(0.86, calc(var(--did-fx-alpha-final) + 0.34), 1));
|
|
25096
|
+
}
|
|
25097
|
+
[data-fx='liquid']::before { display: none; }
|
|
25098
|
+
[data-fx='liquid']::after { opacity: 0.35; }
|
|
25099
|
+
}
|
|
25100
|
+
/* 7.3 强制颜色模式:只保留 1px 边框,去掉装饰性高光与噪声。 */
|
|
25101
|
+
@media (forced-colors: active) {
|
|
25102
|
+
[data-fx='glass'],
|
|
25103
|
+
[data-fx='liquid'] {
|
|
25104
|
+
background-image: none;
|
|
25105
|
+
border: 1px solid CanvasText;
|
|
25106
|
+
box-shadow: none;
|
|
25107
|
+
}
|
|
25108
|
+
[data-fx='liquid']::before,
|
|
25109
|
+
[data-fx='liquid']::after { display: none; }
|
|
25110
|
+
[data-fx-root='true']::after { display: none; }
|
|
25111
|
+
}
|
|
25112
|
+
|
|
25113
|
+
/* ---- 外观效果 8. 弹窗遮罩的“模糊代理” ---------------------------------
|
|
25114
|
+
原因(研究结论,见 .team/liquid-glass/NOTES.md probe5):Chromium 会忽略嵌套的
|
|
25115
|
+
backdrop-filter —— 祖先元素有 backdrop-filter 时,子元素/伪元素的 backdrop-filter
|
|
25116
|
+
完全失效。放大弹窗(在 .did-overlay 里)与设置弹窗(在 .did-settings-overlay 里)
|
|
25117
|
+
的遮罩层都自带模糊,因此这两个“表面”自身的 blur/折射是惰性的,「模糊」滑杆会
|
|
25118
|
+
没有可见变化。
|
|
25119
|
+
|
|
25120
|
+
修复:把弹窗表面(diffModal / settingsPanel)的模糊参数接到遮罩层上——markup 在
|
|
25121
|
+
表面非 native 时给遮罩挂 data-fx-backdrop 与 --did-fx-blur(surfaces.js 的
|
|
25122
|
+
backdropProxyProps),遮罩按同一个 blur 与 clear/frosted 系数做 backdrop-filter,
|
|
25123
|
+
弹窗内部的半透明材质叠在“已模糊的背景”上。于是模糊滑杆对这两个表面同样生效。
|
|
25124
|
+
表面为 native 时遮罩不带任何属性,旧外观完全不变。 */
|
|
25125
|
+
.did-overlay[data-fx-backdrop],
|
|
25126
|
+
.did-settings-overlay[data-fx-backdrop] {
|
|
25127
|
+
--did-fx-backdrop-blur: var(--did-fx-blur, 14px);
|
|
25128
|
+
background: color-mix(in srgb, var(--dsw-alias-bg-base) 52%, transparent);
|
|
25129
|
+
-webkit-backdrop-filter: blur(var(--did-fx-backdrop-blur)) saturate(1.1) brightness(0.92);
|
|
25130
|
+
backdrop-filter: blur(var(--did-fx-backdrop-blur)) saturate(1.1) brightness(0.92);
|
|
25131
|
+
}
|
|
25132
|
+
/* clear(完全通透):遮罩也几乎不模糊,让弹窗更像一块通透的液态玻璃。 */
|
|
25133
|
+
.did-overlay[data-fx-backdrop='liquid'][data-liquid-mode='clear'],
|
|
25134
|
+
.did-settings-overlay[data-fx-backdrop='liquid'][data-liquid-mode='clear'] {
|
|
25135
|
+
--did-fx-backdrop-blur: calc(var(--did-fx-blur, 14px) * 0.12);
|
|
25136
|
+
background: color-mix(in srgb, var(--dsw-alias-bg-base) 38%, transparent);
|
|
25137
|
+
}
|
|
25138
|
+
/* 无障碍降级:降低透明度时遮罩不做模糊(与内部材质的降级保持一致)。 */
|
|
25139
|
+
@media (prefers-reduced-transparency: reduce) {
|
|
25140
|
+
.did-overlay[data-fx-backdrop],
|
|
25141
|
+
.did-settings-overlay[data-fx-backdrop] {
|
|
25142
|
+
-webkit-backdrop-filter: none !important;
|
|
25143
|
+
backdrop-filter: none !important;
|
|
25144
|
+
background: color-mix(in srgb, var(--dsw-alias-bg-base) 82%, transparent);
|
|
25145
|
+
}
|
|
25146
|
+
}
|
|
25147
|
+
@media (forced-colors: active) {
|
|
25148
|
+
.did-overlay[data-fx-backdrop],
|
|
25149
|
+
.did-settings-overlay[data-fx-backdrop] {
|
|
25150
|
+
-webkit-backdrop-filter: none !important;
|
|
25151
|
+
backdrop-filter: none !important;
|
|
25152
|
+
}
|
|
25153
|
+
}
|
|
25154
|
+
|
|
25155
|
+
|
|
25156
|
+
/* ---- 外观效果 9. 浅色 / 强制浅色卡片的可读性校正 -----------------------
|
|
25157
|
+
用户反馈:浅色外观下卡片边缘的小字(增删统计、行号、旧/新图例、语言徽章、
|
|
25158
|
+
底部状态条、轨迹按钮……)看不清,因为 1.3.0 直接使用宿主的 success/error
|
|
25159
|
+
token(官方浅色是 #22c55e / #ec1313 这类高饱和色)和三级灰,在白底/浅色玻璃
|
|
25160
|
+
上只有 1.8–4.2 的对比度。
|
|
25161
|
+
|
|
25162
|
+
修复:语义文字统一改走 --did-*-ink 变量(默认值仍等于宿主语义色,深色外观
|
|
25163
|
+
因此完全不变),浅色外观与「强制浅色外壳」的卡片用混入深色前景的“墨色”,
|
|
25164
|
+
小号辅助文字提升到二级前景色;「强制深色外壳」的卡片反过来使用亮色墨。 */
|
|
25165
|
+
.did-add,
|
|
25166
|
+
.did-row[data-kind='add'] .did-sign,
|
|
25167
|
+
.did-row[data-kind='add'] .did-move,
|
|
25168
|
+
.enhanced-tool[data-variant='command'] .enhanced-kind {
|
|
25169
|
+
color: var(--did-add-ink, var(--dsw-alias-state-success-primary));
|
|
25170
|
+
}
|
|
25171
|
+
.did-del,
|
|
25172
|
+
.did-row[data-kind='del'] .did-sign,
|
|
25173
|
+
.did-row[data-kind='del'] .did-move,
|
|
25174
|
+
.enhanced-exit,
|
|
25175
|
+
.enhanced-code[data-error],
|
|
25176
|
+
.did-error,
|
|
25177
|
+
.did-settings-error,
|
|
25178
|
+
.did-state[data-state='error'] {
|
|
25179
|
+
color: var(--did-del-ink, var(--dsw-alias-state-error-primary));
|
|
25180
|
+
}
|
|
25181
|
+
.did-row[data-kind='add'] .did-num[data-side='new'] {
|
|
25182
|
+
color: var(--did-num-add-ink, color-mix(in srgb, var(--dsw-alias-state-success-primary) 60%, var(--did-fg-tertiary)));
|
|
25183
|
+
}
|
|
25184
|
+
.did-row[data-kind='del'] .did-num[data-side='old'] {
|
|
25185
|
+
color: var(--did-num-del-ink, color-mix(in srgb, var(--dsw-alias-state-error-primary) 60%, var(--did-fg-tertiary)));
|
|
25186
|
+
}
|
|
25187
|
+
.did-numhead-label[data-side='old'] { color: color-mix(in srgb, var(--did-del-ink, var(--dsw-alias-state-error-primary)) 72%, var(--did-fg-secondary)); }
|
|
25188
|
+
.did-numhead-label[data-side='new'] { color: color-mix(in srgb, var(--did-add-ink, var(--dsw-alias-state-success-primary)) 72%, var(--did-fg-secondary)); }
|
|
25189
|
+
|
|
25190
|
+
/* 浅色外观(自动色调):深墨色 + 小字提级。 */
|
|
25191
|
+
body[data-dsh-inline-diff-appearance='light'] {
|
|
25192
|
+
--did-add-ink: color-mix(in srgb, var(--dsw-alias-state-success-primary) 42%, var(--did-fg-primary));
|
|
25193
|
+
--did-del-ink: color-mix(in srgb, var(--dsw-alias-state-error-primary) 42%, var(--did-fg-primary));
|
|
25194
|
+
--did-num-add-ink: color-mix(in srgb, var(--dsw-alias-state-success-primary) 34%, var(--did-fg-primary));
|
|
25195
|
+
--did-num-del-ink: color-mix(in srgb, var(--dsw-alias-state-error-primary) 34%, var(--did-fg-primary));
|
|
25196
|
+
}
|
|
25197
|
+
/* 强制浅色外壳(无论当前外观):同样是深墨色(--did-fg-primary 已被色调块改为深色)。 */
|
|
25198
|
+
[data-shell-tone='light'] {
|
|
25199
|
+
--did-add-ink: color-mix(in srgb, var(--dsw-alias-state-success-primary) 42%, var(--did-fg-primary));
|
|
25200
|
+
--did-del-ink: color-mix(in srgb, var(--dsw-alias-state-error-primary) 42%, var(--did-fg-primary));
|
|
25201
|
+
--did-num-add-ink: color-mix(in srgb, var(--dsw-alias-state-success-primary) 34%, var(--did-fg-primary));
|
|
25202
|
+
--did-num-del-ink: color-mix(in srgb, var(--dsw-alias-state-error-primary) 34%, var(--did-fg-primary));
|
|
25203
|
+
}
|
|
25204
|
+
/* 强制深色外壳:亮色墨(覆盖浅色外观的深墨色;深色外壳上需要浅色小字)。 */
|
|
25205
|
+
[data-shell-tone='dark'] {
|
|
25206
|
+
--did-add-ink: #4ade80;
|
|
25207
|
+
--did-del-ink: #f87171;
|
|
25208
|
+
--did-num-add-ink: color-mix(in srgb, #4ade80 55%, var(--did-fg-tertiary));
|
|
25209
|
+
--did-num-del-ink: color-mix(in srgb, #f87171 55%, var(--did-fg-tertiary));
|
|
25210
|
+
}
|
|
25211
|
+
/* 深色外观默认:错误红略微提亮,保证在深色玻璃上达到 AA。 */
|
|
25212
|
+
body[data-dsh-inline-diff-appearance='dark'] {
|
|
25213
|
+
--did-del-ink: color-mix(in srgb, var(--dsw-alias-state-error-primary) 70%, var(--did-fg-primary));
|
|
25214
|
+
--did-num-del-ink: color-mix(in srgb, var(--dsw-alias-state-error-primary) 55%, var(--did-fg-tertiary));
|
|
25215
|
+
}
|
|
25216
|
+
/* 小号辅助文字:浅色外观 / 强制浅色外壳里提升到二级前景色(白底约 6.6)。 */
|
|
25217
|
+
body[data-dsh-inline-diff-appearance='light'] .did-read-range,
|
|
25218
|
+
body[data-dsh-inline-diff-appearance='light'] .did-meta,
|
|
25219
|
+
body[data-dsh-inline-diff-appearance='light'] .did-empty,
|
|
25220
|
+
body[data-dsh-inline-diff-appearance='light'] .did-lang,
|
|
25221
|
+
body[data-dsh-inline-diff-appearance='light'] .did-num,
|
|
25222
|
+
body[data-dsh-inline-diff-appearance='light'] .did-numhead,
|
|
25223
|
+
body[data-dsh-inline-diff-appearance='light'] .did-bar-range,
|
|
25224
|
+
body[data-dsh-inline-diff-appearance='light'] .did-foot,
|
|
25225
|
+
body[data-dsh-inline-diff-appearance='light'] .enhanced-state,
|
|
25226
|
+
body[data-dsh-inline-diff-appearance='light'] .enhanced-inspect-label,
|
|
25227
|
+
[data-shell-tone='light'] .did-meta,
|
|
25228
|
+
[data-shell-tone='light'] .did-empty,
|
|
25229
|
+
[data-shell-tone='light'] .did-lang,
|
|
25230
|
+
[data-shell-tone='light'] .did-num,
|
|
25231
|
+
[data-shell-tone='light'] .did-numhead,
|
|
25232
|
+
[data-shell-tone='light'] .did-bar-range,
|
|
25233
|
+
[data-shell-tone='light'] .did-foot,
|
|
25234
|
+
[data-shell-tone='light'] .enhanced-state,
|
|
25235
|
+
[data-shell-tone='light'] .enhanced-inspect-label { color: var(--did-fg-secondary); }
|
|
25236
|
+
/* 强制深色外壳里,小号辅助文字继续用色调块的浅色二级灰(--did-fg-secondary 已随
|
|
25237
|
+
色调变成 #c3cade),上面那条只用 var() 引用,不需要额外规则。 */
|
|
25238
|
+
|
|
25239
|
+
/* 语言徽章再深一档:徽章底色本身是浅色混合,二级灰只有 4.48,改用一级前景色。 */
|
|
25240
|
+
body[data-dsh-inline-diff-appearance='light'] .did-lang,
|
|
25241
|
+
[data-shell-tone='light'] .did-lang { color: var(--did-fg-primary); }
|
|
25242
|
+
|
|
25243
|
+
/* 浅色外观里卡片外轮廓再清晰一点:白底 + 白色高光会让玻璃卡片边缘“糊”在背景里,
|
|
25244
|
+
这里把外轮廓环加深一档(只影响带 fx-root 的玻璃卡片,native 卡片不变)。 */
|
|
25245
|
+
body[data-dsh-inline-diff-appearance='light'] [data-fx-root='true'] {
|
|
25246
|
+
--did-fx-card-ring: color-mix(in srgb, var(--did-border-2) 78%, var(--did-border-1));
|
|
25247
|
+
}
|
|
25248
|
+
|
|
25249
|
+
/* ---- 外观效果 10. 强制外壳色调与外观相反时的完整适配 -------------------
|
|
25250
|
+
浅色外观里选「深色外壳」(或深色外观里选「浅色外壳」)时,半透明玻璃叠在相反
|
|
25251
|
+
的页面底色上会被冲成中灰:深色卡片变灰、浅色文字与语义色一起掉对比度(实测
|
|
25252
|
+
1.2–2.0,完全看不清)。这种组合本身意味着用户要一张“强制色调”的卡片,因此:
|
|
25253
|
+
1) 卡片内材质不再透出页面底色(--did-fx-alpha-boost 固定 1 → alpha-final=1);
|
|
25254
|
+
2) 在卡片子树内局部替换宿主品牌色与语义色:浅色主题的黑色链接 / 亮绿红不会
|
|
25255
|
+
落在深色表面上,深色主题的浅色链接 / 亮绿红不会落在浅色表面上;
|
|
25256
|
+
3) 卡片内的「放大」按钮跟随卡片表面色(它原本取宿主 --dsw-alias-bg-base,
|
|
25257
|
+
在强制色调卡片里会出现黑胶囊 / 白胶囊与卡片底色撞色)。
|
|
25258
|
+
全部只作用于“色调与外观相反”的组合;色调与外观一致的卡片不受影响。 */
|
|
25259
|
+
body[data-dsh-inline-diff-appearance='light'] [data-shell-tone='dark'] [data-fx],
|
|
25260
|
+
body[data-dsh-inline-diff-appearance='light'] [data-shell-tone='dark'][data-fx],
|
|
25261
|
+
body[data-dsh-inline-diff-appearance='dark'] [data-shell-tone='light'] [data-fx],
|
|
25262
|
+
body[data-dsh-inline-diff-appearance='dark'] [data-shell-tone='light'][data-fx] {
|
|
25263
|
+
--did-fx-alpha-boost: 1;
|
|
25264
|
+
}
|
|
25265
|
+
body[data-dsh-inline-diff-appearance='light'] [data-shell-tone='dark'] {
|
|
25266
|
+
--dsw-alias-brand-primary: #9db9ff;
|
|
25267
|
+
--dsw-alias-brand-text: #9db9ff;
|
|
25268
|
+
--dsw-alias-state-success-primary: #4ade80;
|
|
25269
|
+
--dsw-alias-state-error-primary: #f87171;
|
|
25270
|
+
--dsw-alias-state-warn-primary: #fbbf24;
|
|
25271
|
+
--dsw-alias-label-primary: #eef1f8;
|
|
25272
|
+
--dsw-alias-label-secondary: #c3cade;
|
|
25273
|
+
--dsw-alias-label-tertiary: #94a1bc;
|
|
25274
|
+
--dsw-alias-border-l1: rgba(151, 169, 216, 0.24);
|
|
25275
|
+
--dsw-alias-border-l2: rgba(151, 169, 216, 0.42);
|
|
25276
|
+
}
|
|
25277
|
+
body[data-dsh-inline-diff-appearance='dark'] [data-shell-tone='light'] {
|
|
25278
|
+
--dsw-alias-brand-primary: #1d4ed8;
|
|
25279
|
+
--dsw-alias-brand-text: #1d4ed8;
|
|
25280
|
+
--dsw-alias-state-success-primary: #166534;
|
|
25281
|
+
--dsw-alias-state-error-primary: #991b1b;
|
|
25282
|
+
--dsw-alias-state-warn-primary: #b45309;
|
|
25283
|
+
--dsw-alias-label-primary: #172347;
|
|
25284
|
+
--dsw-alias-label-secondary: #4d5d7f;
|
|
25285
|
+
--dsw-alias-label-tertiary: #6f7c99;
|
|
25286
|
+
--dsw-alias-border-l1: rgba(71, 91, 145, 0.24);
|
|
25287
|
+
--dsw-alias-border-l2: rgba(71, 91, 145, 0.42);
|
|
25288
|
+
}
|
|
25289
|
+
body[data-dsh-inline-diff-appearance='light'] [data-shell-tone='dark'] .did-zoom,
|
|
25290
|
+
body[data-dsh-inline-diff-appearance='dark'] [data-shell-tone='light'] .did-zoom {
|
|
25291
|
+
background: var(--did-surface-1);
|
|
25292
|
+
border-color: var(--did-border-2);
|
|
25293
|
+
color: var(--did-fg-secondary);
|
|
25294
|
+
}
|
|
25295
|
+
/* ---- 动效 11. 卡片 / 弹窗入场与输出出现 --------------------------------
|
|
25296
|
+
设计原则:
|
|
25297
|
+
· 只给“从无到有”的瞬时变化加动画:运行中的工具卡片挂载、命令输出到达、
|
|
25298
|
+
设置弹窗 / 放大弹窗打开;历史回放、已结算卡片、几毫秒完成的调用都不加,
|
|
25299
|
+
避免为了动画而上动画。
|
|
25300
|
+
· 只用 opacity + transform(GPU 合成,不触发重排);缓动是强 ease-out 的
|
|
25301
|
+
阻尼曲线,没有回弹/过冲,克制、不夸张。
|
|
25302
|
+
· 「prefers-reduced-motion: reduce」 下全部关闭(用户系统偏好优先)。
|
|
25303
|
+
· 动画只作用于本插件自己的 DOM,不影响 DSH 原生行与第三方主题的动画。 */
|
|
25304
|
+
@keyframes did-card-enter {
|
|
25305
|
+
from { opacity: 0; transform: translate3d(0, 4px, 0); }
|
|
25306
|
+
to { opacity: 1; transform: translate3d(0, 0, 0); }
|
|
25307
|
+
}
|
|
25308
|
+
@keyframes did-output-enter {
|
|
25309
|
+
from { opacity: 0; transform: translate3d(0, 2px, 0); }
|
|
25310
|
+
to { opacity: 1; transform: translate3d(0, 0, 0); }
|
|
25311
|
+
}
|
|
25312
|
+
@keyframes did-overlay-enter {
|
|
25313
|
+
from { opacity: 0; }
|
|
25314
|
+
to { opacity: 1; }
|
|
25315
|
+
}
|
|
25316
|
+
@keyframes did-dialog-enter {
|
|
25317
|
+
from { opacity: 0; transform: translate3d(0, 6px, 0) scale(0.985); }
|
|
25318
|
+
to { opacity: 1; transform: translate3d(0, 0, 0) scale(1); }
|
|
25319
|
+
}
|
|
25320
|
+
@media (prefers-reduced-motion: no-preference) {
|
|
25321
|
+
/* 运行中/准备中挂载的工具卡片(仅增强风格,原生行不在此列)。 */
|
|
25322
|
+
.enhanced-tool[data-enter] {
|
|
25323
|
+
animation: did-card-enter 200ms cubic-bezier(0.22, 1, 0.36, 1) both;
|
|
25324
|
+
}
|
|
25325
|
+
/* 输出占位切换到真实输出的那一次。 */
|
|
25326
|
+
.enhanced-section[data-appear] {
|
|
25327
|
+
animation: did-output-enter 160ms cubic-bezier(0.22, 1, 0.36, 1) both;
|
|
25328
|
+
}
|
|
25329
|
+
/* 设置弹窗(启动按钮打开)与放大弹窗:遮罩淡入 + 对话框轻微上浮。 */
|
|
25330
|
+
.did-settings-overlay[data-enter],
|
|
25331
|
+
.did-overlay-root[data-enter] {
|
|
25332
|
+
animation: did-overlay-enter 140ms ease-out both;
|
|
25333
|
+
}
|
|
25334
|
+
.did-settings-dialog[data-enter],
|
|
25335
|
+
.did-dialog[data-enter] {
|
|
25336
|
+
animation: did-dialog-enter 200ms cubic-bezier(0.22, 1, 0.36, 1) both;
|
|
25337
|
+
}
|
|
25338
|
+
}
|
|
25339
|
+
|
|
25340
|
+
/* 常驻呼吸动画(状态点 / IN-OUT 色条)也遵循「减少动效」:只保留静态颜色,
|
|
25341
|
+
不脉冲。入场/输出动画已由上面的 no-preference 媒体查询整体关闭。 */
|
|
25342
|
+
@media (prefers-reduced-motion: reduce) {
|
|
25343
|
+
.enhanced-tool[data-state='running'] .enhanced-dot,
|
|
25344
|
+
.enhanced-tool[data-state='preparing'] .enhanced-dot,
|
|
25345
|
+
.enhanced-section[data-state='running'],
|
|
25346
|
+
.enhanced-section[data-state='preparing'],
|
|
25347
|
+
.did-state[data-state='running'] .did-dot,
|
|
25348
|
+
.did-state[data-state='preparing'] .did-dot {
|
|
25349
|
+
animation: none;
|
|
25350
|
+
}
|
|
25351
|
+
}
|
|
25352
|
+
|
|
25353
|
+
/* ---- 设置页:额外可读目录 ----------------------------------------------- */
|
|
25354
|
+
.did-readroots {
|
|
25355
|
+
margin-top: 14px;
|
|
25356
|
+
padding-top: 14px;
|
|
25357
|
+
border-top: 0.5px solid var(--did-border-1);
|
|
25358
|
+
}
|
|
25359
|
+
.did-readroots-row {
|
|
25360
|
+
display: flex;
|
|
25361
|
+
align-items: center;
|
|
25362
|
+
gap: 8px;
|
|
25363
|
+
margin-top: 8px;
|
|
25364
|
+
}
|
|
25365
|
+
.did-readroots-input {
|
|
25366
|
+
flex: 1 1 auto;
|
|
25367
|
+
min-width: 0;
|
|
25368
|
+
padding: 5px 8px;
|
|
25369
|
+
border: 0.5px solid var(--did-border-2);
|
|
25370
|
+
border-radius: 8px;
|
|
25371
|
+
background: var(--did-surface-2);
|
|
25372
|
+
color: var(--did-fg-primary);
|
|
25373
|
+
font-family: var(--ds-font-family-code, ui-monospace, monospace);
|
|
25374
|
+
font-size: 11.5px;
|
|
25375
|
+
}
|
|
25376
|
+
.did-readroots-input::placeholder { color: var(--did-fg-tertiary); }
|
|
25377
|
+
.did-readroots-input:focus-visible {
|
|
25378
|
+
outline: 1px solid var(--dsw-alias-brand-primary);
|
|
25379
|
+
outline-offset: 1px;
|
|
25380
|
+
}
|
|
25381
|
+
.did-readroots-button {
|
|
25382
|
+
flex: none;
|
|
25383
|
+
padding: 5px 10px;
|
|
25384
|
+
border: 0.5px solid var(--did-border-2);
|
|
25385
|
+
border-radius: 8px;
|
|
25386
|
+
background: color-mix(in srgb, var(--dsw-alias-brand-primary) 12%, transparent);
|
|
25387
|
+
color: var(--did-fg-primary);
|
|
25388
|
+
font-size: 11.5px;
|
|
25389
|
+
cursor: pointer;
|
|
25390
|
+
}
|
|
25391
|
+
.did-readroots-button:hover:not(:disabled) {
|
|
25392
|
+
background: color-mix(in srgb, var(--dsw-alias-brand-primary) 20%, transparent);
|
|
25393
|
+
}
|
|
25394
|
+
.did-readroots-button:disabled { opacity: 0.5; cursor: default; }
|
|
25395
|
+
.did-readroots-list {
|
|
25396
|
+
display: flex;
|
|
25397
|
+
flex-direction: column;
|
|
25398
|
+
gap: 5px;
|
|
25399
|
+
margin-top: 8px;
|
|
25400
|
+
}
|
|
25401
|
+
.did-readroots-item {
|
|
25402
|
+
display: flex;
|
|
25403
|
+
align-items: center;
|
|
25404
|
+
gap: 8px;
|
|
25405
|
+
padding: 5px 8px;
|
|
25406
|
+
border: 0.5px solid var(--did-border-1);
|
|
25407
|
+
border-radius: 6px;
|
|
25408
|
+
background: var(--did-io-bg);
|
|
25409
|
+
}
|
|
25410
|
+
.did-readroots-path {
|
|
25411
|
+
flex: 1 1 auto;
|
|
25412
|
+
min-width: 0;
|
|
25413
|
+
overflow-wrap: anywhere;
|
|
25414
|
+
color: var(--did-fg-secondary);
|
|
25415
|
+
font-family: var(--ds-font-family-code, ui-monospace, monospace);
|
|
25416
|
+
font-size: 11px;
|
|
25417
|
+
}
|
|
25418
|
+
.did-readroots-empty {
|
|
25419
|
+
padding: 2px 1px;
|
|
25420
|
+
color: var(--did-fg-tertiary);
|
|
25421
|
+
font-size: 11px;
|
|
25422
|
+
}
|
|
25423
|
+
.did-readroots-ok {
|
|
25424
|
+
margin-top: 6px;
|
|
25425
|
+
font-size: 11.5px;
|
|
25426
|
+
color: var(--dsw-alias-state-success-primary);
|
|
25427
|
+
}
|
|
25428
|
+
|
|
25429
|
+
/* ---- 设置页:版本与更新面板 --------------------------------------------- */
|
|
25430
|
+
.did-update {
|
|
25431
|
+
margin-top: 14px;
|
|
25432
|
+
padding-top: 14px;
|
|
25433
|
+
border-top: 0.5px solid var(--did-border-1);
|
|
25434
|
+
}
|
|
25435
|
+
.did-update-head {
|
|
25436
|
+
display: flex;
|
|
25437
|
+
align-items: flex-start;
|
|
25438
|
+
gap: 12px;
|
|
25439
|
+
}
|
|
25440
|
+
.did-update-headtext { flex: 1; min-width: 0; }
|
|
25441
|
+
.did-update-title {
|
|
25442
|
+
font-size: 13px;
|
|
25443
|
+
font-weight: 600;
|
|
25444
|
+
color: var(--did-fg-primary);
|
|
25445
|
+
}
|
|
25446
|
+
.did-update-sub {
|
|
25447
|
+
margin-top: 3px;
|
|
25448
|
+
font-size: 11.5px;
|
|
25449
|
+
line-height: 1.45;
|
|
25450
|
+
color: var(--did-fg-secondary);
|
|
25451
|
+
}
|
|
25452
|
+
.did-update-check {
|
|
25453
|
+
flex: none;
|
|
25454
|
+
padding: 5px 11px;
|
|
25455
|
+
border: 0.5px solid var(--did-border-2);
|
|
25456
|
+
border-radius: 8px;
|
|
25457
|
+
background: transparent;
|
|
25458
|
+
color: var(--did-fg-primary);
|
|
25459
|
+
font-size: 11.5px;
|
|
25460
|
+
cursor: pointer;
|
|
25461
|
+
}
|
|
25462
|
+
.did-update-check:hover:not(:disabled) { background: color-mix(in srgb, var(--did-fg-primary) 6%, transparent); }
|
|
25463
|
+
.did-update-check:disabled { opacity: 0.55; cursor: default; }
|
|
25464
|
+
.did-update-idle {
|
|
25465
|
+
margin-top: 8px;
|
|
25466
|
+
font-size: 11.5px;
|
|
25467
|
+
color: var(--did-fg-tertiary);
|
|
25468
|
+
}
|
|
25469
|
+
.did-update-list {
|
|
25470
|
+
margin-top: 9px;
|
|
25471
|
+
max-height: 210px;
|
|
25472
|
+
overflow: auto;
|
|
25473
|
+
border: 0.5px solid var(--did-border-1);
|
|
25474
|
+
border-radius: 8px;
|
|
25475
|
+
background: color-mix(in srgb, var(--did-fg-primary) 2.5%, transparent);
|
|
25476
|
+
}
|
|
25477
|
+
.did-update-row {
|
|
25478
|
+
display: flex;
|
|
25479
|
+
align-items: center;
|
|
25480
|
+
gap: 7px;
|
|
25481
|
+
width: 100%;
|
|
25482
|
+
padding: 6px 9px;
|
|
25483
|
+
border: 0;
|
|
25484
|
+
background: transparent;
|
|
25485
|
+
color: var(--did-fg-primary);
|
|
25486
|
+
font-size: 11.5px;
|
|
25487
|
+
text-align: left;
|
|
25488
|
+
cursor: pointer;
|
|
25489
|
+
}
|
|
25490
|
+
.did-update-row + .did-update-row { border-top: 0.5px solid var(--did-border-1); }
|
|
25491
|
+
.did-update-row:hover:not(:disabled) { background: color-mix(in srgb, var(--did-fg-primary) 5%, transparent); }
|
|
25492
|
+
.did-update-row[data-selected] { background: color-mix(in srgb, var(--dsw-alias-brand-primary) 12%, transparent); }
|
|
25493
|
+
.did-update-row:disabled { opacity: 0.55; cursor: default; }
|
|
25494
|
+
.did-update-ver { font-family: var(--did-mono, ui-monospace, monospace); }
|
|
25495
|
+
.did-update-date { margin-left: auto; color: var(--did-fg-tertiary); font-size: 10.5px; }
|
|
25496
|
+
.did-update-badge {
|
|
25497
|
+
padding: 0 5px;
|
|
25498
|
+
border: 0.5px solid var(--did-border-2);
|
|
25499
|
+
border-radius: 999px;
|
|
25500
|
+
font-size: 10px;
|
|
25501
|
+
line-height: 14px;
|
|
25502
|
+
color: var(--did-fg-secondary);
|
|
25503
|
+
}
|
|
25504
|
+
.did-update-badge[data-warn] { border-style: dashed; }
|
|
25505
|
+
.did-update-actions {
|
|
25506
|
+
display: flex;
|
|
25507
|
+
align-items: center;
|
|
25508
|
+
gap: 10px;
|
|
25509
|
+
margin-top: 9px;
|
|
25510
|
+
}
|
|
25511
|
+
.did-update-hint {
|
|
25512
|
+
flex: 1;
|
|
25513
|
+
min-width: 0;
|
|
25514
|
+
font-size: 10.5px;
|
|
25515
|
+
color: var(--did-fg-tertiary);
|
|
25516
|
+
}
|
|
25517
|
+
.did-update-install {
|
|
25518
|
+
flex: none;
|
|
25519
|
+
padding: 5px 12px;
|
|
25520
|
+
border: 0.5px solid var(--did-border-2);
|
|
25521
|
+
border-radius: 8px;
|
|
25522
|
+
background: color-mix(in srgb, var(--dsw-alias-brand-primary) 14%, transparent);
|
|
25523
|
+
color: var(--did-fg-primary);
|
|
25524
|
+
font-size: 11.5px;
|
|
25525
|
+
cursor: pointer;
|
|
25526
|
+
}
|
|
25527
|
+
.did-update-install:hover:not(:disabled) { background: color-mix(in srgb, var(--dsw-alias-brand-primary) 22%, transparent); }
|
|
25528
|
+
.did-update-install:disabled { opacity: 0.5; cursor: default; }
|
|
25529
|
+
.did-update-manual { margin-top: 9px; }
|
|
25530
|
+
.did-update-manual-hint {
|
|
25531
|
+
margin-bottom: 5px;
|
|
25532
|
+
font-size: 10.5px;
|
|
25533
|
+
color: var(--did-fg-tertiary);
|
|
25534
|
+
}
|
|
25535
|
+
.did-update-command {
|
|
25536
|
+
display: block;
|
|
25537
|
+
padding: 6px 8px;
|
|
25538
|
+
overflow-x: auto;
|
|
25539
|
+
border: 0.5px solid var(--did-border-1);
|
|
25540
|
+
border-radius: 6px;
|
|
25541
|
+
background: var(--did-io-bg);
|
|
25542
|
+
color: var(--did-fg-secondary);
|
|
25543
|
+
font-family: var(--did-mono, ui-monospace, monospace);
|
|
25544
|
+
font-size: 10.5px;
|
|
25545
|
+
white-space: nowrap;
|
|
25546
|
+
user-select: all;
|
|
25547
|
+
}
|
|
25548
|
+
.did-update-result {
|
|
25549
|
+
margin-top: 9px;
|
|
25550
|
+
font-size: 11.5px;
|
|
25551
|
+
color: var(--did-add-ink, var(--dsw-alias-state-success-primary));
|
|
25552
|
+
}
|
|
25553
|
+
.did-update-log { margin-top: 7px; font-size: 10.5px; color: var(--did-fg-tertiary); }
|
|
25554
|
+
.did-update-log pre {
|
|
25555
|
+
margin: 5px 0 0;
|
|
25556
|
+
max-height: 140px;
|
|
25557
|
+
overflow: auto;
|
|
25558
|
+
padding: 6px 8px;
|
|
25559
|
+
border-radius: 6px;
|
|
25560
|
+
background: var(--did-io-bg);
|
|
25561
|
+
color: var(--did-fg-secondary);
|
|
25562
|
+
font-family: var(--did-mono, ui-monospace, monospace);
|
|
25563
|
+
white-space: pre-wrap;
|
|
25564
|
+
word-break: break-all;
|
|
25565
|
+
}
|
|
25566
|
+
|
|
25567
|
+
`;
|
|
25568
|
+
|
|
25569
|
+
// src/client/syntax-styles.js
|
|
25570
|
+
var SYNTAX_PALETTE = {
|
|
25571
|
+
dark: {
|
|
25572
|
+
kw: "#c5a8ff",
|
|
25573
|
+
str: "#86b6ff",
|
|
25574
|
+
num: "#74d9e6",
|
|
25575
|
+
type: "#aab8ff",
|
|
25576
|
+
prop: "#8fd0e8",
|
|
25577
|
+
com: "#a3acbd",
|
|
25578
|
+
meta: "#9fa8c8",
|
|
25579
|
+
op: "#b3bac6",
|
|
25580
|
+
punct: "#aab2c0"
|
|
25581
|
+
},
|
|
25582
|
+
light: {
|
|
25583
|
+
kw: "#6d3fd1",
|
|
25584
|
+
str: "#1f4fbf",
|
|
25585
|
+
num: "#0b6b7d",
|
|
25586
|
+
type: "#4652c4",
|
|
25587
|
+
prop: "#0f6076",
|
|
25588
|
+
com: "#525c6a",
|
|
25589
|
+
meta: "#46527d",
|
|
25590
|
+
op: "#55606f",
|
|
25591
|
+
punct: "#4c5563"
|
|
25592
|
+
}
|
|
25593
|
+
};
|
|
25594
|
+
var VARIABLE_GROUPS = ["kw", "str", "num", "type", "prop", "com", "meta", "op", "punct"];
|
|
25595
|
+
function paletteVars(palette) {
|
|
25596
|
+
return VARIABLE_GROUPS.map((group) => ` --did-syn-${group}: ${palette[group]};`).join("\n");
|
|
25597
|
+
}
|
|
25598
|
+
function paletteBlock(selector, palette, segMix) {
|
|
25599
|
+
return `${selector} {
|
|
25600
|
+
${paletteVars(palette)}
|
|
25601
|
+
--did-syn-seg-mix: ${segMix};
|
|
25602
|
+
}`;
|
|
25603
|
+
}
|
|
25604
|
+
var TOKEN_RULES = `
|
|
25605
|
+
.did-tok[data-g='kw'] { color: var(--did-syn-kw); }
|
|
25606
|
+
.did-tok[data-g='str'] { color: var(--did-syn-str); }
|
|
25607
|
+
.did-tok[data-g='num'] { color: var(--did-syn-num); }
|
|
25608
|
+
.did-tok[data-g='type'] { color: var(--did-syn-type); }
|
|
25609
|
+
.did-tok[data-g='prop'] { color: var(--did-syn-prop); }
|
|
25610
|
+
.did-tok[data-g='com'] { color: var(--did-syn-com); }
|
|
25611
|
+
.did-tok[data-g='meta'] { color: var(--did-syn-meta); }
|
|
25612
|
+
.did-tok[data-g='op'] { color: var(--did-syn-op); }
|
|
25613
|
+
.did-tok[data-g='punct'] { color: var(--did-syn-punct); }
|
|
25614
|
+
/* 次级分组复用相近色相,不再增加颜色数量。 */
|
|
25615
|
+
.did-tok[data-g='fn'],
|
|
25616
|
+
.did-tok[data-g='tag'],
|
|
25617
|
+
.did-tok[data-g='head'] { color: var(--did-syn-kw); }
|
|
25618
|
+
.did-tok[data-g='attr'],
|
|
25619
|
+
.did-tok[data-g='link'] { color: var(--did-syn-str); }
|
|
25620
|
+
.did-tok[data-g='lit'] { color: var(--did-syn-num); }
|
|
25621
|
+
/* 普通标识符与强调文字保持代码默认前景色。 */
|
|
25622
|
+
.did-tok[data-g='var'],
|
|
25623
|
+
.did-tok[data-g='emph'] { color: inherit; }
|
|
25624
|
+
`.trim();
|
|
25625
|
+
var EMPHASIS_RULES = `
|
|
25626
|
+
[data-syn-emphasis='on'] .did-tok[data-g='kw'],
|
|
25627
|
+
[data-syn-emphasis='on'] .did-tok[data-g='fn'],
|
|
25628
|
+
[data-syn-emphasis='on'] .did-tok[data-g='type'],
|
|
25629
|
+
[data-syn-emphasis='on'] .did-tok[data-g='tag'],
|
|
25630
|
+
[data-syn-emphasis='on'] .did-tok[data-g='head'] { font-weight: 600; }
|
|
25631
|
+
[data-syn-emphasis='on'] .did-tok[data-g='com'] { font-style: italic; }
|
|
25632
|
+
[data-syn-emphasis='on'] .did-tok[data-g='link'] { text-decoration: underline; }
|
|
25633
|
+
/* “仅颜色”:确保没有任何字体样式从别处泄漏进来。 */
|
|
25634
|
+
[data-syn-emphasis='off'] .did-tok {
|
|
25635
|
+
font-weight: inherit;
|
|
25636
|
+
font-style: inherit;
|
|
25637
|
+
text-decoration: inherit;
|
|
25638
|
+
}
|
|
25639
|
+
`.trim();
|
|
25640
|
+
var SEGMENT_RULES = `
|
|
25641
|
+
.did-seg[data-changed='true'] .did-tok[data-g='kw'],
|
|
25642
|
+
.did-seg[data-changed='true'] .did-tok[data-g='fn'],
|
|
25643
|
+
.did-seg[data-changed='true'] .did-tok[data-g='tag'],
|
|
25644
|
+
.did-seg[data-changed='true'] .did-tok[data-g='head'] { color: color-mix(in srgb, var(--did-syn-kw) var(--did-syn-seg-mix, 60%), var(--did-fg-primary)); }
|
|
25645
|
+
.did-seg[data-changed='true'] .did-tok[data-g='str'],
|
|
25646
|
+
.did-seg[data-changed='true'] .did-tok[data-g='attr'],
|
|
25647
|
+
.did-seg[data-changed='true'] .did-tok[data-g='link'] { color: color-mix(in srgb, var(--did-syn-str) var(--did-syn-seg-mix, 60%), var(--did-fg-primary)); }
|
|
25648
|
+
.did-seg[data-changed='true'] .did-tok[data-g='num'],
|
|
25649
|
+
.did-seg[data-changed='true'] .did-tok[data-g='lit'] { color: color-mix(in srgb, var(--did-syn-num) var(--did-syn-seg-mix, 60%), var(--did-fg-primary)); }
|
|
25650
|
+
.did-seg[data-changed='true'] .did-tok[data-g='type'] { color: color-mix(in srgb, var(--did-syn-type) var(--did-syn-seg-mix, 60%), var(--did-fg-primary)); }
|
|
25651
|
+
.did-seg[data-changed='true'] .did-tok[data-g='prop'] { color: color-mix(in srgb, var(--did-syn-prop) var(--did-syn-seg-mix, 60%), var(--did-fg-primary)); }
|
|
25652
|
+
.did-seg[data-changed='true'] .did-tok[data-g='com'] { color: color-mix(in srgb, var(--did-syn-com) var(--did-syn-seg-mix, 60%), var(--did-fg-primary)); }
|
|
25653
|
+
.did-seg[data-changed='true'] .did-tok[data-g='meta'] { color: color-mix(in srgb, var(--did-syn-meta) var(--did-syn-seg-mix, 60%), var(--did-fg-primary)); }
|
|
25654
|
+
.did-seg[data-changed='true'] .did-tok[data-g='op'] { color: color-mix(in srgb, var(--did-syn-op) var(--did-syn-seg-mix, 60%), var(--did-fg-primary)); }
|
|
25655
|
+
.did-seg[data-changed='true'] .did-tok[data-g='punct'] { color: color-mix(in srgb, var(--did-syn-punct) var(--did-syn-seg-mix, 60%), var(--did-fg-primary)); }
|
|
25656
|
+
`.trim();
|
|
25657
|
+
var BADGE_RULES = `
|
|
25658
|
+
.did-lang {
|
|
25659
|
+
display: inline-flex;
|
|
25660
|
+
flex: none;
|
|
25661
|
+
align-items: center;
|
|
25662
|
+
padding: 0 5px;
|
|
25663
|
+
border: 0.5px solid var(--did-border-2);
|
|
25664
|
+
border-radius: 999px;
|
|
25665
|
+
background: color-mix(in srgb, var(--did-fg-primary) 5%, transparent);
|
|
25666
|
+
color: var(--did-fg-tertiary);
|
|
25667
|
+
font-family: var(--did-mono, ui-monospace, monospace);
|
|
25668
|
+
font-size: 10px;
|
|
25669
|
+
line-height: 15px;
|
|
25670
|
+
letter-spacing: 0.02em;
|
|
25671
|
+
white-space: nowrap;
|
|
25672
|
+
user-select: none;
|
|
25673
|
+
}
|
|
25674
|
+
.did-lang[data-variant='full'] {
|
|
25675
|
+
font-family: inherit;
|
|
25676
|
+
font-size: 10.5px;
|
|
25677
|
+
letter-spacing: 0;
|
|
25678
|
+
}
|
|
25679
|
+
.did-lang[data-unknown='true'] { border-style: dashed; }
|
|
25680
|
+
.did-lang[data-plain='true'] { opacity: 0.9; }
|
|
25681
|
+
/* 卡片头:允许徽章收缩而不是把头部动作按钮挤出窄窗口;父级用 overflow
|
|
25682
|
+
hidden 截断。12em 上限足以容纳本地化的“未知语言”/“Unknown”以及最长的
|
|
25683
|
+
语言全名。 */
|
|
25684
|
+
.did-head > .did-lang {
|
|
25685
|
+
flex: 0 1 auto;
|
|
25686
|
+
min-width: 0;
|
|
25687
|
+
max-width: 12em;
|
|
25688
|
+
overflow: hidden;
|
|
25689
|
+
}
|
|
25690
|
+
/* 弹窗副标题:徽章内联在既有文字之前。 */
|
|
25691
|
+
.did-dialog-sub > .did-lang {
|
|
25692
|
+
flex: 0 1 auto;
|
|
25693
|
+
min-width: 0;
|
|
25694
|
+
max-width: 12em;
|
|
25695
|
+
overflow: hidden;
|
|
25696
|
+
margin-right: 5px;
|
|
25697
|
+
vertical-align: -1px;
|
|
25698
|
+
}
|
|
25699
|
+
`.trim();
|
|
25700
|
+
var SYNTAX_CSS = `
|
|
25701
|
+
/* ---- 语法高亮:只使用前景色 ---------------------------------------------
|
|
25702
|
+
新增/删除行背景、行号符号与行内改动底色仍由 styles.js 以红/绿表达;
|
|
25703
|
+
这里的规则只改 token 文字颜色。
|
|
25704
|
+
调色板变量声明在 body 上,原因与 styles.js 相同:宿主主题把它的 token 声明
|
|
25705
|
+
在 body,声明在 :root 的 var() 解析不到那些 token(详见 styles.js)。 */
|
|
25706
|
+
${paletteBlock("body", SYNTAX_PALETTE.dark, "55%")}
|
|
25707
|
+
/* 官方浅色外观(宿主设置):浅色内层。 */
|
|
25708
|
+
${paletteBlock("body[data-dsh-inline-diff-appearance='light']", SYNTAX_PALETTE.light, "50%")}
|
|
25709
|
+
/* 单卡片内部配色覆盖。'auto' 故意不写规则:跟随上面的文档级外观。 */
|
|
25710
|
+
${paletteBlock("[data-inner-tone='light']", SYNTAX_PALETTE.light, "50%")}
|
|
25711
|
+
${paletteBlock("[data-inner-tone='dark']", SYNTAX_PALETTE.dark, "55%")}
|
|
25712
|
+
/* “内层配色 = 跟随外壳”:代码底色即外壳表面,因此调色板跟随外壳配色。 */
|
|
25713
|
+
${paletteBlock("[data-inner-tone='same'][data-shell-tone='light']", SYNTAX_PALETTE.light, "50%")}
|
|
25714
|
+
${paletteBlock("[data-inner-tone='same'][data-shell-tone='dark']", SYNTAX_PALETTE.dark, "55%")}
|
|
25715
|
+
/* 当“代码底色”与当前外观相反(浅色外观里的深色内层,或强制深色外壳 + 内层
|
|
25716
|
+
跟随外壳)时,词级改动片段的底色更深(或更浅),token 需要更多地向可读前景色
|
|
25717
|
+
靠拢才能达到 AA。比例在下面的 SEGMENT 调色板块里按上下文覆盖。 */
|
|
25718
|
+
body[data-dsh-inline-diff-appearance='light'] [data-inner-tone='dark'],
|
|
25719
|
+
body[data-dsh-inline-diff-appearance='light'] [data-inner-tone='same'][data-shell-tone='dark'] {
|
|
25720
|
+
--did-syn-seg-mix: 40%;
|
|
25721
|
+
}
|
|
25722
|
+
body[data-dsh-inline-diff-appearance='dark'] [data-inner-tone='light'],
|
|
25723
|
+
body[data-dsh-inline-diff-appearance='dark'] [data-inner-tone='same'][data-shell-tone='light'] {
|
|
25724
|
+
--did-syn-seg-mix: 35%;
|
|
25725
|
+
}
|
|
25726
|
+
|
|
25727
|
+
${TOKEN_RULES}
|
|
25728
|
+
|
|
25729
|
+
/* 行内词级改动片段:底色比整行深,token 与前景色混合后在浅/深外观下都能达到
|
|
25730
|
+
AA。混色比例 --did-syn-seg-mix 由上面的调色板块按“深/浅代码底色”给出;
|
|
25731
|
+
色相仍来自同一调色板,只是整体向可读前景色靠拢,不会变成红/绿语义色。 */
|
|
25732
|
+
${SEGMENT_RULES}
|
|
25733
|
+
|
|
25734
|
+
${EMPHASIS_RULES}
|
|
25735
|
+
|
|
25736
|
+
${BADGE_RULES}
|
|
25737
|
+
`;
|
|
25738
|
+
|
|
25739
|
+
// src/client/tool-catalog.js
|
|
25740
|
+
var TOOL_CATALOG_REFRESH_MS = 3e4;
|
|
25741
|
+
var TOOL_NAME_LIMIT = 200;
|
|
25742
|
+
var TOOL_CATALOG_LIMIT = 500;
|
|
25743
|
+
function selectDynamicToolKeys(names, options = {}) {
|
|
25744
|
+
const known = toSet(options.known);
|
|
25745
|
+
const claimed = toSet(options.claimed);
|
|
25746
|
+
const already = toSet(options.already);
|
|
25747
|
+
const limit = Number.isFinite(options.limit) && options.limit > 0 ? Math.floor(options.limit) : TOOL_CATALOG_LIMIT;
|
|
25748
|
+
const selected = [];
|
|
25749
|
+
if (!Array.isArray(names)) return selected;
|
|
25750
|
+
const seen = /* @__PURE__ */ new Set();
|
|
25751
|
+
for (const name of names) {
|
|
25752
|
+
if (typeof name !== "string" || name === "" || name.length > TOOL_NAME_LIMIT) continue;
|
|
25753
|
+
if (seen.has(name)) continue;
|
|
25754
|
+
seen.add(name);
|
|
25755
|
+
if (known.has(name) || claimed.has(name) || already.has(name)) continue;
|
|
25756
|
+
selected.push(name);
|
|
25757
|
+
if (selected.length >= limit) break;
|
|
25758
|
+
}
|
|
25759
|
+
return selected;
|
|
25760
|
+
}
|
|
25761
|
+
function toSet(value) {
|
|
25762
|
+
if (value instanceof Set) return value;
|
|
25763
|
+
if (value === null || value === void 0) return /* @__PURE__ */ new Set();
|
|
25764
|
+
try {
|
|
25765
|
+
return new Set(value);
|
|
25766
|
+
} catch {
|
|
25767
|
+
return /* @__PURE__ */ new Set();
|
|
25768
|
+
}
|
|
25769
|
+
}
|
|
25770
|
+
|
|
25771
|
+
// src/client/dynamic-tool-views.js
|
|
25772
|
+
function createDynamicToolViews(options) {
|
|
25773
|
+
const { slots, known, isEnabled, fetchNames, register } = options;
|
|
25774
|
+
const refreshMs = Number.isFinite(options.refreshMs) && options.refreshMs > 0 ? options.refreshMs : TOOL_CATALOG_REFRESH_MS;
|
|
25775
|
+
const setTimeoutFn = typeof options.setTimeoutFn === "function" ? options.setTimeoutFn : setTimeout;
|
|
25776
|
+
const clearTimeoutFn = typeof options.clearTimeoutFn === "function" ? options.clearTimeoutFn : clearTimeout;
|
|
25777
|
+
const knownSet = known instanceof Set ? known : new Set(known ?? []);
|
|
25778
|
+
const canInspectOccupancy = typeof slots?.entries === "function";
|
|
25779
|
+
const views = /* @__PURE__ */ new Map();
|
|
25780
|
+
let disposed = false;
|
|
25781
|
+
let refreshing = false;
|
|
25782
|
+
let timer = null;
|
|
25783
|
+
let enabled = false;
|
|
25784
|
+
const entryCount = (key) => {
|
|
25785
|
+
try {
|
|
25786
|
+
const entries = typeof slots?.entries === "function" ? slots.entries("tool.call.toolview") : [];
|
|
25787
|
+
if (!Array.isArray(entries)) return 0;
|
|
25788
|
+
let count = 0;
|
|
25789
|
+
for (const entry of entries) if (entry?.options?.key === key) count += 1;
|
|
25790
|
+
return count;
|
|
25791
|
+
} catch {
|
|
25792
|
+
return 0;
|
|
25793
|
+
}
|
|
25794
|
+
};
|
|
25795
|
+
const release = (key) => {
|
|
25796
|
+
const dispose2 = views.get(key);
|
|
25797
|
+
if (dispose2 === void 0) return;
|
|
25798
|
+
views.delete(key);
|
|
25799
|
+
try {
|
|
25800
|
+
dispose2();
|
|
25801
|
+
} catch (error) {
|
|
25802
|
+
console.warn(`[dsh-inline-diff] failed to release dynamic tool view "${key}"`, error);
|
|
25803
|
+
}
|
|
25804
|
+
};
|
|
25805
|
+
const clear = () => {
|
|
25806
|
+
for (const key of [...views.keys()]) release(key);
|
|
25807
|
+
};
|
|
25808
|
+
const clearTimer = () => {
|
|
25809
|
+
if (timer === null) return;
|
|
25810
|
+
clearTimeoutFn(timer);
|
|
25811
|
+
timer = null;
|
|
25812
|
+
};
|
|
25813
|
+
const schedule = () => {
|
|
25814
|
+
if (disposed || !enabled) {
|
|
25815
|
+
clearTimer();
|
|
25816
|
+
return;
|
|
25817
|
+
}
|
|
25818
|
+
clearTimer();
|
|
25819
|
+
timer = setTimeoutFn(() => {
|
|
25820
|
+
timer = null;
|
|
25821
|
+
void refresh();
|
|
25822
|
+
}, refreshMs);
|
|
25823
|
+
};
|
|
25824
|
+
async function refresh() {
|
|
25825
|
+
if (disposed || refreshing || !enabled) return;
|
|
25826
|
+
if (!canInspectOccupancy) return;
|
|
25827
|
+
refreshing = true;
|
|
25828
|
+
try {
|
|
25829
|
+
const names = await fetchNames();
|
|
25830
|
+
if (disposed || !enabled) return;
|
|
25831
|
+
if (!Array.isArray(names)) return;
|
|
25832
|
+
const claimed = /* @__PURE__ */ new Set();
|
|
25833
|
+
for (const name of names) {
|
|
25834
|
+
if (knownSet.has(name) || views.has(name)) continue;
|
|
25835
|
+
if (entryCount(name) > 0) claimed.add(name);
|
|
25836
|
+
}
|
|
25837
|
+
const selected = selectDynamicToolKeys(names, { known: knownSet, claimed, already: views.keys() });
|
|
25838
|
+
for (const key of selected) {
|
|
25839
|
+
if (disposed || !enabled) return;
|
|
25840
|
+
if (entryCount(key) > 0) continue;
|
|
25841
|
+
const dispose2 = register(key);
|
|
25842
|
+
if (typeof dispose2 === "function") views.set(key, dispose2);
|
|
25843
|
+
}
|
|
25844
|
+
} catch (error) {
|
|
25845
|
+
console.warn("[dsh-inline-diff] cannot refresh third-party tool views", error);
|
|
25846
|
+
} finally {
|
|
25847
|
+
refreshing = false;
|
|
25848
|
+
schedule();
|
|
25849
|
+
}
|
|
25850
|
+
}
|
|
25851
|
+
function stepAside() {
|
|
25852
|
+
if (disposed) return;
|
|
25853
|
+
for (const key of [...views.keys()]) {
|
|
25854
|
+
if (entryCount(key) > 1) release(key);
|
|
25855
|
+
}
|
|
25856
|
+
}
|
|
25857
|
+
function setEnabled(next) {
|
|
25858
|
+
if (disposed) return void 0;
|
|
25859
|
+
enabled = next === true;
|
|
25860
|
+
if (!enabled) {
|
|
25861
|
+
clearTimer();
|
|
25862
|
+
clear();
|
|
25863
|
+
return void 0;
|
|
25864
|
+
}
|
|
25865
|
+
const pending = refresh();
|
|
25866
|
+
schedule();
|
|
25867
|
+
return pending;
|
|
25868
|
+
}
|
|
25869
|
+
function dispose() {
|
|
25870
|
+
if (disposed) return;
|
|
25871
|
+
disposed = true;
|
|
25872
|
+
clearTimer();
|
|
25873
|
+
clear();
|
|
25874
|
+
}
|
|
25875
|
+
function keys() {
|
|
25876
|
+
return [...views.keys()];
|
|
25877
|
+
}
|
|
25878
|
+
return { refresh, stepAside, setEnabled, dispose, keys };
|
|
25879
|
+
}
|
|
25880
|
+
|
|
25881
|
+
// src/client/read-range.js
|
|
25882
|
+
function compressLineRanges(numbers) {
|
|
25883
|
+
const ranges = [];
|
|
25884
|
+
let start = null;
|
|
25885
|
+
let previous = null;
|
|
24050
25886
|
for (const value of numbers) {
|
|
24051
25887
|
if (typeof value !== "number" || !Number.isFinite(value)) continue;
|
|
24052
25888
|
if (start === null) {
|
|
@@ -24095,6 +25931,15 @@ function readRangeLabels(ranges, t) {
|
|
|
24095
25931
|
// src/client/read-range-dom.js
|
|
24096
25932
|
var CHIP_ATTR = "data-dsh-inline-diff-read-range";
|
|
24097
25933
|
var rowCache = /* @__PURE__ */ new WeakMap();
|
|
25934
|
+
function applyChipAppearance(chip) {
|
|
25935
|
+
const config = surfaceDomValues(getSettings(), "readRangeChip");
|
|
25936
|
+
chip.setAttribute("data-fx", config.effect);
|
|
25937
|
+
chip.setAttribute("data-fx-surface", "readRangeChip");
|
|
25938
|
+
if (config.effect === EFFECT_LIQUID) chip.setAttribute("data-liquid-mode", config.mode);
|
|
25939
|
+
else chip.removeAttribute("data-liquid-mode");
|
|
25940
|
+
chip.style.setProperty("--did-fx-alpha", String(config.opacity));
|
|
25941
|
+
chip.style.setProperty("--did-fx-blur", `${config.blur}px`);
|
|
25942
|
+
}
|
|
24098
25943
|
function blockFromFiber(element) {
|
|
24099
25944
|
const key = Object.keys(element).find((name) => name.startsWith("__reactFiber$") || name.startsWith("__reactInternalInstance$"));
|
|
24100
25945
|
if (key === void 0) return null;
|
|
@@ -24140,6 +25985,7 @@ function syncReadRow(row, t) {
|
|
|
24140
25985
|
}
|
|
24141
25986
|
if (chip.textContent !== label) chip.textContent = label;
|
|
24142
25987
|
if (chip.title !== label) chip.title = label;
|
|
25988
|
+
applyChipAppearance(chip);
|
|
24143
25989
|
const expanded = explicitHeader.getAttribute("aria-expanded") === "true";
|
|
24144
25990
|
if (chip.hidden !== expanded) chip.hidden = expanded;
|
|
24145
25991
|
}
|
|
@@ -24198,10 +26044,21 @@ function startReadRangeChips(t) {
|
|
|
24198
26044
|
return () => {
|
|
24199
26045
|
};
|
|
24200
26046
|
}
|
|
26047
|
+
let unsubscribeSettings = () => {
|
|
26048
|
+
};
|
|
26049
|
+
try {
|
|
26050
|
+
unsubscribeSettings = subscribeSettings(() => {
|
|
26051
|
+
for (const chip of document.querySelectorAll(`[${CHIP_ATTR}]`)) applyChipAppearance(chip);
|
|
26052
|
+
});
|
|
26053
|
+
} catch {
|
|
26054
|
+
unsubscribeSettings = () => {
|
|
26055
|
+
};
|
|
26056
|
+
}
|
|
24201
26057
|
let stopped = false;
|
|
24202
26058
|
return () => {
|
|
24203
26059
|
if (stopped) return;
|
|
24204
26060
|
stopped = true;
|
|
26061
|
+
unsubscribeSettings();
|
|
24205
26062
|
observer.disconnect();
|
|
24206
26063
|
if (frame !== null) {
|
|
24207
26064
|
if (typeof cancelAnimationFrame === "function") cancelAnimationFrame(frame);
|
|
@@ -24212,14 +26069,93 @@ function startReadRangeChips(t) {
|
|
|
24212
26069
|
}
|
|
24213
26070
|
|
|
24214
26071
|
// src/client/project.js
|
|
24215
|
-
var VERSION = "1.
|
|
26072
|
+
var VERSION = "1.4.1";
|
|
24216
26073
|
var AUTHOR = "Him666233";
|
|
24217
26074
|
var AUTHOR_URL = "https://github.com/Him666233";
|
|
24218
26075
|
var REPO_URL = "https://github.com/Him666233/dsh-inline-diff";
|
|
24219
26076
|
|
|
24220
26077
|
// src/client/settings-ui.jsx
|
|
24221
|
-
var
|
|
26078
|
+
var import_react6 = require("react");
|
|
24222
26079
|
var import_react_dom2 = require("react-dom");
|
|
26080
|
+
|
|
26081
|
+
// src/client/updates.js
|
|
26082
|
+
function parseSemver(text) {
|
|
26083
|
+
const match = /^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?(?:\+[0-9A-Za-z.-]+)?$/.exec(String(text ?? "").trim());
|
|
26084
|
+
if (match === null) return null;
|
|
26085
|
+
return {
|
|
26086
|
+
major: Number(match[1]),
|
|
26087
|
+
minor: Number(match[2]),
|
|
26088
|
+
patch: Number(match[3]),
|
|
26089
|
+
pre: match[4] === void 0 ? [] : match[4].split(".")
|
|
26090
|
+
};
|
|
26091
|
+
}
|
|
26092
|
+
function compareSemver(left, right) {
|
|
26093
|
+
const a = parseSemver(left);
|
|
26094
|
+
const b = parseSemver(right);
|
|
26095
|
+
if (a === null || b === null) return 0;
|
|
26096
|
+
for (const key of ["major", "minor", "patch"]) {
|
|
26097
|
+
if (a[key] !== b[key]) return a[key] - b[key];
|
|
26098
|
+
}
|
|
26099
|
+
if (a.pre.length === 0 && b.pre.length === 0) return 0;
|
|
26100
|
+
if (a.pre.length === 0) return 1;
|
|
26101
|
+
if (b.pre.length === 0) return -1;
|
|
26102
|
+
const length = Math.max(a.pre.length, b.pre.length);
|
|
26103
|
+
for (let index = 0; index < length; index += 1) {
|
|
26104
|
+
const x = a.pre[index];
|
|
26105
|
+
const y = b.pre[index];
|
|
26106
|
+
if (x === void 0) return -1;
|
|
26107
|
+
if (y === void 0) return 1;
|
|
26108
|
+
const xn = /^\d+$/.test(x) ? Number(x) : null;
|
|
26109
|
+
const yn = /^\d+$/.test(y) ? Number(y) : null;
|
|
26110
|
+
if (xn !== null && yn !== null) {
|
|
26111
|
+
if (xn !== yn) return xn - yn;
|
|
26112
|
+
continue;
|
|
26113
|
+
}
|
|
26114
|
+
if (xn !== null) return -1;
|
|
26115
|
+
if (yn !== null) return 1;
|
|
26116
|
+
if (x !== y) return x < y ? -1 : 1;
|
|
26117
|
+
}
|
|
26118
|
+
return 0;
|
|
26119
|
+
}
|
|
26120
|
+
function buildVersionRows(payload2, currentVersion) {
|
|
26121
|
+
const rows = [];
|
|
26122
|
+
const versions = Array.isArray(payload2?.versions) ? payload2.versions : [];
|
|
26123
|
+
const latest = typeof payload2?.latest === "string" ? payload2.latest : null;
|
|
26124
|
+
for (const item of versions) {
|
|
26125
|
+
if (item === null || typeof item !== "object") continue;
|
|
26126
|
+
if (typeof item.version !== "string" || parseSemver(item.version) === null) continue;
|
|
26127
|
+
const installable = item.installable !== false;
|
|
26128
|
+
const reason = installable ? null : item.bundleMissing === true ? "bundle-missing" : "unavailable";
|
|
26129
|
+
rows.push({
|
|
26130
|
+
version: item.version,
|
|
26131
|
+
latest: item.version === latest || item.latest === true,
|
|
26132
|
+
current: currentVersion !== null && currentVersion !== void 0 && item.version === currentVersion,
|
|
26133
|
+
publishedAt: typeof item.publishedAt === "string" ? item.publishedAt : null,
|
|
26134
|
+
deprecated: typeof item.deprecated === "string" || item.deprecated === true,
|
|
26135
|
+
enginesDsh: typeof item.enginesDsh === "string" ? item.enginesDsh : null,
|
|
26136
|
+
installable,
|
|
26137
|
+
reason
|
|
26138
|
+
});
|
|
26139
|
+
}
|
|
26140
|
+
rows.sort((a, b) => compareSemver(b.version, a.version));
|
|
26141
|
+
return rows;
|
|
26142
|
+
}
|
|
26143
|
+
function installActionFor(currentVersion, targetVersion) {
|
|
26144
|
+
if (parseSemver(currentVersion) === null || parseSemver(targetVersion) === null) return null;
|
|
26145
|
+
const order = compareSemver(targetVersion, currentVersion);
|
|
26146
|
+
if (order === 0) return "reinstall";
|
|
26147
|
+
return order > 0 ? "update" : "rollback";
|
|
26148
|
+
}
|
|
26149
|
+
function formatPublishedAt(iso) {
|
|
26150
|
+
if (typeof iso !== "string" || iso === "") return "";
|
|
26151
|
+
const date = new Date(iso);
|
|
26152
|
+
if (Number.isNaN(date.getTime())) return "";
|
|
26153
|
+
const month = String(date.getMonth() + 1).padStart(2, "0");
|
|
26154
|
+
const day = String(date.getDate()).padStart(2, "0");
|
|
26155
|
+
return `${date.getFullYear()}-${month}-${day}`;
|
|
26156
|
+
}
|
|
26157
|
+
|
|
26158
|
+
// src/client/settings-ui.jsx
|
|
24223
26159
|
var import_jsx_runtime4 = require("react/jsx-runtime");
|
|
24224
26160
|
var ORIGINALITY_REPO_URL = "https://github.com/JanEickholt/dsh-inline-diff";
|
|
24225
26161
|
var modalOpen = false;
|
|
@@ -24239,7 +26175,7 @@ function subscribeModal(listener) {
|
|
|
24239
26175
|
return () => modalListeners.delete(listener);
|
|
24240
26176
|
}
|
|
24241
26177
|
function useModalOpen() {
|
|
24242
|
-
return (0,
|
|
26178
|
+
return (0, import_react6.useSyncExternalStore)(subscribeModal, () => modalOpen, () => modalOpen);
|
|
24243
26179
|
}
|
|
24244
26180
|
var languagesCache;
|
|
24245
26181
|
function supportedLanguageList() {
|
|
@@ -24306,8 +26242,8 @@ function SlidersIcon({ size = 15 }) {
|
|
|
24306
26242
|
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("circle", { cx: "10.75", cy: "12", r: "1.6", stroke: "currentColor", strokeWidth: "1.4" })
|
|
24307
26243
|
] });
|
|
24308
26244
|
}
|
|
24309
|
-
function SettingRow({ label, description, children, extra }) {
|
|
24310
|
-
return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "did-setting"
|
|
26245
|
+
function SettingRow({ label, description, children, extra, className }) {
|
|
26246
|
+
return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: className === void 0 ? "did-setting" : `did-setting ${className}`, children: [
|
|
24311
26247
|
/* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "did-setting-text", children: [
|
|
24312
26248
|
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-setting-label", children: label }),
|
|
24313
26249
|
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-setting-desc", children: description }),
|
|
@@ -24316,13 +26252,126 @@ function SettingRow({ label, description, children, extra }) {
|
|
|
24316
26252
|
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-setting-control", children })
|
|
24317
26253
|
] });
|
|
24318
26254
|
}
|
|
26255
|
+
var FX_EFFECT_LABEL_KEYS = {
|
|
26256
|
+
native: "fx.effectNative",
|
|
26257
|
+
glass: "fx.effectGlass",
|
|
26258
|
+
liquid: "fx.effectLiquid"
|
|
26259
|
+
};
|
|
26260
|
+
var FX_EFFECT_DESC_KEYS = {
|
|
26261
|
+
native: "fx.effectNativeDesc",
|
|
26262
|
+
glass: "fx.effectGlassDesc",
|
|
26263
|
+
liquid: "fx.effectLiquidDesc"
|
|
26264
|
+
};
|
|
26265
|
+
var FX_MODE_LABEL_KEYS = { clear: "fx.liquidClear", frosted: "fx.liquidFrosted" };
|
|
26266
|
+
function FxRange({ label, display, value, min, max, step, onChange }) {
|
|
26267
|
+
return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("label", { className: "did-fx-slider", children: [
|
|
26268
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { className: "did-fx-slider-label", children: label }),
|
|
26269
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
|
|
26270
|
+
"input",
|
|
26271
|
+
{
|
|
26272
|
+
className: "did-fx-range",
|
|
26273
|
+
type: "range",
|
|
26274
|
+
"aria-label": label,
|
|
26275
|
+
min,
|
|
26276
|
+
max,
|
|
26277
|
+
step,
|
|
26278
|
+
value,
|
|
26279
|
+
onChange: (event) => onChange(Number(event.target.value))
|
|
26280
|
+
}
|
|
26281
|
+
),
|
|
26282
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { className: "did-fx-slider-value", children: display })
|
|
26283
|
+
] });
|
|
26284
|
+
}
|
|
26285
|
+
function FxSettings({ t, settings, onChange }) {
|
|
26286
|
+
let enabledCount = 0;
|
|
26287
|
+
for (const surface of SURFACES) {
|
|
26288
|
+
if (effectOf(settings, surface.id).effect !== "native") enabledCount += 1;
|
|
26289
|
+
}
|
|
26290
|
+
const summaryState = enabledCount === 0 ? t("fx.summaryNone") : t("fx.summaryCount", { n: enabledCount });
|
|
26291
|
+
return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("details", { className: "did-fx-details did-langs-details", children: [
|
|
26292
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("summary", { children: [
|
|
26293
|
+
t("fx.sectionTitle"),
|
|
26294
|
+
summaryState
|
|
26295
|
+
] }),
|
|
26296
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "did-fx-content", children: [
|
|
26297
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-setting-desc did-fx-desc", children: t("fx.sectionDesc") }),
|
|
26298
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-settings-note did-fx-legend", children: EFFECTS.map((effect) => /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { children: [
|
|
26299
|
+
t(FX_EFFECT_LABEL_KEYS[effect]),
|
|
26300
|
+
" — ",
|
|
26301
|
+
t(FX_EFFECT_DESC_KEYS[effect])
|
|
26302
|
+
] }, effect)) }),
|
|
26303
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-fx-list", children: SURFACES.map((surface) => {
|
|
26304
|
+
const config = effectOf(settings, surface.id);
|
|
26305
|
+
const liquid = config.effect === "liquid";
|
|
26306
|
+
const params = config.effect === "native" ? void 0 : /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "did-fx-params", children: [
|
|
26307
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
|
|
26308
|
+
FxRange,
|
|
26309
|
+
{
|
|
26310
|
+
label: t("fx.opacity"),
|
|
26311
|
+
display: `${Math.round(config.opacity * 100)}%`,
|
|
26312
|
+
value: config.opacity,
|
|
26313
|
+
min: FX_LIMITS.opacityMin,
|
|
26314
|
+
max: FX_LIMITS.opacityMax,
|
|
26315
|
+
step: FX_LIMITS.opacityStep,
|
|
26316
|
+
onChange: (value) => onChange(surface.id, { opacity: value })
|
|
26317
|
+
}
|
|
26318
|
+
),
|
|
26319
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
|
|
26320
|
+
FxRange,
|
|
26321
|
+
{
|
|
26322
|
+
label: t("fx.blur"),
|
|
26323
|
+
display: `${config.blur}px`,
|
|
26324
|
+
value: config.blur,
|
|
26325
|
+
min: FX_LIMITS.blurMin,
|
|
26326
|
+
max: FX_LIMITS.blurMax,
|
|
26327
|
+
step: FX_LIMITS.blurStep,
|
|
26328
|
+
onChange: (value) => onChange(surface.id, { blur: value })
|
|
26329
|
+
}
|
|
26330
|
+
),
|
|
26331
|
+
liquid ? /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "did-tones did-fx-mode", children: [
|
|
26332
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { className: "did-tone-label", children: t("fx.liquidMode") }),
|
|
26333
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
|
|
26334
|
+
Segmented,
|
|
26335
|
+
{
|
|
26336
|
+
ariaLabel: t("fx.liquidMode"),
|
|
26337
|
+
value: config.mode,
|
|
26338
|
+
onChange: (value) => onChange(surface.id, { mode: value }),
|
|
26339
|
+
options: LIQUID_MODES.map((mode) => ({ value: mode, label: t(FX_MODE_LABEL_KEYS[mode]) }))
|
|
26340
|
+
}
|
|
26341
|
+
)
|
|
26342
|
+
] }) : null
|
|
26343
|
+
] });
|
|
26344
|
+
return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
|
|
26345
|
+
SettingRow,
|
|
26346
|
+
{
|
|
26347
|
+
className: "did-fx-row",
|
|
26348
|
+
label: t(surface.labelKey),
|
|
26349
|
+
description: t(surface.descKey),
|
|
26350
|
+
extra: params,
|
|
26351
|
+
children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
|
|
26352
|
+
Segmented,
|
|
26353
|
+
{
|
|
26354
|
+
ariaLabel: `${t(surface.labelKey)} · ${t("fx.effect")}`,
|
|
26355
|
+
value: config.effect,
|
|
26356
|
+
onChange: (value) => onChange(surface.id, { effect: value }),
|
|
26357
|
+
options: EFFECTS.map((effect) => ({ value: effect, label: t(FX_EFFECT_LABEL_KEYS[effect]) }))
|
|
26358
|
+
}
|
|
26359
|
+
)
|
|
26360
|
+
},
|
|
26361
|
+
surface.id
|
|
26362
|
+
);
|
|
26363
|
+
}) }),
|
|
26364
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-settings-note", children: t("fx.note") })
|
|
26365
|
+
] })
|
|
26366
|
+
] });
|
|
26367
|
+
}
|
|
24319
26368
|
function SettingsCloseButton({ onClose, t }) {
|
|
24320
26369
|
return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("button", { type: "button", className: "did-settings-close", onClick: onClose, "aria-label": t("close"), title: t("close"), children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("svg", { viewBox: "0 0 16 16", width: "13", height: "13", fill: "none", "aria-hidden": "true", children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("path", { d: "m3.5 3.5 9 9m0-9-9 9", stroke: "currentColor", strokeWidth: "1.6", strokeLinecap: "round" }) }) });
|
|
24321
26370
|
}
|
|
24322
26371
|
function SupportedLanguages({ t, languages }) {
|
|
24323
|
-
const [open, setOpen] = (0,
|
|
24324
|
-
const detailsRef = (0,
|
|
24325
|
-
(0,
|
|
26372
|
+
const [open, setOpen] = (0, import_react6.useState)(false);
|
|
26373
|
+
const detailsRef = (0, import_react6.useRef)(null);
|
|
26374
|
+
(0, import_react6.useEffect)(() => {
|
|
24326
26375
|
const node = detailsRef.current;
|
|
24327
26376
|
if (node === null) return void 0;
|
|
24328
26377
|
const onToggle = () => setOpen(node.open);
|
|
@@ -24343,10 +26392,10 @@ function SupportedLanguages({ t, languages }) {
|
|
|
24343
26392
|
function SettingsPanel({ t, onClose }) {
|
|
24344
26393
|
const settings = useSettingsSnapshot();
|
|
24345
26394
|
const languageList = supportedLanguageList();
|
|
24346
|
-
const [dsmMode, setDsmMode] = (0,
|
|
24347
|
-
const [busy, setBusy] = (0,
|
|
24348
|
-
const [error, setError] = (0,
|
|
24349
|
-
(0,
|
|
26395
|
+
const [dsmMode, setDsmMode] = (0, import_react6.useState)(void 0);
|
|
26396
|
+
const [busy, setBusy] = (0, import_react6.useState)(false);
|
|
26397
|
+
const [error, setError] = (0, import_react6.useState)("");
|
|
26398
|
+
(0, import_react6.useEffect)(() => {
|
|
24350
26399
|
setDsmMode(currentTranscriptMode());
|
|
24351
26400
|
}, [settings.transcript]);
|
|
24352
26401
|
const chooseTranscript = async (mode) => {
|
|
@@ -24376,6 +26425,12 @@ function SettingsPanel({ t, onClose }) {
|
|
|
24376
26425
|
}
|
|
24377
26426
|
};
|
|
24378
26427
|
const transcriptNote = settings.transcript === "enhanced" ? t("settings.transcriptEnhancedNote") : t("settings.transcriptNativeNote");
|
|
26428
|
+
const patchSurfaceEffect = (surfaceId, patch) => {
|
|
26429
|
+
const current = getSettings();
|
|
26430
|
+
const effects = { ...current.effects ?? {} };
|
|
26431
|
+
effects[surfaceId] = { ...effectOf(current, surfaceId), ...patch };
|
|
26432
|
+
updateSettings({ effects });
|
|
26433
|
+
};
|
|
24379
26434
|
return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "did-settings", children: [
|
|
24380
26435
|
/* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "did-settings-head", children: [
|
|
24381
26436
|
/* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "did-settings-headtext", children: [
|
|
@@ -24555,6 +26610,9 @@ function SettingsPanel({ t, onClose }) {
|
|
|
24555
26610
|
settings.toolCalls === "enhanced" && settings.transcript === "native" ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-settings-note", children: t("settings.toolCallsNeedsFlat") }) : null,
|
|
24556
26611
|
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-settings-note", children: t("settings.subagentNote") }),
|
|
24557
26612
|
dsmMode !== void 0 && settings.transcript === "enhanced" ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-settings-note", children: t("settings.dsmCurrent", { mode: dsmMode }) }) : null,
|
|
26613
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)(FxSettings, { t, settings, onChange: patchSurfaceEffect }),
|
|
26614
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)(ReadRootsSection, { t }),
|
|
26615
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)(UpdateSection, { t }),
|
|
24558
26616
|
error !== "" ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-settings-error", children: error }) : null
|
|
24559
26617
|
] }),
|
|
24560
26618
|
/* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "did-settings-foot", children: [
|
|
@@ -24572,7 +26630,8 @@ function SettingsPanel({ t, onClose }) {
|
|
|
24572
26630
|
] });
|
|
24573
26631
|
}
|
|
24574
26632
|
function SettingsSection({ t }) {
|
|
24575
|
-
|
|
26633
|
+
const settings = useSettingsSnapshot();
|
|
26634
|
+
return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-settings-page", ...surfaceProps(settings, "settingsPanel"), children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(SettingsPanel, { t }) });
|
|
24576
26635
|
}
|
|
24577
26636
|
function SettingsLauncher({ wide, t }) {
|
|
24578
26637
|
return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(
|
|
@@ -24590,13 +26649,240 @@ function SettingsLauncher({ wide, t }) {
|
|
|
24590
26649
|
}
|
|
24591
26650
|
);
|
|
24592
26651
|
}
|
|
26652
|
+
function ReadRootsSection({ t }) {
|
|
26653
|
+
const [roots, setRoots] = (0, import_react6.useState)([]);
|
|
26654
|
+
const [max, setMax] = (0, import_react6.useState)(12);
|
|
26655
|
+
const [loaded, setLoaded] = (0, import_react6.useState)(false);
|
|
26656
|
+
const [draft, setDraft] = (0, import_react6.useState)("");
|
|
26657
|
+
const [busy, setBusy] = (0, import_react6.useState)(false);
|
|
26658
|
+
const [feedback, setFeedback] = (0, import_react6.useState)(null);
|
|
26659
|
+
(0, import_react6.useEffect)(() => {
|
|
26660
|
+
let alive = true;
|
|
26661
|
+
fetchReadRoots().then((result) => {
|
|
26662
|
+
if (!alive) return;
|
|
26663
|
+
if (result !== null) {
|
|
26664
|
+
setRoots(result.roots);
|
|
26665
|
+
setMax(result.max);
|
|
26666
|
+
}
|
|
26667
|
+
setLoaded(true);
|
|
26668
|
+
});
|
|
26669
|
+
return () => {
|
|
26670
|
+
alive = false;
|
|
26671
|
+
};
|
|
26672
|
+
}, []);
|
|
26673
|
+
const save = async (next) => {
|
|
26674
|
+
if (busy) return;
|
|
26675
|
+
setBusy(true);
|
|
26676
|
+
setFeedback(null);
|
|
26677
|
+
const result = await saveReadRoots(next);
|
|
26678
|
+
setBusy(false);
|
|
26679
|
+
if (result === null) {
|
|
26680
|
+
setFeedback({ kind: "error", code: "network" });
|
|
26681
|
+
return;
|
|
26682
|
+
}
|
|
26683
|
+
if (result.ok !== true) {
|
|
26684
|
+
setFeedback({ kind: "error", code: result.code });
|
|
26685
|
+
return;
|
|
26686
|
+
}
|
|
26687
|
+
setRoots(result.roots);
|
|
26688
|
+
setFeedback({ kind: "ok" });
|
|
26689
|
+
};
|
|
26690
|
+
const add = () => {
|
|
26691
|
+
const value = draft.trim();
|
|
26692
|
+
if (value === "" || busy) return;
|
|
26693
|
+
setDraft("");
|
|
26694
|
+
void save([...roots, value]);
|
|
26695
|
+
};
|
|
26696
|
+
return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "did-readroots", children: [
|
|
26697
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-setting-label", children: t("settings.readRoots") }),
|
|
26698
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-setting-desc", children: t("settings.readRootsDesc") }),
|
|
26699
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "did-readroots-row", children: [
|
|
26700
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
|
|
26701
|
+
"input",
|
|
26702
|
+
{
|
|
26703
|
+
className: "did-readroots-input",
|
|
26704
|
+
type: "text",
|
|
26705
|
+
value: draft,
|
|
26706
|
+
placeholder: t("settings.readRootsPlaceholder"),
|
|
26707
|
+
"aria-label": t("settings.readRootsPlaceholder"),
|
|
26708
|
+
disabled: busy || !loaded,
|
|
26709
|
+
spellCheck: false,
|
|
26710
|
+
onChange: (event) => setDraft(event.target.value),
|
|
26711
|
+
onKeyDown: (event) => {
|
|
26712
|
+
if (event.key !== "Enter") return;
|
|
26713
|
+
event.preventDefault();
|
|
26714
|
+
add();
|
|
26715
|
+
}
|
|
26716
|
+
}
|
|
26717
|
+
),
|
|
26718
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
|
|
26719
|
+
"button",
|
|
26720
|
+
{
|
|
26721
|
+
type: "button",
|
|
26722
|
+
className: "did-readroots-button",
|
|
26723
|
+
disabled: busy || !loaded || draft.trim() === "",
|
|
26724
|
+
onClick: add,
|
|
26725
|
+
children: busy ? t("settings.readRootsBusy") : t("settings.readRootsAdd")
|
|
26726
|
+
}
|
|
26727
|
+
)
|
|
26728
|
+
] }),
|
|
26729
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-readroots-list", children: roots.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-readroots-empty", children: t("settings.readRootsEmpty") }) : roots.map((root) => /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "did-readroots-item", children: [
|
|
26730
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { className: "did-readroots-path", title: root, children: root }),
|
|
26731
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
|
|
26732
|
+
"button",
|
|
26733
|
+
{
|
|
26734
|
+
type: "button",
|
|
26735
|
+
className: "did-readroots-button",
|
|
26736
|
+
disabled: busy,
|
|
26737
|
+
onClick: () => {
|
|
26738
|
+
void save(roots.filter((item) => item !== root));
|
|
26739
|
+
},
|
|
26740
|
+
children: t("settings.readRootsRemove")
|
|
26741
|
+
}
|
|
26742
|
+
)
|
|
26743
|
+
] }, root)) }),
|
|
26744
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "did-settings-note", children: [
|
|
26745
|
+
t("settings.readRootsLimit", { max }),
|
|
26746
|
+
" · ",
|
|
26747
|
+
t("settings.readRootsNote")
|
|
26748
|
+
] }),
|
|
26749
|
+
feedback?.kind === "ok" ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-readroots-ok", children: t("settings.readRootsSaved") }) : null,
|
|
26750
|
+
feedback?.kind === "error" ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-settings-error", children: t("settings.readRootsError", { code: feedback.code ?? "unknown" }) }) : null
|
|
26751
|
+
] });
|
|
26752
|
+
}
|
|
26753
|
+
function UpdateSection({ t }) {
|
|
26754
|
+
const [info, setInfo] = (0, import_react6.useState)(null);
|
|
26755
|
+
const [loading, setLoading] = (0, import_react6.useState)(false);
|
|
26756
|
+
const [installing, setInstalling] = (0, import_react6.useState)(false);
|
|
26757
|
+
const [error, setError] = (0, import_react6.useState)("");
|
|
26758
|
+
const [selected, setSelected] = (0, import_react6.useState)(null);
|
|
26759
|
+
const [result, setResult] = (0, import_react6.useState)(null);
|
|
26760
|
+
const currentVersion = info?.current ?? VERSION;
|
|
26761
|
+
const rows = (0, import_react6.useMemo)(() => info === null ? [] : buildVersionRows(info, currentVersion), [info, currentVersion]);
|
|
26762
|
+
const selectedRow = rows.find((row) => row.version === selected) ?? null;
|
|
26763
|
+
const action = selectedRow === null ? null : installActionFor(currentVersion, selectedRow.version);
|
|
26764
|
+
const manualMode = info?.installer?.mode === "manual";
|
|
26765
|
+
const resetFeedback = () => {
|
|
26766
|
+
setError("");
|
|
26767
|
+
setResult(null);
|
|
26768
|
+
};
|
|
26769
|
+
const load2 = async (refresh) => {
|
|
26770
|
+
if (loading === true || installing === true) return;
|
|
26771
|
+
resetFeedback();
|
|
26772
|
+
setLoading(true);
|
|
26773
|
+
const data = await fetchUpdateInfo(refresh);
|
|
26774
|
+
setLoading(false);
|
|
26775
|
+
if (data === null) {
|
|
26776
|
+
setError(t("update.errorNetwork"));
|
|
26777
|
+
return;
|
|
26778
|
+
}
|
|
26779
|
+
setInfo(data);
|
|
26780
|
+
const preferred = data.versions?.find((item) => item.version === data.latest && item.installable !== false) ?? data.versions?.find((item) => item.installable !== false);
|
|
26781
|
+
setSelected(preferred?.version ?? null);
|
|
26782
|
+
};
|
|
26783
|
+
const install = async () => {
|
|
26784
|
+
if (selectedRow === null || selectedRow.installable !== true || installing === true) return;
|
|
26785
|
+
resetFeedback();
|
|
26786
|
+
setInstalling(true);
|
|
26787
|
+
const response = await performUpdate(selectedRow.version);
|
|
26788
|
+
setInstalling(false);
|
|
26789
|
+
if (response === null) {
|
|
26790
|
+
setError(t("update.errorNetwork"));
|
|
26791
|
+
return;
|
|
26792
|
+
}
|
|
26793
|
+
setResult(response);
|
|
26794
|
+
if (response.ok === true) setInfo((prev) => prev === null ? prev : { ...prev, current: response.installedVersion ?? prev.current });
|
|
26795
|
+
};
|
|
26796
|
+
const actionLabel = action === "update" ? t("update.updateTo", { version: selectedRow?.version ?? "" }) : action === "rollback" ? t("update.rollbackTo", { version: selectedRow?.version ?? "" }) : action === "reinstall" ? t("update.reinstall", { version: selectedRow?.version ?? "" }) : t("update.selectVersion");
|
|
26797
|
+
return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "did-update", children: [
|
|
26798
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "did-update-head", children: [
|
|
26799
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "did-update-headtext", children: [
|
|
26800
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-update-title", children: t("update.title") }),
|
|
26801
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "did-update-sub", children: [
|
|
26802
|
+
t("update.current", { version: currentVersion }),
|
|
26803
|
+
typeof info?.latest === "string" ? ` · ${t("update.latest")} v${info.latest}` : "",
|
|
26804
|
+
typeof info?.dshVersion === "string" ? ` · DSH ${info.dshVersion}` : ""
|
|
26805
|
+
] })
|
|
26806
|
+
] }),
|
|
26807
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
|
|
26808
|
+
"button",
|
|
26809
|
+
{
|
|
26810
|
+
type: "button",
|
|
26811
|
+
className: "did-update-check",
|
|
26812
|
+
disabled: loading || installing,
|
|
26813
|
+
onClick: () => load2(true),
|
|
26814
|
+
children: loading ? t("update.checking") : t("update.check")
|
|
26815
|
+
}
|
|
26816
|
+
)
|
|
26817
|
+
] }),
|
|
26818
|
+
error !== "" ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-settings-error", children: error }) : null,
|
|
26819
|
+
info === null ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-update-idle", children: t("update.idleHint") }) : /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_react6.Fragment, { children: [
|
|
26820
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-update-list", role: "listbox", "aria-label": t("update.versions"), children: rows.slice(0, 15).map((row) => /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(
|
|
26821
|
+
"button",
|
|
26822
|
+
{
|
|
26823
|
+
type: "button",
|
|
26824
|
+
role: "option",
|
|
26825
|
+
"aria-selected": selected === row.version,
|
|
26826
|
+
className: "did-update-row",
|
|
26827
|
+
"data-selected": selected === row.version ? "" : void 0,
|
|
26828
|
+
"data-latest": row.latest ? "" : void 0,
|
|
26829
|
+
"data-current": row.current ? "" : void 0,
|
|
26830
|
+
"data-unavailable": row.installable ? void 0 : "",
|
|
26831
|
+
disabled: !row.installable,
|
|
26832
|
+
onClick: () => {
|
|
26833
|
+
resetFeedback();
|
|
26834
|
+
setSelected(row.version);
|
|
26835
|
+
},
|
|
26836
|
+
children: [
|
|
26837
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("span", { className: "did-update-ver", children: [
|
|
26838
|
+
"v",
|
|
26839
|
+
row.version
|
|
26840
|
+
] }),
|
|
26841
|
+
row.latest ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { className: "did-update-badge", children: t("update.latest") }) : null,
|
|
26842
|
+
row.current ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { className: "did-update-badge", children: t("update.installed") }) : null,
|
|
26843
|
+
row.deprecated ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { className: "did-update-badge", "data-warn": "", children: t("update.deprecated") }) : null,
|
|
26844
|
+
row.installable ? null : /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { className: "did-update-badge", "data-warn": "", children: t("update.unavailable") }),
|
|
26845
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { className: "did-update-date", children: formatPublishedAt(row.publishedAt) })
|
|
26846
|
+
]
|
|
26847
|
+
},
|
|
26848
|
+
row.version
|
|
26849
|
+
)) }),
|
|
26850
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "did-update-actions", children: [
|
|
26851
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { className: "did-update-hint", children: manualMode ? t("update.manualHint") : t("update.restartHint") }),
|
|
26852
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
|
|
26853
|
+
"button",
|
|
26854
|
+
{
|
|
26855
|
+
type: "button",
|
|
26856
|
+
className: "did-update-install",
|
|
26857
|
+
disabled: selectedRow === null || selectedRow.installable !== true || installing || manualMode,
|
|
26858
|
+
onClick: install,
|
|
26859
|
+
children: installing ? t("update.installing") : actionLabel
|
|
26860
|
+
}
|
|
26861
|
+
)
|
|
26862
|
+
] }),
|
|
26863
|
+
manualMode && typeof info?.installer?.command === "string" ? /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "did-update-manual", children: [
|
|
26864
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-update-manual-hint", children: t("update.manualCommandHint", { profile: info?.profile?.name ?? "desktop" }) }),
|
|
26865
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("code", { className: "did-update-command", children: info.installer.command.replace("@<version>", `@${selectedRow?.version ?? "<version>"}`) })
|
|
26866
|
+
] }) : null,
|
|
26867
|
+
result !== null ? result.ok ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-update-result", "data-ok": "", children: t("update.installOk", { version: result.installedVersion ?? selectedRow?.version ?? "" }) }) : /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "did-settings-error", children: [
|
|
26868
|
+
t("update.installFailed", { code: result.code ?? "unknown" }),
|
|
26869
|
+
typeof result.command === "string" ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-update-manual-hint", children: result.command }) : null
|
|
26870
|
+
] }) : null,
|
|
26871
|
+
typeof result?.logTail === "string" && result.logTail !== "" ? /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("details", { className: "did-update-log", children: [
|
|
26872
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("summary", { children: t("update.log") }),
|
|
26873
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("pre", { children: result.logTail })
|
|
26874
|
+
] }) : null
|
|
26875
|
+
] })
|
|
26876
|
+
] });
|
|
26877
|
+
}
|
|
24593
26878
|
function SettingsModal({ t }) {
|
|
24594
26879
|
const open = useModalOpen();
|
|
24595
|
-
const
|
|
24596
|
-
(0,
|
|
26880
|
+
const settings = useSettingsSnapshot();
|
|
26881
|
+
const [host, setHost] = (0, import_react6.useState)(null);
|
|
26882
|
+
(0, import_react6.useEffect)(() => {
|
|
24597
26883
|
setHost(document.body);
|
|
24598
26884
|
}, []);
|
|
24599
|
-
(0,
|
|
26885
|
+
(0, import_react6.useEffect)(() => {
|
|
24600
26886
|
if (!open) return;
|
|
24601
26887
|
const onKeyDown = (event) => {
|
|
24602
26888
|
if (event.key !== "Escape") return;
|
|
@@ -24608,21 +26894,33 @@ function SettingsModal({ t }) {
|
|
|
24608
26894
|
return () => window.removeEventListener("keydown", onKeyDown, true);
|
|
24609
26895
|
}, [open]);
|
|
24610
26896
|
if (!open) return null;
|
|
24611
|
-
const overlay = /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
|
|
24612
|
-
|
|
24613
|
-
|
|
24614
|
-
|
|
24615
|
-
|
|
24616
|
-
|
|
24617
|
-
|
|
24618
|
-
|
|
24619
|
-
|
|
24620
|
-
|
|
26897
|
+
const overlay = /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_react6.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-settings-overlay", "data-enter": "", ...backdropProxyProps(settings, "settingsPanel"), onPointerDown: closeSettingsModal, children: /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(
|
|
26898
|
+
"div",
|
|
26899
|
+
{
|
|
26900
|
+
className: "did-settings-dialog",
|
|
26901
|
+
"data-enter": "",
|
|
26902
|
+
role: "dialog",
|
|
26903
|
+
"aria-modal": "true",
|
|
26904
|
+
"aria-label": t("settings.title"),
|
|
26905
|
+
...surfaceProps(settings, "settingsPanel"),
|
|
26906
|
+
onPointerDown: (event) => event.stopPropagation(),
|
|
26907
|
+
children: [
|
|
26908
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "did-settings-banner", children: [
|
|
26909
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "did-settings-headtext", children: [
|
|
26910
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-settings-title", children: t("settings.title") }),
|
|
26911
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-settings-sub", children: t("settings.description") })
|
|
26912
|
+
] }),
|
|
26913
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)(SettingsCloseButton, { onClose: closeSettingsModal, t })
|
|
26914
|
+
] }),
|
|
26915
|
+
/* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "did-settings-scroll", children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(SettingsPanel, { t, onClose: closeSettingsModal }) })
|
|
26916
|
+
]
|
|
26917
|
+
}
|
|
26918
|
+
) }) });
|
|
24621
26919
|
return host === null ? overlay : (0, import_react_dom2.createPortal)(overlay, host);
|
|
24622
26920
|
}
|
|
24623
26921
|
|
|
24624
26922
|
// src/client/index.jsx
|
|
24625
|
-
installI18nRuntime({ createElement:
|
|
26923
|
+
installI18nRuntime({ createElement: import_react7.createElement, useSyncExternalStore: import_react7.useSyncExternalStore });
|
|
24626
26924
|
var PluginInlineDiffCard = withPluginI18n(InlineDiffCard);
|
|
24627
26925
|
var PluginEnhancedShellCard = withPluginI18n(EnhancedShellCard);
|
|
24628
26926
|
var PluginEnhancedExpandedTool = withPluginI18n(EnhancedExpandedTool);
|
|
@@ -24633,6 +26931,13 @@ var PluginSettingsLauncher = withPluginI18n(SettingsLauncher);
|
|
|
24633
26931
|
var inject = ["slots", "locale", "configForms"];
|
|
24634
26932
|
var INLINE_DIFF_KEYS = MUTATION_TOOLS;
|
|
24635
26933
|
var ENHANCED_SHELL_KEYS = SHELL_KEYS;
|
|
26934
|
+
var KNOWN_TOOL_KEYS = /* @__PURE__ */ new Set([
|
|
26935
|
+
...INLINE_DIFF_KEYS,
|
|
26936
|
+
...ENHANCED_SHELL_KEYS,
|
|
26937
|
+
...ENHANCED_DETAILS_KEYS,
|
|
26938
|
+
...ENHANCED_GENERIC_KEYS,
|
|
26939
|
+
...ENHANCED_SEARCH_WEB_KEYS
|
|
26940
|
+
]);
|
|
24636
26941
|
var VIEW_PRIORITY = -100;
|
|
24637
26942
|
function apply(ctx) {
|
|
24638
26943
|
ctx.effect(() => ctx.locale.register(NS, dicts), "dsh-inline-diff: dictionaries");
|
|
@@ -24651,6 +26956,7 @@ function apply(ctx) {
|
|
|
24651
26956
|
document.head.appendChild(style);
|
|
24652
26957
|
return () => style.remove();
|
|
24653
26958
|
}, "dsh-inline-diff: syntax stylesheet");
|
|
26959
|
+
ctx.effect(() => installGlassRefraction(), "dsh-inline-diff: glass refraction filters");
|
|
24654
26960
|
console.info(`[dsh-inline-diff] client ${VERSION} · enhanced presentation`);
|
|
24655
26961
|
ctx.effect(() => startReadRangeChips(pluginTranslate), "dsh-inline-diff: read range chips");
|
|
24656
26962
|
initSettings(ctx.configForms);
|
|
@@ -24665,47 +26971,69 @@ function apply(ctx) {
|
|
|
24665
26971
|
};
|
|
24666
26972
|
}, "dsh-inline-diff: appearance");
|
|
24667
26973
|
ctx.slots.inject("tool.call.toolview", () => {
|
|
24668
|
-
|
|
26974
|
+
const knownViews = /* @__PURE__ */ new Map();
|
|
24669
26975
|
let signature = "";
|
|
24670
|
-
const
|
|
24671
|
-
for (const dispose of
|
|
24672
|
-
|
|
26976
|
+
const clearKnown = () => {
|
|
26977
|
+
for (const dispose of knownViews.values()) dispose();
|
|
26978
|
+
knownViews.clear();
|
|
24673
26979
|
};
|
|
24674
|
-
const
|
|
26980
|
+
const register = (key, Component) => {
|
|
24675
26981
|
try {
|
|
24676
|
-
|
|
26982
|
+
return ctx.slots.register({
|
|
24677
26983
|
name: "tool.call.toolview",
|
|
24678
26984
|
key,
|
|
24679
26985
|
priority: VIEW_PRIORITY,
|
|
24680
26986
|
locale: NS
|
|
24681
|
-
}, Component)
|
|
26987
|
+
}, Component);
|
|
24682
26988
|
} catch (error) {
|
|
24683
26989
|
console.warn(`[dsh-inline-diff] cannot take over tool view "${key}"; the stock DSH row stays active`, error);
|
|
26990
|
+
return null;
|
|
24684
26991
|
}
|
|
24685
26992
|
};
|
|
26993
|
+
const registerKnown = (key, Component) => {
|
|
26994
|
+
const dispose = register(key, Component);
|
|
26995
|
+
if (dispose !== null) knownViews.set(key, dispose);
|
|
26996
|
+
};
|
|
26997
|
+
const dynamic = createDynamicToolViews({
|
|
26998
|
+
slots: ctx.slots,
|
|
26999
|
+
known: KNOWN_TOOL_KEYS,
|
|
27000
|
+
isEnabled: () => getSettings().toolCalls === "enhanced",
|
|
27001
|
+
fetchNames: fetchToolNames,
|
|
27002
|
+
register: (key) => register(key, PluginEnhancedExpandedTool)
|
|
27003
|
+
});
|
|
24686
27004
|
const sync = () => {
|
|
24687
27005
|
const settings = getSettings();
|
|
24688
27006
|
const next = `${settings.fileCards}|${settings.shellRows}|${settings.toolCalls}`;
|
|
24689
27007
|
if (next === signature) return;
|
|
24690
27008
|
signature = next;
|
|
24691
|
-
|
|
27009
|
+
clearKnown();
|
|
24692
27010
|
if (settings.fileCards === "enhanced") {
|
|
24693
|
-
for (const key of INLINE_DIFF_KEYS)
|
|
27011
|
+
for (const key of INLINE_DIFF_KEYS) registerKnown(key, PluginInlineDiffCard);
|
|
24694
27012
|
}
|
|
24695
27013
|
if (settings.shellRows === "enhanced") {
|
|
24696
|
-
for (const key of ENHANCED_SHELL_KEYS)
|
|
27014
|
+
for (const key of ENHANCED_SHELL_KEYS) registerKnown(key, PluginEnhancedShellCard);
|
|
24697
27015
|
}
|
|
24698
27016
|
if (settings.toolCalls === "enhanced") {
|
|
24699
27017
|
for (const key of [...ENHANCED_DETAILS_KEYS, ...ENHANCED_GENERIC_KEYS, ...ENHANCED_SEARCH_WEB_KEYS]) {
|
|
24700
|
-
|
|
27018
|
+
registerKnown(key, PluginEnhancedExpandedTool);
|
|
24701
27019
|
}
|
|
24702
27020
|
}
|
|
27021
|
+
dynamic.setEnabled(settings.toolCalls === "enhanced");
|
|
24703
27022
|
};
|
|
24704
27023
|
const unsubscribe = subscribeSettings(sync);
|
|
27024
|
+
const unsubscribeSlot = typeof ctx.slots.subscribe === "function" ? ctx.slots.subscribe("tool.call.toolview", () => dynamic.stepAside()) : () => {
|
|
27025
|
+
};
|
|
27026
|
+
const onFocus = typeof window !== "undefined" && typeof window.addEventListener === "function" ? () => {
|
|
27027
|
+
void dynamic.refresh();
|
|
27028
|
+
} : null;
|
|
27029
|
+
if (onFocus !== null) window.addEventListener("focus", onFocus);
|
|
24705
27030
|
sync();
|
|
24706
27031
|
return () => {
|
|
24707
27032
|
unsubscribe();
|
|
24708
|
-
|
|
27033
|
+
if (typeof unsubscribeSlot === "function") unsubscribeSlot();
|
|
27034
|
+
if (onFocus !== null) window.removeEventListener("focus", onFocus);
|
|
27035
|
+
dynamic.dispose();
|
|
27036
|
+
clearKnown();
|
|
24709
27037
|
};
|
|
24710
27038
|
});
|
|
24711
27039
|
ctx.slots.inject("shell.overlay", function* () {
|