@kabmo-labs/kabmo 0.30.1 → 0.32.0
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.md +79 -21
- package/dist/client/index.html +1 -1
- package/dist/client/index.js +518 -480
- package/dist/client/static/js/CsvGrid-amafmq3z.js +2 -0
- package/dist/client/static/js/DocxView-851ps9t0.js +58 -0
- package/dist/client/static/js/DrawioView-kw1vy3r2.js +5 -0
- package/dist/client/static/js/ImageView-ksx9bbct.js +1 -0
- package/dist/client/static/js/LayoutWrapper-9ftz050x.js +2 -0
- package/dist/client/static/js/Modal-f8x3j3be.js +38 -0
- package/dist/client/static/js/PdfView-f5jkm0rs.js +1 -0
- package/dist/client/static/js/SessionsView-wzdf1cp6.js +1 -0
- package/dist/client/static/js/SheetView-23zxy30b.js +140 -0
- package/dist/client/static/js/SvgPreview-c341y50e.js +1 -0
- package/dist/client/static/js/__vite-browser-external-2447137e-mq6vaetg.js +0 -0
- package/dist/client/static/js/abnfDiagram-O67JEVCF-2dc3mpk6.js +1 -0
- package/dist/client/static/js/andromeeda-17pn42cc.js +1 -0
- package/dist/client/static/js/architecture-7GRP2DOG-4wsd6vk0.js +1 -0
- package/dist/client/static/js/architectureDiagram-NJMV4G6O-7jmrr5ja.js +36 -0
- package/dist/client/static/js/astro-sjtf954j.js +1 -0
- package/dist/client/static/js/aurora-x-hxy97145.js +1 -0
- package/dist/client/static/js/ayu-dark-x0jd4baz.js +1 -0
- package/dist/client/static/js/ayu-light-12fg03q0.js +1 -0
- package/dist/client/static/js/ayu-mirage-52h7xjbv.js +1 -0
- package/dist/client/static/js/bash-h6pkqvth.js +1 -0
- package/dist/client/static/js/blockDiagram-BEXU5L5S-jrk2m0ea.js +140 -0
- package/dist/client/static/js/c-thbdzmwv.js +1 -0
- package/dist/client/static/js/c4Diagram-YGBWAQC7-48cyncjd.js +38 -0
- package/dist/client/static/js/catppuccin-frappe-fqgpn512.js +1 -0
- package/dist/client/static/js/catppuccin-latte-tr2x6gmz.js +1 -0
- package/dist/client/static/js/catppuccin-macchiato-rm7kh084.js +1 -0
- package/dist/client/static/js/catppuccin-mocha-hw0dzp99.js +1 -0
- package/dist/client/static/js/classDiagram-v2-NBCMYWYE-gm7jt1cd.js +217 -0
- package/dist/client/static/js/clike-h8p24dc6.js +1 -0
- package/dist/client/static/js/clojure-tf457n84.js +1 -0
- package/dist/client/static/js/clojure-w19rx1x5.js +1 -0
- package/dist/client/static/js/cmake-qpejsvqg.js +1 -0
- package/dist/client/static/js/cose-bilkent-JH36ORCC-g0g3z0xp.js +1 -0
- package/dist/client/static/js/cpp-r1za1kke.js +1 -0
- package/dist/client/static/js/csharp-dap1ppts.js +1 -0
- package/dist/client/static/js/css-qsv4vvke.js +1 -0
- package/dist/client/static/js/css-tf1s0nb7.js +1 -0
- package/dist/client/static/js/cynefin-OW5HDTMX-eycwde8c.js +1 -0
- package/dist/client/static/js/cynefinDiagram-VND7K2PF-6vjde6am.js +62 -0
- package/dist/client/static/js/dagre-6A5THRUB-q6k8bx1j.js +4 -0
- package/dist/client/static/js/dark-plus-weqfnwnf.js +1 -0
- package/dist/client/static/js/dart-dxn88tw0.js +1 -0
- package/dist/client/static/js/diagram-22UHCM2B-87cmze2n.js +200 -0
- package/dist/client/static/js/diagram-3UASUU5V-1ejbr2p4.js +24 -0
- package/dist/client/static/js/diagram-ATOU4E4O-vaw1r6k2.js +3 -0
- package/dist/client/static/js/diagram-CDSNMT55-gxm9zv7d.js +30 -0
- package/dist/client/static/js/diagram-MLGK6HIB-x010xswm.js +24 -0
- package/dist/client/static/js/diagram-MPIPVDR6-qtcq7e6c.js +41 -0
- package/dist/client/static/js/diff-r1sqd2db.js +1 -0
- package/dist/client/static/js/dockerfile-d43jt8fq.js +1 -0
- package/dist/client/static/js/dockerfile-k5xbramm.js +1 -0
- package/dist/client/static/js/dracula-k5pe1hsy.js +1 -0
- package/dist/client/static/js/dracula-soft-xqzm7g02.js +1 -0
- package/dist/client/static/js/ebnfDiagram-ZINNZB2B-nwwbasfh.js +1 -0
- package/dist/client/static/js/elixir-rpa1g4gy.js +1 -0
- package/dist/client/static/js/elk-276RUBZZ-xcp7thax.js +2 -0
- package/dist/client/static/js/erDiagram-OPXOYQCR-xj1tp716.js +99 -0
- package/dist/client/static/js/erlang-1ch2hjv9.js +1 -0
- package/dist/client/static/js/erlang-rz1g9mxy.js +1 -0
- package/dist/client/static/js/eventmodeling-NTZA5JFV-srqbnmey.js +1 -0
- package/dist/client/static/js/everforest-dark-v44f35e9.js +1 -0
- package/dist/client/static/js/everforest-light-c7m7g4z4.js +1 -0
- package/dist/client/static/js/flowDiagram-KWPJA3E3-yj98317w.js +1 -0
- package/dist/client/static/js/ganttDiagram-FUAMR5RP-f7q96bea.js +292 -0
- package/dist/client/static/js/ghostty-web-2gt2tp72.js +13 -0
- package/dist/client/static/js/gitGraph-4MIJSDKK-5jcrvn94.js +1 -0
- package/dist/client/static/js/gitGraphDiagram-X574FWY7-1rydkyq9.js +106 -0
- package/dist/client/static/js/github-dark-default-1000qs8y.js +1 -0
- package/dist/client/static/js/github-dark-dimmed-vfghfgh1.js +1 -0
- package/dist/client/static/js/github-dark-fvd3e45k.js +1 -0
- package/dist/client/static/js/github-dark-high-contrast-2j07czxg.js +1 -0
- package/dist/client/static/js/github-light-9r4ahj0m.js +1 -0
- package/dist/client/static/js/github-light-default-6d4nszch.js +1 -0
- package/dist/client/static/js/github-light-high-contrast-qwzscwzg.js +1 -0
- package/dist/client/static/js/go-nfrqbjpq.js +1 -0
- package/dist/client/static/js/go-rtqh5zp3.js +1 -0
- package/dist/client/static/js/graphql-275pg7ya.js +1 -0
- package/dist/client/static/js/groovy-63s5pygd.js +1 -0
- package/dist/client/static/js/groovy-s992001c.js +1 -0
- package/dist/client/static/js/gruvbox-dark-hard-ctttkbm1.js +1 -0
- package/dist/client/static/js/gruvbox-dark-medium-vh8mkpgj.js +1 -0
- package/dist/client/static/js/gruvbox-dark-soft-9f1ph8sj.js +1 -0
- package/dist/client/static/js/gruvbox-light-hard-n3ma2f5b.js +1 -0
- package/dist/client/static/js/gruvbox-light-medium-hkamn7bg.js +1 -0
- package/dist/client/static/js/gruvbox-light-soft-r39t4g97.js +1 -0
- package/dist/client/static/js/haskell-ev7ynt8z.js +1 -0
- package/dist/client/static/js/haskell-phxh4hcg.js +1 -0
- package/dist/client/static/js/hcl-wndsmevr.js +1 -0
- package/dist/client/static/js/horizon-bright-wz5mjtp4.js +1 -0
- package/dist/client/static/js/horizon-pr13gmaz.js +1 -0
- package/dist/client/static/js/houston-mrdq0gj4.js +1 -0
- package/dist/client/static/js/html-pv88ny12.js +1 -0
- package/dist/client/static/js/index-0a1ekhqf.js +2 -0
- package/dist/client/static/js/index-0g25yrc0.js +1 -0
- package/dist/client/static/js/index-0j518hqm.js +2 -0
- package/dist/client/static/js/index-0n9c85ke.js +2 -0
- package/dist/client/static/js/index-123e8tqq.js +2 -0
- package/dist/client/static/js/index-14wppnkx.js +2 -0
- package/dist/client/static/js/index-22jaxtz1.js +2 -0
- package/dist/client/static/js/index-2n5wy1sh.js +1 -0
- package/dist/client/static/js/index-2t2tnc3x.js +1 -0
- package/dist/client/static/js/index-31jrebvn.js +214 -0
- package/dist/client/static/js/index-3anc30zh.js +2 -0
- package/dist/client/static/js/index-52bgxh6f.js +1 -0
- package/dist/client/static/js/index-5zd1jx9r.js +2 -0
- package/dist/client/static/js/index-6sdctwv2.js +2 -0
- package/dist/client/static/js/index-73xfkyea.js +2 -0
- package/dist/client/static/js/index-8a3tmm1h.js +332 -0
- package/dist/client/static/js/index-8m3q2zpb.js +1 -0
- package/dist/client/static/js/index-9nbxb421.js +2 -0
- package/dist/client/static/js/index-a293pdg7.js +2 -0
- package/dist/client/static/js/index-b08zd4eq.js +1 -0
- package/dist/client/static/js/index-c20a46ww.js +2 -0
- package/dist/client/static/js/index-c8jzx6b0.js +2 -0
- package/dist/client/static/js/index-cwaz6geq.js +2 -0
- package/dist/client/static/js/index-deex10rz.js +9 -0
- package/dist/client/static/js/index-e26rd868.js +2 -0
- package/dist/client/static/js/index-e6rar25v.js +2 -0
- package/dist/client/static/js/index-e7a3fkvv.js +1 -0
- package/dist/client/static/js/index-e94a1en0.css +1 -0
- package/dist/client/static/js/index-f519m6s3.js +1 -0
- package/dist/client/static/js/index-f63y3mjj.js +7 -0
- package/dist/client/static/js/index-fc2j6bq2.js +2 -0
- package/dist/client/static/js/index-fmxn1rzs.js +3 -0
- package/dist/client/static/js/index-g0pkzanm.js +2 -0
- package/dist/client/static/js/index-ga2xdef3.js +2 -0
- package/dist/client/static/js/index-ggaqh9rt.js +2 -0
- package/dist/client/static/js/index-gvwqjpcr.js +2 -0
- package/dist/client/static/js/index-h6jxmkxk.js +129 -0
- package/dist/client/static/js/index-hhm62nfj.js +2 -0
- package/dist/client/static/js/index-hkq0y3pn.js +2 -0
- package/dist/client/static/js/index-hyry1n8x.js +2 -0
- package/dist/client/static/js/index-m6wwc5h6.js +2 -0
- package/dist/client/static/js/index-nsrnyqcm.js +2 -0
- package/dist/client/static/js/index-pe9j88d4.js +2 -0
- package/dist/client/static/js/index-pkyrkkbt.js +2 -0
- package/dist/client/static/js/index-qmh0h87h.js +314 -0
- package/dist/client/static/js/index-r416e9dt.js +12 -0
- package/dist/client/static/js/index-s9vp6p70.js +2 -0
- package/dist/client/static/js/index-tr8754r0.js +179 -0
- package/dist/client/static/js/index-vmvcse63.js +1 -0
- package/dist/client/static/js/index-vnvrzwht.js +240 -0
- package/dist/client/static/js/index-vrbcj11n.js +2 -0
- package/dist/client/static/js/index-w4re5r8w.js +2 -0
- package/dist/client/static/js/index-w5131mtt.js +2 -0
- package/dist/client/static/js/index-w7xbfv44.js +2 -0
- package/dist/client/static/js/index-x64kqgen.js +2 -0
- package/dist/client/static/js/index-xa7nrnda.js +2 -0
- package/dist/client/static/js/index-xpf2ra60.js +1 -0
- package/dist/client/static/js/index-xzfsaqyz.js +4 -0
- package/dist/client/static/js/index-y139vc12.js +474 -0
- package/dist/client/static/js/index-ynqnbvn2.js +3 -0
- package/dist/client/static/js/index-yvcpdk5f.js +89 -0
- package/dist/client/static/js/index-zca66d5d.js +3 -0
- package/dist/client/static/js/info-A6RAGUB7-mbt0ryx5.js +1 -0
- package/dist/client/static/js/infoDiagram-VRGFBTTK-ptg07tp2.js +2 -0
- package/dist/client/static/js/ini-jqdrx98c.js +1 -0
- package/dist/client/static/js/ishikawaDiagram-OU5B5YK6-bdk2dkf5.js +70 -0
- package/dist/client/static/js/java-70zqqrkr.js +1 -0
- package/dist/client/static/js/javascript-18thb3jp.js +1 -0
- package/dist/client/static/js/javascript-4kw2j9t3.js +1 -0
- package/dist/client/static/js/journeyDiagram-ZHPQQLJL-kez0ha4c.js +139 -0
- package/dist/client/static/js/json-kxk8gfet.js +1 -0
- package/dist/client/static/js/json5-hmb38a78.js +1 -0
- package/dist/client/static/js/jsx-h1035eqk.js +1 -0
- package/dist/client/static/js/julia-ft9kd90a.js +1 -0
- package/dist/client/static/js/julia-nmr85k8z.js +1 -0
- package/dist/client/static/js/kanagawa-dragon-nya1w1ke.js +1 -0
- package/dist/client/static/js/kanagawa-lotus-hwn4nbn5.js +1 -0
- package/dist/client/static/js/kanagawa-wave-7rsxqd8r.js +1 -0
- package/dist/client/static/js/kanban-definition-PNTS6WVX-dhzp3qg5.js +89 -0
- package/dist/client/static/js/katex-eh1m1m1d.js +257 -0
- package/dist/client/static/js/kotlin-bw3n4j1v.js +1 -0
- package/dist/client/static/js/laserwave-37chepry.js +1 -0
- package/dist/client/static/js/less-w8v48sx0.js +1 -0
- package/dist/client/static/js/light-plus-mcbbmtzj.js +1 -0
- package/dist/client/static/js/lua-6at2ddf6.js +1 -0
- package/dist/client/static/js/lua-j2356waf.js +1 -0
- package/dist/client/static/js/main-rx9grv92.js +7 -0
- package/dist/client/static/js/makefile-22weg265.js +1 -0
- package/dist/client/static/js/markdown-ffw6rgk6.js +1 -0
- package/dist/client/static/js/material-theme-darker-pcm1tb69.js +1 -0
- package/dist/client/static/js/material-theme-lighter-cbdrfj3g.js +1 -0
- package/dist/client/static/js/material-theme-ocean-3rs19bm6.js +1 -0
- package/dist/client/static/js/material-theme-palenight-rxhkgd4c.js +1 -0
- package/dist/client/static/js/material-theme-x46yf0tm.js +1 -0
- package/dist/client/static/js/mermaid.core-h7wttbss.js +12 -0
- package/dist/client/static/js/min-dark-f279fhzv.js +1 -0
- package/dist/client/static/js/min-light-s53yjy4e.js +1 -0
- package/dist/client/static/js/mindmap-definition-NLK3R4M7-tq5dd1em.js +96 -0
- package/dist/client/static/js/mllike-cnahv8ak.js +1 -0
- package/dist/client/static/js/monokai-yr7h8283.js +1 -0
- package/dist/client/static/js/night-owl-8d01zsx4.js +1 -0
- package/dist/client/static/js/night-owl-light-7jbd0p3j.js +1 -0
- package/dist/client/static/js/nix-7e31jz1m.js +1 -0
- package/dist/client/static/js/nord-h1bak1eb.js +1 -0
- package/dist/client/static/js/objective-c-8r3dxert.js +1 -0
- package/dist/client/static/js/ocaml-bpjgcgwa.js +1 -0
- package/dist/client/static/js/one-dark-pro-8acf6cn2.js +1 -0
- package/dist/client/static/js/one-light-ysc1knem.js +1 -0
- package/dist/client/static/js/packet-AYTQ26CC-a5yw789s.js +1 -0
- package/dist/client/static/js/pegDiagram-GJSIUBJH-e5hrdfzv.js +1 -0
- package/dist/client/static/js/perl-3t5fm1te.js +1 -0
- package/dist/client/static/js/perl-prxcva8r.js +1 -0
- package/dist/client/static/js/php-m9kcctzs.js +1 -0
- package/dist/client/static/js/pie-WAS4IAKB-x0y4v4r2.js +1 -0
- package/dist/client/static/js/pieDiagram-5QR66LMP-axvbvnz8.js +39 -0
- package/dist/client/static/js/plastic-8kfqgcmr.js +1 -0
- package/dist/client/static/js/poimandres-rjcckfek.js +1 -0
- package/dist/client/static/js/powershell-m5qb6mjj.js +1 -0
- package/dist/client/static/js/powershell-rrzhqtmb.js +1 -0
- package/dist/client/static/js/properties-55mrarxr.js +1 -0
- package/dist/client/static/js/properties-qq2pcfyk.js +1 -0
- package/dist/client/static/js/protobuf-578974t5.js +1 -0
- package/dist/client/static/js/protobuf-ggczeare.js +1 -0
- package/dist/client/static/js/python-dhypc3j4.js +1 -0
- package/dist/client/static/js/python-wbdfs2gc.js +1 -0
- package/dist/client/static/js/quadrantDiagram-O4NWA36T-wtn28cfm.js +7 -0
- package/dist/client/static/js/r-6b8dt1wp.js +1 -0
- package/dist/client/static/js/r-z4m38eb1.js +1 -0
- package/dist/client/static/js/racket-dhm8rebp.js +1 -0
- package/dist/client/static/js/radar-RG4KPBEZ-trrc3ta1.js +1 -0
- package/dist/client/static/js/railroad-74A4TZTK-dxgvx21w.js +1 -0
- package/dist/client/static/js/railroad-abnf-HS5TGJTU-rbgkd8sk.js +1 -0
- package/dist/client/static/js/railroad-ebnf-LZEXJU2U-exgw7j47.js +1 -0
- package/dist/client/static/js/railroad-peg-WCYAUIDC-28tpamzk.js +1 -0
- package/dist/client/static/js/railroadDiagram-XR7U4H2S-avjkq945.js +1 -0
- package/dist/client/static/js/red-zgbwyj31.js +1 -0
- package/dist/client/static/js/requirementDiagram-PLB6GJNP-bntx7r6q.js +84 -0
- package/dist/client/static/js/rose-pine-azwmazxg.js +1 -0
- package/dist/client/static/js/rose-pine-dawn-3t3j9bnk.js +1 -0
- package/dist/client/static/js/rose-pine-moon-35ecvxkf.js +1 -0
- package/dist/client/static/js/ruby-nq98w40a.js +1 -0
- package/dist/client/static/js/ruby-t06c0e7g.js +1 -0
- package/dist/client/static/js/rust-6gqjxyf0.js +1 -0
- package/dist/client/static/js/rust-psncxtga.js +1 -0
- package/dist/client/static/js/sankeyDiagram-IPEJSGJF-ps8nkdm2.js +40 -0
- package/dist/client/static/js/sass-gsbyn3wh.js +1 -0
- package/dist/client/static/js/sass-k1jjq4y7.js +1 -0
- package/dist/client/static/js/scala-atdk263v.js +1 -0
- package/dist/client/static/js/scheme-181kqjff.js +1 -0
- package/dist/client/static/js/scheme-jvs3e9c8.js +1 -0
- package/dist/client/static/js/scss-zphrqp25.js +1 -0
- package/dist/client/static/js/sequenceDiagram-PO4LG4MO-3ckf1q6z.js +169 -0
- package/dist/client/static/js/shell-5rhwzbr3.js +1 -0
- package/dist/client/static/js/sizeCapture-INFHLROL-akvcr1x7.js +1 -0
- package/dist/client/static/js/slack-dark-j9p83tbc.js +1 -0
- package/dist/client/static/js/slack-ochin-fe90gs3m.js +1 -0
- package/dist/client/static/js/snazzy-light-pj44bwcm.js +1 -0
- package/dist/client/static/js/solarized-dark-54jyr51c.js +1 -0
- package/dist/client/static/js/solarized-light-ca8r58m6.js +1 -0
- package/dist/client/static/js/solidity-bx92jb30.js +1 -0
- package/dist/client/static/js/sql-9dq913c8.js +1 -0
- package/dist/client/static/js/sql-wsvbkyd1.js +1 -0
- package/dist/client/static/js/stateDiagram-v2-GCMORJYK-c82914fz.js +291 -0
- package/dist/client/static/js/stylus-fht9fjbw.js +1 -0
- package/dist/client/static/js/stylus-xh0f7m9m.js +1 -0
- package/dist/client/static/js/svelte-j54gfrvq.js +1 -0
- package/dist/client/static/js/swift-0rtnm3tm.js +1 -0
- package/dist/client/static/js/swift-rr9wc5y7.js +1 -0
- package/dist/client/static/js/swimlanes-2SLR337P-scgdefh4.js +1 -0
- package/dist/client/static/js/swimlanesDiagram-TC7HE7FX-0x2ashav.js +8 -0
- package/dist/client/static/js/synthwave-84-yq047vcq.js +1 -0
- package/dist/client/static/js/timeline-definition-EJHVYXUP-z2ha1rhq.js +120 -0
- package/dist/client/static/js/tokyo-night-jfy87bj1.js +1 -0
- package/dist/client/static/js/toml-b5g7qp6k.js +1 -0
- package/dist/client/static/js/toml-prjdc335.js +1 -0
- package/dist/client/static/js/treeView-Q6P3EWNA-1a00b6kc.js +1 -0
- package/dist/client/static/js/treemap-WGGIJYW6-2q4f2f7m.js +1 -0
- package/dist/client/static/js/tsx-wh5xgm7f.js +1 -0
- package/dist/client/static/js/typescript-ge85req5.js +1 -0
- package/dist/client/static/js/usecaseDiagram-POWQR4AR-3wdmrfmk.js +370 -0
- package/dist/client/static/js/vennDiagram-UO4OBE2U-7m5tatzv.js +34 -0
- package/dist/client/static/js/vesper-0e7jx631.js +1 -0
- package/dist/client/static/js/vitesse-black-avx6j9e8.js +1 -0
- package/dist/client/static/js/vitesse-dark-5ypr9e1f.js +1 -0
- package/dist/client/static/js/vitesse-light-sze15mny.js +1 -0
- package/dist/client/static/js/vue-y8bb5f3h.js +1 -0
- package/dist/client/static/js/wardley-WFR3VGLG-x9v91the.js +1 -0
- package/dist/client/static/js/wardleyDiagram-VNRHLVJA-55ps9s4z.js +78 -0
- package/dist/client/static/js/xml-7bgz40qa.js +1 -0
- package/dist/client/static/js/xml-f6syr877.js +1 -0
- package/dist/client/static/js/xychartDiagram-PMCCYNJV-8bsjtm4t.js +7 -0
- package/dist/client/static/js/yaml-4ht9416k.js +1 -0
- package/dist/client/static/js/yaml-qwwswzvs.js +1 -0
- package/dist/client/static/js/zig-yf26r6vn.js +1 -0
- package/marketplace/plugins/stats/package.json +2 -2
- package/marketplace/plugins/stats/src/format.test.ts +7 -1
- package/package.json +5 -2
- package/src/client/App.tsx +16 -0
- package/src/client/components/common/anchored-menu/index.test.tsx +3 -3
- package/src/client/components/common/anchored-menu/index.tsx +10 -16
- package/src/client/components/common/command-palette/ChordHint.tsx +36 -0
- package/src/client/components/common/command-palette/index.test.tsx +126 -0
- package/src/client/components/common/command-palette/index.tsx +216 -0
- package/src/client/components/common/context-usage-button/McpSection.tsx +133 -0
- package/src/client/components/common/context-usage-button/Ring.tsx +12 -6
- package/src/client/components/common/context-usage-button/index.test.tsx +24 -13
- package/src/client/components/common/context-usage-button/index.tsx +47 -40
- package/src/client/components/common/key-binding-cheatsheet/index.tsx +147 -0
- package/src/client/components/common/server-control/Panel.tsx +8 -9
- package/src/client/components/common/session-actions-menu/index.test.tsx +26 -0
- package/src/client/components/common/session-actions-menu/index.tsx +19 -15
- package/src/client/components/common/session-row/RunElapsed.tsx +50 -0
- package/src/client/components/common/session-row/TimeCell.tsx +38 -0
- package/src/client/components/common/session-row/TrailingSlot.tsx +31 -13
- package/src/client/components/common/session-row/index.tsx +5 -0
- package/src/client/components/common/session-row/session-row.test.tsx +39 -1
- package/src/client/components/layout/desktop-layout/LeftColumn.tsx +2 -0
- package/src/client/components/layout/desktop-layout/index.tsx +7 -3
- package/src/client/components/layout/session-sidebar/CategoryItem.tsx +2 -1
- package/src/client/components/layout/session-sidebar/Footer.tsx +13 -2
- package/src/client/components/layout/session-sidebar/SessionItem.test.ts +17 -0
- package/src/client/components/layout/session-sidebar/SessionItem.tsx +13 -7
- package/src/client/components/layout/session-sidebar/modern/WorkspaceSection.tsx +2 -1
- package/src/client/components/mobile/RightSidebar.tsx +2 -1
- package/src/client/components/mobile/SessionSidebar.tsx +2 -0
- package/src/client/components/mobile/mobile-main-view/Header.test.tsx +122 -0
- package/src/client/components/mobile/mobile-main-view/Header.tsx +25 -26
- package/src/client/components/mobile/mobile-session-sidebar/Footer.tsx +11 -1
- package/src/client/components/mobile/mobile-session-sidebar/Item.tsx +2 -1
- package/src/client/components/mobile/mobile-session-sidebar/SessionRow.tsx +10 -5
- package/src/client/components/settings/Modal.tsx +3 -0
- package/src/client/components/settings/Sidebar.tsx +3 -2
- package/src/client/components/settings/categories/ChatSettings.test.tsx +2 -2
- package/src/client/components/settings/categories/ChatSettings.tsx +0 -2
- package/src/client/components/settings/categories/KeyboardSettings.tsx +31 -0
- package/src/client/components/settings/categories/McpSettings.tsx +10 -3
- package/src/client/components/settings/categories/NotificationSettings.tsx +9 -0
- package/src/client/components/settings/categories/SkillCatalogSettings.tsx +34 -16
- package/src/client/components/settings/categories/SkillSettings.tsx +22 -1
- package/src/client/components/settings/categories/chat-settings/groups.ts +2 -11
- package/src/client/components/settings/categories/{chat-settings/KeybindingsSection.tsx → keyboard-settings/ComposerKeys.tsx} +2 -2
- package/src/client/components/settings/categories/keyboard-settings/KeyRecorder.tsx +106 -0
- package/src/client/components/settings/categories/keyboard-settings/ShortcutTable.tsx +137 -0
- package/src/client/components/settings/categories/mcp-settings/AdvancedSection.tsx +244 -0
- package/src/client/components/settings/categories/mcp-settings/ConnectionTest.tsx +3 -3
- package/src/client/components/settings/categories/mcp-settings/DetailPane.tsx +55 -97
- package/src/client/components/settings/categories/mcp-settings/ImportModal.tsx +12 -64
- package/src/client/components/settings/categories/mcp-settings/{EnvVarsSection.tsx → KeyValueSection.tsx} +42 -24
- package/src/client/components/settings/categories/mcp-settings/SidebarList.tsx +1 -1
- package/src/client/components/settings/categories/mcp-settings/TransportSection.tsx +101 -0
- package/src/client/components/settings/categories/skill-catalog/GitImportPanel.tsx +13 -41
- package/src/client/components/settings/categories/skill-catalog/SkillCard.tsx +1 -1
- package/src/client/components/settings/categories/skill-catalog/catalog-ui.test.tsx +3 -6
- package/src/client/components/settings/categories/skill-settings/DetailHeader.tsx +43 -2
- package/src/client/components/settings/categories/skill-settings/DetailPane.tsx +9 -0
- package/src/client/components/settings/categories/skill-settings/pane.test.tsx +28 -0
- package/src/client/components/settings/categories/skill-settings/row-meta.ts +3 -0
- package/src/client/components/workspace/browser-panel/EngineNotice.test.tsx +109 -0
- package/src/client/components/workspace/browser-panel/EngineNotice.tsx +112 -0
- package/src/client/components/workspace/browser-panel/index.tsx +45 -12
- package/src/client/components/workspace/chat-timeline/chat-input/AccessDropdown.test.ts +63 -0
- package/src/client/components/workspace/chat-timeline/chat-input/AccessDropdown.tsx +18 -6
- package/src/client/components/workspace/chat-timeline/chat-input/AttachmentToolbar.tsx +38 -5
- package/src/client/components/workspace/chat-timeline/chat-input/AttachmentToolbar.wait.test.tsx +158 -0
- package/src/client/components/workspace/chat-timeline/chat-input/ComposerRows.tsx +1 -1
- package/src/client/components/workspace/chat-timeline/chat-input/Toolbar.test.ts +28 -33
- package/src/client/components/workspace/chat-timeline/chat-input/Toolbar.tsx +27 -68
- package/src/client/components/workspace/chat-timeline/chat-input/WaitingDependencyPicker.search.test.tsx +4 -2
- package/src/client/components/workspace/chat-timeline/chat-input/WaitingDependencyPicker.tsx +101 -78
- package/src/client/components/workspace/chat-timeline/chat-input/access-levels.ts +39 -1
- package/src/client/components/workspace/chat-timeline/chat-input/props.ts +3 -3
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Eval.test.tsx +33 -7
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Eval.tsx +5 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/shared/ToolScreenshots.test.tsx +113 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/shared/ToolScreenshots.tsx +198 -0
- package/src/client/components/workspace/editor/Body.tsx +0 -15
- package/src/client/components/workspace/editor/FileDocument.tsx +0 -26
- package/src/client/components/workspace/editor/FilePane.tsx +0 -15
- package/src/client/components/workspace/editor/Pane.tsx +4 -1
- package/src/client/components/workspace/editor/index.tsx +5 -8
- package/src/client/components/workspace/editor/plugin-rail.test.tsx +6 -1
- package/src/client/components/workspace/terminal-panel/scroll-hold.test.ts +20 -5
- package/src/client/data/settings/mcp.ts +4 -2
- package/src/client/data/settings/omp-schema.json +22 -2
- package/src/client/hooks/browser/use-browser-engine.ts +99 -0
- package/src/client/hooks/chat/context/mcp.ts +159 -0
- package/src/client/hooks/chat/omp/session-list.test.ts +13 -0
- package/src/client/hooks/chat/omp/session-list.tsx +33 -8
- package/src/client/hooks/chat/timeline/access-mode.ts +45 -15
- package/src/client/hooks/chat/timeline/index.ts +7 -3
- package/src/client/hooks/chat/timeline/timeline-mode-state.test.ts +33 -4
- package/src/client/hooks/chat/waiting/composer-wait.ts +2 -2
- package/src/client/hooks/commands/use-command-catalog.ts +52 -0
- package/src/client/hooks/commands/use-command-context.ts +21 -0
- package/src/client/hooks/commands/use-command-runtime.test.ts +117 -0
- package/src/client/hooks/commands/use-command-runtime.ts +62 -0
- package/src/client/hooks/commands/use-overlays.ts +35 -0
- package/src/client/hooks/commands/use-palette-items.ts +156 -0
- package/src/client/hooks/commands/use-plugin-commands.ts +69 -0
- package/src/client/hooks/editor/find-harness.test-util.ts +20 -3
- package/src/client/hooks/editor/use-editor-command-target.ts +46 -0
- package/src/client/hooks/editor/use-editor-find.test.ts +4 -9
- package/src/client/hooks/editor/use-editor-panel-keys.ts +24 -93
- package/src/client/hooks/editor/use-editor-panel-ui.ts +0 -10
- package/src/client/hooks/settings/skill-catalog.ts +3 -3
- package/src/client/hooks/settings/skill-git-import.ts +3 -11
- package/src/client/hooks/ui/icon-style.ts +10 -5
- package/src/client/hooks/ui/notification-events.test.ts +126 -0
- package/src/client/hooks/ui/notification-events.ts +61 -0
- package/src/client/hooks/ui/second-tick.ts +55 -0
- package/src/client/hooks/ui/theme.ts +9 -5
- package/src/client/hooks/ui/ui-listeners.test.ts +13 -18
- package/src/client/hooks/workspace/commands.ts +51 -0
- package/src/client/lib/commands/context.ts +51 -0
- package/src/client/lib/commands/dispatcher.ts +101 -0
- package/src/client/lib/commands/editor-target.ts +36 -0
- package/src/client/lib/commands/keymap.test.ts +68 -0
- package/src/client/lib/commands/keymap.ts +151 -0
- package/src/client/lib/commands/overlays.ts +87 -0
- package/src/client/lib/commands/registry.ts +69 -0
- package/src/client/lib/notifications/os.test.ts +24 -0
- package/src/client/lib/notifications/os.ts +16 -0
- package/src/client/lib/notifications/watch.ts +48 -0
- package/src/client/lib/plugins/slots.ts +1 -0
- package/src/client/main.tsx +7 -0
- package/src/client/tailwind.css +5 -38
- package/src/server/db.server.test.ts +10 -4
- package/src/server/index.ts +12 -8
- package/src/server/lib/assets/theme-css.server.test.ts +58 -0
- package/src/server/lib/assets/theme-css.server.ts +52 -0
- package/src/server/lib/auth/guard.ts +6 -1
- package/src/server/lib/browser/engine.test.ts +118 -0
- package/src/server/lib/browser/engine.ts +102 -0
- package/src/server/lib/browser/runtime.test.ts +21 -16
- package/src/server/lib/db/client.test.ts +89 -0
- package/src/server/lib/db/client.ts +31 -0
- package/src/server/lib/db/compact-chat-overlay.ts +7 -1
- package/src/server/lib/db/schema.ts +8 -0
- package/src/server/lib/db/workspace-sync.ts +7 -7
- package/src/server/lib/fs/toolchain-path.test.ts +87 -0
- package/src/server/lib/fs/toolchain-path.ts +49 -0
- package/src/server/lib/harness/acp/protocol.ts +9 -1
- package/src/server/lib/harness/acp/session-permissions.ts +4 -0
- package/src/server/lib/harness/auto-probe.server.ts +3 -2
- package/src/server/lib/harness/launch-table.ts +3 -2
- package/src/server/lib/harness/spawn.server.ts +5 -1
- package/src/server/lib/harness/update-queue.server.ts +2 -1
- package/src/server/lib/harness/update-state.server.ts +6 -2
- package/src/server/lib/lifecycle/fd-pressure.test.ts +43 -0
- package/src/server/lib/lifecycle/fd-pressure.ts +38 -0
- package/src/server/lib/lifecycle/listener.ts +4 -4
- package/src/server/lib/lifecycle/shell-entry.server.ts +29 -0
- package/src/server/lib/lifecycle/shell-route.ts +5 -4
- package/src/server/lib/mcp/probe.server.ts +71 -0
- package/src/server/lib/mcp/registry.server.ts +195 -46
- package/src/server/lib/mcp/registry.test.ts +76 -4
- package/src/server/lib/mcp/schema.server.ts +35 -0
- package/src/server/lib/mcp/session-mcp.test.ts +164 -0
- package/src/server/lib/mcp/session-overlay.server.ts +152 -0
- package/src/server/lib/mcp/session-state.server.ts +75 -0
- package/src/server/lib/mcp/store.server.ts +6 -1
- package/src/server/lib/notifications/feed.server.test.ts +127 -0
- package/src/server/lib/notifications/feed.server.ts +195 -0
- package/src/server/lib/notifications/schema.server.ts +47 -0
- package/src/server/lib/notifications/store.server.test.ts +118 -0
- package/src/server/lib/notifications/store.server.ts +103 -0
- package/src/server/lib/observer-ws.test.ts +49 -0
- package/src/server/lib/observer-ws.ts +2 -1
- package/src/server/lib/omp/config/config-cli.ts +4 -0
- package/src/server/lib/omp/config/definitions.test.ts +17 -18
- package/src/server/lib/omp/config/mcp-and-cli.test.ts +12 -183
- package/src/server/lib/omp/config/mcp-config.test.ts +277 -0
- package/src/server/lib/omp/config/mcp-shared.ts +36 -0
- package/src/server/lib/omp/config/mcp-test-protocol.ts +89 -0
- package/src/server/lib/omp/config/mcp-test-remote.ts +167 -0
- package/src/server/lib/omp/config/mcp-test.ts +21 -123
- package/src/server/lib/omp/config/mcp-write.ts +179 -0
- package/src/server/lib/omp/config/mcp.ts +138 -118
- package/src/server/lib/omp/config/skills-catalog.ts +109 -73
- package/src/server/lib/omp/config/skills-git-repo.ts +10 -12
- package/src/server/lib/omp/core/cli.ts +4 -14
- package/src/server/lib/omp/rpc/frame-fold-frames.test.ts +2 -0
- package/src/server/lib/omp/rpc/manager.ts +16 -18
- package/src/server/lib/omp/rpc/reload-mcp.ts +39 -0
- package/src/server/lib/omp/rpc/run-model.test.ts +2 -0
- package/src/server/lib/omp/rpc/session-registry.ts +6 -2
- package/src/server/lib/omp/rpc/spawn-mcp.ts +43 -0
- package/src/server/lib/omp/session/delete.server.ts +7 -0
- package/src/server/lib/omp/session/sidebar-data.server.ts +1 -0
- package/src/server/lib/plugins/mcp.server.ts +2 -2
- package/src/server/lib/realtime/hub.server.test.ts +27 -1
- package/src/server/lib/realtime/hub.server.ts +6 -2
- package/src/server/lib/realtime/hub.types.ts +9 -1
- package/src/server/lib/realtime/topics/catalog.server.ts +5 -0
- package/src/server/lib/realtime/topics/peer-relay.server.test.ts +27 -14
- package/src/server/lib/realtime/topics/workspace.server.test.ts +44 -0
- package/src/server/lib/realtime/topics/workspace.server.ts +3 -2
- package/src/server/lib/realtime/topics.server.test.ts +2 -1
- package/src/server/plugins/shell.server.test.ts +4 -4
- package/src/server/plugins/shell.server.ts +83 -22
- package/src/server/plugins/ssr.ts +13 -11
- package/src/server/plugins/static.ts +5 -7
- package/src/server/routes/browser/engine.test.ts +70 -0
- package/src/server/routes/browser/engine.ts +51 -0
- package/src/server/routes/browser/index.ts +5 -0
- package/src/server/routes/fs/git.ts +4 -3
- package/src/server/routes/harness/versions.test.ts +5 -0
- package/src/server/routes/health/probe.ts +7 -8
- package/src/server/routes/index.ts +2 -0
- package/src/server/routes/notifications/index.ts +6 -0
- package/src/server/routes/notifications/stream.test.ts +116 -0
- package/src/server/routes/notifications/stream.ts +88 -0
- package/src/server/routes/sessions/index.ts +7 -0
- package/src/server/routes/sessions/mcp.test.ts +154 -0
- package/src/server/routes/sessions/mcp.ts +202 -0
- package/src/server/routes/settings/mcp-test.ts +5 -4
- package/src/server/routes/settings/mcp.test.ts +42 -1
- package/src/server/routes/settings/mcp.ts +80 -24
- package/src/server/routes/settings/skills-catalog-actions.ts +11 -31
- package/src/server/routes/settings/skills.test.ts +14 -0
- package/src/server/routes/settings/skills.ts +29 -21
- package/src/shared/lib/code/highlight-cache.test.ts +19 -8
- package/src/shared/lib/code/highlight-memo.test.ts +18 -0
- package/src/shared/lib/code/highlight-memo.ts +46 -17
- package/src/shared/lib/commands/catalog.ts +114 -0
- package/src/shared/lib/commands/chord.test.ts +66 -0
- package/src/shared/lib/commands/chord.ts +193 -0
- package/src/shared/lib/commands/conflicts.test.ts +43 -0
- package/src/shared/lib/commands/conflicts.ts +53 -0
- package/src/shared/lib/commands/record.test.ts +24 -0
- package/src/shared/lib/commands/record.ts +44 -0
- package/src/shared/lib/commands/resolve.test.ts +54 -0
- package/src/shared/lib/commands/resolve.ts +45 -0
- package/src/shared/lib/commands/score.test.ts +41 -0
- package/src/shared/lib/commands/score.ts +53 -0
- package/src/shared/lib/commands/types.ts +60 -0
- package/src/shared/lib/commands/user-keybindings.test.ts +33 -0
- package/src/shared/lib/commands/user-keybindings.ts +64 -0
- package/src/shared/lib/commands/when.test.ts +46 -0
- package/src/shared/lib/commands/when.ts +221 -0
- package/src/shared/lib/icons/icon-paint-authority.test.ts +9 -0
- package/src/shared/lib/icons/icon-paint-authority.ts +25 -8
- package/src/shared/lib/mcp/import.ts +112 -0
- package/src/shared/lib/mcp/item.ts +61 -0
- package/src/shared/lib/mcp/key-value.ts +37 -0
- package/src/shared/lib/mcp/mcp-lib.test.ts +119 -0
- package/src/shared/lib/mcp/status.test.ts +36 -0
- package/src/shared/lib/mcp/status.ts +38 -0
- package/src/shared/lib/models/client.ts +27 -6
- package/src/shared/lib/models/provider/models.test.ts +31 -0
- package/src/shared/lib/notifications/events.test.ts +77 -0
- package/src/shared/lib/notifications/events.ts +104 -0
- package/src/shared/lib/omp/config/access-mode.test.ts +73 -0
- package/src/shared/lib/omp/config/access-mode.ts +49 -0
- package/src/shared/lib/omp/session/prewarm-misc.test.ts +3 -2
- package/src/shared/lib/omp/session/schema-migrations.ts +4 -0
- package/src/shared/lib/omp/session/stream-state.server.test.ts +37 -1
- package/src/shared/lib/omp/session/stream-state.server.ts +42 -5
- package/src/shared/lib/omp/skill-source.test.ts +24 -0
- package/src/shared/lib/omp/skill-source.ts +20 -0
- package/src/shared/lib/panels/slot-labels.ts +6 -1
- package/src/shared/lib/realtime/protocol.ts +11 -0
- package/src/shared/lib/theme/css.ts +11 -0
- package/src/shared/lib/ui/menu-anchor.test.ts +17 -5
- package/src/shared/lib/ui/menu-anchor.ts +22 -5
- package/src/shared/lib/workspace/refresh-cadence.test.ts +34 -1
- package/src/shared/lib/workspace/relative-time.ts +22 -0
- package/src/shared/lib/workspace/right-panels.ts +13 -0
- package/src/shared/lib/workspace/workspace-modules.test.ts +3 -1
- package/src/shared/types/browser.ts +21 -0
- package/src/shared/types/realtime.ts +10 -0
- package/src/shared/types/settings/mcp.ts +73 -4
- package/src/shared/types/settings/skill.ts +1 -9
- package/src/shared/types/settings/state.ts +1 -0
- package/src/shared/types/workspace.ts +5 -0
- package/src/test-support/peer-harness.ts +32 -6
- package/src/test-support/pristine-globals.test.ts +53 -0
- package/src/test-support/pristine-globals.ts +6 -1
- package/dist/client/static/js/index-bwhhehnh.js +0 -5697
- package/dist/client/static/js/index-naa91727.css +0 -1
- package/src/client/components/workspace/editor/CommandPalette.test.ts +0 -242
- package/src/client/components/workspace/editor/CommandPalette.tsx +0 -138
- package/src/client/components/workspace/editor/QuickOpenModal.tsx +0 -146
- package/src/client/hooks/ui/input-required-alert.ts +0 -50
- package/src/client/hooks/ui/notifications.ts +0 -54
- package/src/client/hooks/ui/run-outcome-alert.ts +0 -48
- package/src/client/hooks/ui/ui-alert.test.ts +0 -235
- package/src/client/hooks/workspace/keybindings.ts +0 -44
- package/src/shared/lib/notifications/outcomes.test.ts +0 -96
- package/src/shared/lib/notifications/outcomes.ts +0 -64
- package/src/shared/lib/ui/mobile-overlay.ts +0 -61
|
@@ -7,7 +7,22 @@ import { isMockMode } from '@/server/mock.server';
|
|
|
7
7
|
import { mcpStore, readCustomMcpServers, writeCustomMcpServers } from '@/server/lib/mcp/store.server';
|
|
8
8
|
import { resolveRoot } from '@/server/lib/fs/root';
|
|
9
9
|
import type { McpServerItem } from '@/shared/types';
|
|
10
|
-
import {
|
|
10
|
+
import { isRecord } from '@/shared/lib/util/guards';
|
|
11
|
+
import { rowsToRecord, REDACTED_SENTINEL } from '@/shared/lib/mcp/key-value';
|
|
12
|
+
import {
|
|
13
|
+
isProjectMcpConfigEnabled,
|
|
14
|
+
isServerEnabled,
|
|
15
|
+
nativeToServerItem,
|
|
16
|
+
readProjectMcpConfig,
|
|
17
|
+
readUserMcpConfig,
|
|
18
|
+
redactServerItem,
|
|
19
|
+
} from '@/server/lib/omp/config/mcp';
|
|
20
|
+
import {
|
|
21
|
+
deleteProjectMcpServer,
|
|
22
|
+
deleteUserMcpServer,
|
|
23
|
+
writeProjectMcpServer,
|
|
24
|
+
writeUserMcpServer,
|
|
25
|
+
} from '@/server/lib/omp/config/mcp-write';
|
|
11
26
|
|
|
12
27
|
const NATIVE_USER_PREFIX = 'omp-user-';
|
|
13
28
|
const NATIVE_PROJECT_PREFIX = 'omp-project-';
|
|
@@ -38,17 +53,28 @@ function customForProject(custom: McpServerItem[], projectPath?: string): McpSer
|
|
|
38
53
|
async function mergeServers(custom: McpServerItem[], projectPath?: string): Promise<McpServerItem[]> {
|
|
39
54
|
const user = await readUserMcpConfig();
|
|
40
55
|
const userItems: McpServerItem[] = user.servers.map((entry, index) =>
|
|
41
|
-
nativeToServerItem(
|
|
56
|
+
nativeToServerItem(
|
|
57
|
+
entry.name,
|
|
58
|
+
entry.config,
|
|
59
|
+
index,
|
|
60
|
+
isServerEnabled(entry.name, entry.config, user.disabledServers, user.enabledServers),
|
|
61
|
+
),
|
|
42
62
|
);
|
|
43
|
-
const project = projectPath
|
|
63
|
+
const project = projectPath && (await isProjectMcpConfigEnabled())
|
|
64
|
+
? await readProjectMcpConfig(projectPath)
|
|
65
|
+
: undefined;
|
|
44
66
|
const projectItems: McpServerItem[] = projectPath && project
|
|
45
67
|
? project.servers.map((entry, index) =>
|
|
46
|
-
nativeToServerItem(
|
|
47
|
-
|
|
48
|
-
|
|
68
|
+
nativeToServerItem(
|
|
69
|
+
entry.name,
|
|
70
|
+
entry.config,
|
|
71
|
+
index,
|
|
72
|
+
isServerEnabled(entry.name, entry.config, user.disabledServers, user.enabledServers),
|
|
73
|
+
{ path: projectPath },
|
|
74
|
+
),
|
|
49
75
|
)
|
|
50
76
|
: [];
|
|
51
|
-
const natives = [...userItems, ...projectItems].map(
|
|
77
|
+
const natives = [...userItems, ...projectItems].map(redactServerItem);
|
|
52
78
|
const nativeNames = new Set(natives.map((item) => item.name.toLowerCase()));
|
|
53
79
|
return [
|
|
54
80
|
...natives,
|
|
@@ -56,29 +82,58 @@ async function mergeServers(custom: McpServerItem[], projectPath?: string): Prom
|
|
|
56
82
|
];
|
|
57
83
|
}
|
|
58
84
|
|
|
85
|
+
/** The browser payload for one server; every field is untrusted. */
|
|
59
86
|
interface McpNativePayloadSource {
|
|
60
|
-
|
|
87
|
+
transport?: unknown;
|
|
61
88
|
linkUrl?: unknown;
|
|
62
89
|
commandArgs?: unknown;
|
|
63
90
|
envVars?: unknown;
|
|
91
|
+
headers?: unknown;
|
|
92
|
+
cwd?: unknown;
|
|
93
|
+
timeout?: unknown;
|
|
94
|
+
requestIdFormat?: unknown;
|
|
95
|
+
instructions?: unknown;
|
|
96
|
+
auth?: unknown;
|
|
97
|
+
oauth?: unknown;
|
|
98
|
+
enabled?: unknown;
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
/** A credential block without the form's blanks and redaction placeholders. */
|
|
102
|
+
function credentialBlock(value: unknown): Record<string, unknown> | undefined {
|
|
103
|
+
if (!isRecord(value)) return undefined;
|
|
104
|
+
const entries = Object.entries(value).filter(
|
|
105
|
+
([, entry]) => entry !== undefined && entry !== null && entry !== '' && entry !== REDACTED_SENTINEL,
|
|
106
|
+
);
|
|
107
|
+
return entries.length > 0 ? Object.fromEntries(entries) : undefined;
|
|
64
108
|
}
|
|
65
109
|
|
|
66
110
|
/** Convert a browser McpServerItem payload into native omp mcp.json shape. */
|
|
67
111
|
function toNativeServer(ui: McpNativePayloadSource): Record<string, unknown> {
|
|
68
112
|
const commandArgs = Array.isArray(ui.commandArgs) ? ui.commandArgs.map(String) : [];
|
|
69
|
-
const
|
|
70
|
-
const nativeServer: Record<string, unknown> =
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
const env
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
113
|
+
const transport = ui.transport === 'sse' ? 'sse' : ui.transport === 'http' || typeof ui.linkUrl === 'string' ? 'http' : 'stdio';
|
|
114
|
+
const nativeServer: Record<string, unknown> = {};
|
|
115
|
+
if (transport === 'stdio') {
|
|
116
|
+
nativeServer.command = commandArgs[0] ?? '';
|
|
117
|
+
if (commandArgs.length > 1) nativeServer.args = commandArgs.slice(1);
|
|
118
|
+
const env = rowsToRecord(Array.isArray(ui.envVars) ? (ui.envVars as McpServerItem['envVars']) : []);
|
|
119
|
+
if (env) nativeServer.env = env;
|
|
120
|
+
if (typeof ui.cwd === 'string' && ui.cwd.trim()) nativeServer.cwd = ui.cwd.trim();
|
|
121
|
+
} else {
|
|
122
|
+
// `type` is required by omp's schema for both remote transports; omitting it
|
|
123
|
+
// makes an SSE endpoint silently load as streamable HTTP.
|
|
124
|
+
nativeServer.type = transport;
|
|
125
|
+
nativeServer.url = String(ui.linkUrl ?? commandArgs[0] ?? '');
|
|
126
|
+
const headers = rowsToRecord(Array.isArray(ui.headers) ? (ui.headers as McpServerItem['headers']) : []);
|
|
127
|
+
if (headers) nativeServer.headers = headers;
|
|
81
128
|
}
|
|
129
|
+
if (typeof ui.timeout === 'number' && Number.isFinite(ui.timeout) && ui.timeout >= 0) nativeServer.timeout = ui.timeout;
|
|
130
|
+
if (ui.requestIdFormat === 'string' || ui.requestIdFormat === 'number') nativeServer.requestIdFormat = ui.requestIdFormat;
|
|
131
|
+
if (typeof ui.instructions === 'boolean') nativeServer.instructions = ui.instructions;
|
|
132
|
+
const auth = credentialBlock(ui.auth);
|
|
133
|
+
if (auth) nativeServer.auth = auth;
|
|
134
|
+
const oauth = credentialBlock(ui.oauth);
|
|
135
|
+
if (oauth) nativeServer.oauth = oauth;
|
|
136
|
+
if (ui.enabled === false) nativeServer.enabled = false;
|
|
82
137
|
return nativeServer;
|
|
83
138
|
}
|
|
84
139
|
|
|
@@ -121,9 +176,10 @@ export async function loader({ request }: LoaderFunctionArgs) {
|
|
|
121
176
|
nativePath: includeNative ? (await readUserMcpConfig()).path : undefined,
|
|
122
177
|
projectPath: projectPath ?? undefined,
|
|
123
178
|
});
|
|
124
|
-
} catch (error
|
|
179
|
+
} catch (error) {
|
|
125
180
|
const mock = isMockMode();
|
|
126
|
-
|
|
181
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
182
|
+
return json({ error: message, servers: mock ? DEFAULT_MCP_SERVERS : [], isMock: mock }, { status: 500 });
|
|
127
183
|
}
|
|
128
184
|
}
|
|
129
185
|
|
|
@@ -246,7 +302,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
|
|
|
246
302
|
}
|
|
247
303
|
|
|
248
304
|
return methodNotAllowed({ request, params });
|
|
249
|
-
} catch (error
|
|
250
|
-
return json({ error: error.message }, { status: 500 });
|
|
305
|
+
} catch (error) {
|
|
306
|
+
return json({ error: error instanceof Error ? error.message : String(error) }, { status: 500 });
|
|
251
307
|
}
|
|
252
308
|
}
|
|
@@ -19,10 +19,11 @@
|
|
|
19
19
|
* - **A project install with no workspace is refused**, never redirected to the
|
|
20
20
|
* user root: the user picked a scope, and landing the files elsewhere is how a
|
|
21
21
|
* skill "vanishes" from the list being viewed.
|
|
22
|
-
* - **A
|
|
23
|
-
*
|
|
24
|
-
*
|
|
25
|
-
*
|
|
22
|
+
* - **A repository install copies the picked directories into a root omp
|
|
23
|
+
* reads** (`~/.omp/agent/skills` or `<workspace>/.omp/skills`), one refusal
|
|
24
|
+
* per skill. The registry path is `omp skill install` and lives in
|
|
25
|
+
* `skills-catalog.ts`; an arbitrary repository is not a registry package, so
|
|
26
|
+
* it cannot be installed through that command.
|
|
26
27
|
*/
|
|
27
28
|
|
|
28
29
|
import { json } from '@/server/lib/remix-compat';
|
|
@@ -30,7 +31,7 @@ import { isMockMode } from '@/server/mock.server';
|
|
|
30
31
|
import type { DiscoveryScope } from '@/server/lib/omp/config/scope';
|
|
31
32
|
import type { SkillCatalogSource } from '@/shared/types';
|
|
32
33
|
import { DEFAULT_CATALOG_SKILLS } from '@/client/data/settings/skill';
|
|
33
|
-
import { searchSkillCatalog, toCatalogSkills
|
|
34
|
+
import { searchSkillCatalog, toCatalogSkills } from '@/server/lib/omp/config/skills-catalog';
|
|
34
35
|
import { inspectSkillRepo, toSkillRepoRef } from '@/server/lib/omp/config/skills-git-repo';
|
|
35
36
|
import { installSkillCopies } from '@/server/lib/omp/config/skills-git-install';
|
|
36
37
|
import { readCatalogSources, writeCatalogSources } from '@/server/lib/omp/config/skill-sources';
|
|
@@ -55,10 +56,6 @@ export interface CatalogDeps {
|
|
|
55
56
|
listSkills: (scope: DiscoveryScope) => Promise<{ name: string }[]>;
|
|
56
57
|
}
|
|
57
58
|
|
|
58
|
-
function message(error: unknown): string {
|
|
59
|
-
return error instanceof Error ? error.message : String(error);
|
|
60
|
-
}
|
|
61
|
-
|
|
62
59
|
/**
|
|
63
60
|
* Handle one catalog action. Returns `null` when `type` is not a catalog action,
|
|
64
61
|
* so the caller can fall through to the skill CRUD branches.
|
|
@@ -98,9 +95,9 @@ export async function runCatalogAction(body: Record<string, unknown>, deps: Cata
|
|
|
98
95
|
return json({ success: true, catalogSources: updated });
|
|
99
96
|
}
|
|
100
97
|
|
|
101
|
-
// Real search over
|
|
102
|
-
// loader had pre-fetched, so a query the catalog actually held
|
|
103
|
-
// skills found".
|
|
98
|
+
// Real search over the Skillshare registry. The Browse box used to filter the
|
|
99
|
+
// ~26 entries the loader had pre-fetched, so a query the catalog actually held
|
|
100
|
+
// answered "no skills found".
|
|
104
101
|
if (type === 'search_catalog') {
|
|
105
102
|
const query = typeof body.q === 'string' ? body.q.trim() : '';
|
|
106
103
|
if (!query) return json({ query, catalogSkills: [] });
|
|
@@ -114,7 +111,7 @@ export async function runCatalogAction(body: Record<string, unknown>, deps: Cata
|
|
|
114
111
|
});
|
|
115
112
|
}
|
|
116
113
|
const seen = new Set<string>();
|
|
117
|
-
const catalogSkills = toCatalogSkills(await searchSkillCatalog(query, 24), '
|
|
114
|
+
const catalogSkills = toCatalogSkills(await searchSkillCatalog(query, 24), 'skillshare').filter((item) =>
|
|
118
115
|
seen.has(item.repoTag) ? false : (seen.add(item.repoTag), true),
|
|
119
116
|
);
|
|
120
117
|
return json({ query, catalogSkills });
|
|
@@ -158,23 +155,6 @@ export async function runCatalogAction(body: Record<string, unknown>, deps: Cata
|
|
|
158
155
|
const paths = Array.isArray(body.paths) ? body.paths.filter((path): path is string => typeof path === 'string') : [];
|
|
159
156
|
if (paths.length === 0) return json({ error: 'Select at least one skill to install' }, { status: 400 });
|
|
160
157
|
|
|
161
|
-
if (body.mode === 'registry') {
|
|
162
|
-
const installed: string[] = [];
|
|
163
|
-
const skipped: Array<{ name: string; reason: string }> = [];
|
|
164
|
-
for (const path of paths) {
|
|
165
|
-
const name = path.split('/').pop() ?? '';
|
|
166
|
-
try {
|
|
167
|
-
// The CLI takes `owner/repo`; any accepted URL form maps to it.
|
|
168
|
-
await installCatalogSkill(toSkillRepoRef(url)?.slug ?? url.trim(), name);
|
|
169
|
-
installed.push(name);
|
|
170
|
-
} catch (error) {
|
|
171
|
-
skipped.push({ name, reason: message(error) });
|
|
172
|
-
}
|
|
173
|
-
}
|
|
174
|
-
await reloadLiveSessions();
|
|
175
|
-
return json({ repo: url, mode: 'registry', installed, skipped, skills: await deps.listSkills(scope) });
|
|
176
|
-
}
|
|
177
|
-
|
|
178
158
|
// USER by default: the catalog pane names no workspace, and a managed copy
|
|
179
159
|
// there is the skill the user owns globally. A `project` request needs a
|
|
180
160
|
// root the caller actually named.
|
|
@@ -188,7 +168,7 @@ export async function runCatalogAction(body: Record<string, unknown>, deps: Cata
|
|
|
188
168
|
overwrite: body.overwrite === true,
|
|
189
169
|
});
|
|
190
170
|
if (outcome.installed.length > 0) await reloadLiveSessions();
|
|
191
|
-
return json({ repo: url,
|
|
171
|
+
return json({ repo: url, ...outcome, skills: await deps.listSkills(scope) });
|
|
192
172
|
}
|
|
193
173
|
|
|
194
174
|
return null;
|
|
@@ -223,3 +223,17 @@ describe('git inspection and install', () => {
|
|
|
223
223
|
expect(body.catalogSkills).toEqual([]);
|
|
224
224
|
});
|
|
225
225
|
});
|
|
226
|
+
|
|
227
|
+
describe('registry install and uninstall', () => {
|
|
228
|
+
test('a catalog toggle without a package spec is a 400, not a silent no-op', async () => {
|
|
229
|
+
const res = await call(skillsAction, send({ type: 'install_toggle', skill: { name: 'pdf' }, install: true }));
|
|
230
|
+
expect(res.status).toBe(400);
|
|
231
|
+
expect((await res.json()).error).toContain('package spec');
|
|
232
|
+
});
|
|
233
|
+
|
|
234
|
+
test('a registry uninstall without a package is a 400', async () => {
|
|
235
|
+
const res = await call(skillsAction, send({ type: 'uninstall_registry_skill' }));
|
|
236
|
+
expect(res.status).toBe(400);
|
|
237
|
+
expect((await res.json()).error).toContain('package');
|
|
238
|
+
});
|
|
239
|
+
});
|
|
@@ -16,7 +16,6 @@ import {
|
|
|
16
16
|
} from '@/server/lib/omp/config/skills';
|
|
17
17
|
import {
|
|
18
18
|
installCatalogSkill,
|
|
19
|
-
searchSkillCatalog,
|
|
20
19
|
toCatalogSkills,
|
|
21
20
|
uninstallCatalogSkill,
|
|
22
21
|
} from '@/server/lib/omp/config/skills-catalog';
|
|
@@ -38,6 +37,10 @@ const SOURCE_LABELS: Record<string, string> = {
|
|
|
38
37
|
'github:project': 'Project / .github/skills',
|
|
39
38
|
'opencode:user': 'User / opencode',
|
|
40
39
|
'opencode:project': 'Project / .opencode',
|
|
40
|
+
'claude-plugins:user': 'User / Claude plugin',
|
|
41
|
+
'claude-plugins:project': 'Project / Claude plugin',
|
|
42
|
+
// `skillshare:@scope/name@version` — the registry store omp installs into.
|
|
43
|
+
skillshare: 'Skillshare registry',
|
|
41
44
|
};
|
|
42
45
|
|
|
43
46
|
/**
|
|
@@ -47,7 +50,8 @@ const SOURCE_LABELS: Record<string, string> = {
|
|
|
47
50
|
* rewrite another tool's file.
|
|
48
51
|
*/
|
|
49
52
|
async function toSkillItem(skill: DiscoveredSkill): Promise<SkillItem> {
|
|
50
|
-
const locationLabel = SOURCE_LABELS[skill.source]
|
|
53
|
+
const locationLabel = SOURCE_LABELS[skill.source]
|
|
54
|
+
?? (skill.source.startsWith('skillshare:') ? SOURCE_LABELS.skillshare : skill.source);
|
|
51
55
|
let instructions = skill.filePath;
|
|
52
56
|
if (skill.managed) {
|
|
53
57
|
const file = await readSkillFile(skill.filePath);
|
|
@@ -108,17 +112,12 @@ export async function loader({ request }: LoaderFunctionArgs) {
|
|
|
108
112
|
const scope = await resolveDiscoveryScope(url.searchParams.get('root'), url.searchParams.get('scope'));
|
|
109
113
|
const catalogSources = await readCatalogSources(db);
|
|
110
114
|
|
|
111
|
-
const
|
|
112
|
-
listSkills(scope),
|
|
113
|
-
searchSkillCatalog('popular', 18),
|
|
114
|
-
searchSkillCatalog('code review', 8),
|
|
115
|
-
]);
|
|
115
|
+
const skills = await listSkills(scope);
|
|
116
116
|
|
|
117
|
-
//
|
|
118
|
-
// a
|
|
119
|
-
|
|
120
|
-
const catalogSkills = toCatalogSkills([
|
|
121
|
-
.filter((item) => (seen.has(item.repoTag) ? false : (seen.add(item.repoTag), true)));
|
|
117
|
+
// The Browse tab starts EMPTY. omp's CLI exposes no "popular" listing, and
|
|
118
|
+
// a pre-fetched query the user never typed is a list they cannot explain —
|
|
119
|
+
// the registry is searched when they search it.
|
|
120
|
+
const catalogSkills = toCatalogSkills([], 'skillshare');
|
|
122
121
|
|
|
123
122
|
return json({ skills, catalogSources, catalogSkills, root: scope.workspace, isMock: false });
|
|
124
123
|
} catch (error) {
|
|
@@ -192,19 +191,28 @@ export async function action({ request, params }: ActionFunctionArgs) {
|
|
|
192
191
|
});
|
|
193
192
|
if (catalogResponse) return catalogResponse;
|
|
194
193
|
|
|
195
|
-
// Catalog install/uninstall goes through
|
|
196
|
-
//
|
|
194
|
+
// Catalog install/uninstall goes through `omp skill`, which is what actually
|
|
195
|
+
// puts the package where omp reads it. The spec is the row's `repoTag`
|
|
196
|
+
// (`@scope/name`), not its display name: two packages can ship a skill with
|
|
197
|
+
// the same name, and the registry addresses packages.
|
|
197
198
|
if (body.type === 'install_toggle') {
|
|
198
199
|
const { skill, install } = body;
|
|
200
|
+
const pkg = typeof skill?.repoTag === 'string' ? skill.repoTag : '';
|
|
201
|
+
if (!pkg) return json({ error: 'A catalog skill needs its package spec' }, { status: 400 });
|
|
199
202
|
if (mock) return json({ success: true, skills: DEFAULT_SKILLS });
|
|
203
|
+
if (install) await installCatalogSkill(pkg);
|
|
204
|
+
else await uninstallCatalogSkill(pkg);
|
|
205
|
+
await reloadLiveSessions();
|
|
206
|
+
return json({ success: true, skills: await listSkills(scope) });
|
|
207
|
+
}
|
|
200
208
|
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
209
|
+
// A Skillshare skill is read-only in the pane (omp owns its store), but it
|
|
210
|
+
// is still the user's install: uninstalling it is `omp skill uninstall -g`.
|
|
211
|
+
if (body.type === 'uninstall_registry_skill') {
|
|
212
|
+
const pkg = typeof body.package === 'string' ? body.package : '';
|
|
213
|
+
if (!pkg) return json({ error: 'package is required' }, { status: 400 });
|
|
214
|
+
if (mock) return json({ success: true, skills: DEFAULT_SKILLS });
|
|
215
|
+
await uninstallCatalogSkill(pkg);
|
|
208
216
|
await reloadLiveSessions();
|
|
209
217
|
return json({ success: true, skills: await listSkills(scope) });
|
|
210
218
|
}
|
|
@@ -31,16 +31,11 @@ const SHIKI_TOKEN_RE = /--shiki-light:/;
|
|
|
31
31
|
/** A language with no loader at all: `isLanguageReady` can never become true for it. */
|
|
32
32
|
const UNLOADABLE_LANG = 'not-a-language-at-all';
|
|
33
33
|
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
// runtime has none. Stub it, boot, then remove the stub.
|
|
37
|
-
Object.assign(globalThis, { window: globalThis });
|
|
38
|
-
await bootSyntax();
|
|
39
|
-
Reflect.deleteProperty(globalThis, 'window');
|
|
40
|
-
|
|
34
|
+
/** Resolve once `language` can be tokenized synchronously. */
|
|
35
|
+
async function awaitLanguage(language: string): Promise<void> {
|
|
41
36
|
await new Promise<void>((resolve) => {
|
|
42
37
|
const settle = () => {
|
|
43
|
-
if (requestLanguage(
|
|
38
|
+
if (requestLanguage(language)) {
|
|
44
39
|
off();
|
|
45
40
|
resolve();
|
|
46
41
|
}
|
|
@@ -48,6 +43,22 @@ beforeAll(async () => {
|
|
|
48
43
|
const off = onLanguageReady(settle);
|
|
49
44
|
settle();
|
|
50
45
|
});
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
beforeAll(async () => {
|
|
49
|
+
// The isomorphic highlighter only boots with `window` present; the Bun test
|
|
50
|
+
// runtime has none. Stub it, boot, then remove the stub.
|
|
51
|
+
Object.assign(globalThis, { window: globalThis });
|
|
52
|
+
await bootSyntax();
|
|
53
|
+
Reflect.deleteProperty(globalThis, 'window');
|
|
54
|
+
|
|
55
|
+
// `javascript` as well as `typescript`: the eager grammars arrive one by one
|
|
56
|
+
// after boot, and `highlightCode` falls back to javascript for a language it
|
|
57
|
+
// cannot load. A fallback that had not landed yet made `codeToHtml` throw and
|
|
58
|
+
// the catch turn the line into PLAIN TEXT — measured on the Linux gate
|
|
59
|
+
// (`43568904108`): `Received: "const alpha = 1;"` against `/<span class="shiki">/`.
|
|
60
|
+
await awaitLanguage('typescript');
|
|
61
|
+
await awaitLanguage('javascript');
|
|
51
62
|
});
|
|
52
63
|
|
|
53
64
|
describe('highlightSearchLine', () => {
|
|
@@ -100,4 +100,22 @@ describe('highlightBlockLines', () => {
|
|
|
100
100
|
const again = highlightBlockLines('const a = 1;\nconst b = 2;', 'typescript');
|
|
101
101
|
expect(again).toEqual(lines);
|
|
102
102
|
});
|
|
103
|
+
|
|
104
|
+
test('a block cached first does not shorten the line path', () => {
|
|
105
|
+
// The two shapes share a key but not a shape: `highlightCode` answers ONE
|
|
106
|
+
// inline string, `highlightLines` one fragment per line. Splitting the
|
|
107
|
+
// block's string gave the line path a single row for a 7-line block, so
|
|
108
|
+
// `NumberedCode` drew seven numbers beside one line — measured on the
|
|
109
|
+
// Ubuntu gate as `Expected length: 7, Received length: 1` in the eval
|
|
110
|
+
// card, whose JSON is drawn by both paths.
|
|
111
|
+
const code = '{\n "a": 1,\n "b": [\n 2,\n 3\n ]\n}';
|
|
112
|
+
const block = highlightBlock(code, 'json');
|
|
113
|
+
expect(block).not.toContain('\n');
|
|
114
|
+
|
|
115
|
+
const lines = highlightBlockLines(code, 'json');
|
|
116
|
+
expect(lines).toHaveLength(7);
|
|
117
|
+
// And the block path still answers its own shape from the same entry.
|
|
118
|
+
expect(highlightBlock(code, 'json')).toBe(block);
|
|
119
|
+
expect(highlightMemoSize()).toBe(1);
|
|
120
|
+
});
|
|
103
121
|
});
|
|
@@ -35,58 +35,83 @@
|
|
|
35
35
|
import { isLanguageReady } from '@/shared/lib/code/highlighter-lazy';
|
|
36
36
|
import { highlightCode, highlightLines, type HighlightLinesOptions } from '@/shared/lib/code/syntax-highlight';
|
|
37
37
|
|
|
38
|
+
/**
|
|
39
|
+
* One `(language, code)` entry, holding whichever SHAPES have been asked for.
|
|
40
|
+
*
|
|
41
|
+
* The two callers want different markup for the same code: `highlightCode`
|
|
42
|
+
* answers ONE inline string (`structure: 'inline'`, no newlines), while
|
|
43
|
+
* `highlightLines` answers one fragment per source line. Storing them in one
|
|
44
|
+
* slot made the second reader split the first reader's string — a 7-line JSON
|
|
45
|
+
* block that had already been drawn as a block came back from the line path as
|
|
46
|
+
* a SINGLE row, so `NumberedCode` drew seven numbers beside one line of code.
|
|
47
|
+
* Measured on the Ubuntu gate as `Expected length: 7, Received length: 1` in
|
|
48
|
+
* `Eval.test.tsx`, and it is a real card: the same JSON is drawn by
|
|
49
|
+
* `JsonCodeBlock` (block) and by the eval result (lines).
|
|
50
|
+
*/
|
|
51
|
+
interface MemoEntry {
|
|
52
|
+
/** `highlightCode`'s markup: one string, inline structure. */
|
|
53
|
+
block?: string;
|
|
54
|
+
/** `highlightLines`' markup: one fragment per source line. */
|
|
55
|
+
lines?: string[];
|
|
56
|
+
}
|
|
57
|
+
|
|
38
58
|
/** Per language: a transcript page's worth of distinct blocks. */
|
|
39
59
|
const MAX_BLOCKS_PER_LANGUAGE = 24;
|
|
40
60
|
/** Across every language, so a long session cannot grow without bound. */
|
|
41
61
|
const MAX_CACHED_CHARS = 512 * 1024;
|
|
42
62
|
|
|
43
|
-
const blocks = new Map<string, Map<string,
|
|
63
|
+
const blocks = new Map<string, Map<string, MemoEntry>>();
|
|
44
64
|
let cachedChars = 0;
|
|
45
65
|
|
|
46
|
-
function bucket(language: string): Map<string,
|
|
66
|
+
function bucket(language: string): Map<string, MemoEntry> {
|
|
47
67
|
const existing = blocks.get(language);
|
|
48
68
|
if (existing) return existing;
|
|
49
|
-
const created = new Map<string,
|
|
69
|
+
const created = new Map<string, MemoEntry>();
|
|
50
70
|
blocks.set(language, created);
|
|
51
71
|
return created;
|
|
52
72
|
}
|
|
53
73
|
|
|
74
|
+
/** What one entry costs against the character budget. */
|
|
75
|
+
function entrySize(entry: MemoEntry | undefined): number {
|
|
76
|
+
if (!entry) return 0;
|
|
77
|
+
return (entry.block?.length ?? 0) + (entry.lines ? entry.lines.join('\n').length : 0);
|
|
78
|
+
}
|
|
79
|
+
|
|
54
80
|
/** Drop the oldest entry of the first language that has one. */
|
|
55
81
|
function evictOne(): boolean {
|
|
56
82
|
for (const entries of blocks.values()) {
|
|
57
83
|
const oldest = entries.keys().next();
|
|
58
84
|
if (oldest.done) continue;
|
|
59
|
-
|
|
85
|
+
cachedChars -= entrySize(entries.get(oldest.value));
|
|
60
86
|
entries.delete(oldest.value);
|
|
61
|
-
cachedChars -= value.length;
|
|
62
87
|
return true;
|
|
63
88
|
}
|
|
64
89
|
return false;
|
|
65
90
|
}
|
|
66
91
|
|
|
67
|
-
function remember(language: string, code: string,
|
|
92
|
+
function remember(language: string, code: string, patch: MemoEntry): void {
|
|
68
93
|
const entries = bucket(language);
|
|
69
94
|
const previous = entries.get(code);
|
|
70
95
|
if (previous !== undefined) {
|
|
71
96
|
entries.delete(code);
|
|
72
|
-
cachedChars -= previous
|
|
97
|
+
cachedChars -= entrySize(previous);
|
|
73
98
|
}
|
|
74
|
-
|
|
75
|
-
|
|
99
|
+
const merged: MemoEntry = { ...previous, ...patch };
|
|
100
|
+
entries.set(code, merged);
|
|
101
|
+
cachedChars += entrySize(merged);
|
|
76
102
|
while (entries.size > MAX_BLOCKS_PER_LANGUAGE) {
|
|
77
103
|
const oldest = entries.keys().next();
|
|
78
104
|
if (oldest.done) break;
|
|
79
|
-
|
|
105
|
+
cachedChars -= entrySize(entries.get(oldest.value));
|
|
80
106
|
entries.delete(oldest.value);
|
|
81
|
-
cachedChars -= value.length;
|
|
82
107
|
}
|
|
83
108
|
while (cachedChars > MAX_CACHED_CHARS && evictOne()) {
|
|
84
109
|
// Keep dropping until the budget holds or nothing is left to drop.
|
|
85
110
|
}
|
|
86
111
|
}
|
|
87
112
|
|
|
88
|
-
/** The cached
|
|
89
|
-
|
|
113
|
+
/** The cached entry for `(language, code)`, moved to the most-recently-used end. */
|
|
114
|
+
function touch(code: string, language: string): MemoEntry | undefined {
|
|
90
115
|
const entries = blocks.get(language);
|
|
91
116
|
if (!entries) return undefined;
|
|
92
117
|
const hit = entries.get(code);
|
|
@@ -97,10 +122,14 @@ export function cachedHighlightBlock(code: string, language: string): string | u
|
|
|
97
122
|
return hit;
|
|
98
123
|
}
|
|
99
124
|
|
|
125
|
+
/** The cached block markup for `(language, code)`, or `undefined`. */
|
|
126
|
+
export function cachedHighlightBlock(code: string, language: string): string | undefined {
|
|
127
|
+
return touch(code, language)?.block;
|
|
128
|
+
}
|
|
129
|
+
|
|
100
130
|
/** The cached per-line markup, or `undefined`. */
|
|
101
131
|
export function cachedHighlightBlockLines(code: string, language: string): string[] | undefined {
|
|
102
|
-
|
|
103
|
-
return hit === undefined ? undefined : hit.split('\n');
|
|
132
|
+
return touch(code, language)?.lines;
|
|
104
133
|
}
|
|
105
134
|
|
|
106
135
|
function cacheable(language: string, options: HighlightLinesOptions): boolean {
|
|
@@ -116,7 +145,7 @@ export function highlightBlock(code: string, language: string, options: Highligh
|
|
|
116
145
|
const cached = options.marks?.length ? undefined : cachedHighlightBlock(code, language);
|
|
117
146
|
if (cached !== undefined) return cached;
|
|
118
147
|
const html = highlightCode(code, language, options);
|
|
119
|
-
if (cacheable(language, options)) remember(language, code, html);
|
|
148
|
+
if (cacheable(language, options)) remember(language, code, { block: html });
|
|
120
149
|
return html;
|
|
121
150
|
}
|
|
122
151
|
|
|
@@ -130,7 +159,7 @@ export function highlightBlockLines(
|
|
|
130
159
|
const cached = options.marks?.length ? undefined : cachedHighlightBlockLines(code, language);
|
|
131
160
|
if (cached !== undefined) return cached;
|
|
132
161
|
const lines = highlightLines(code, language, options);
|
|
133
|
-
if (cacheable(language, options)) remember(language, code, lines
|
|
162
|
+
if (cacheable(language, options)) remember(language, code, { lines });
|
|
134
163
|
return lines;
|
|
135
164
|
}
|
|
136
165
|
|