Skip to content

armgit / mso

Public Imported from GitHub
0

Browser-based graphical shell and control plane for a Linux server you own — real terminal, file manager, live metrics and BYOK AI in one mobile-first workspace. Next.js 16 · React 19 · node-pty · Tailwind v4 · shadcn/ui. Public alpha, self-hosted.

fix(integrations): align layout with Settings sidebar

Rahmanfdb2a25c7bee
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index b16263a7..9f3eb9dc 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -13,6 +13,7 @@ this is the *what*, and it is what Settings → About shows as “What's new”.
**Fixed**
+- `integrations` align layout with Settings sidebar
- `mcp` harden bidirectional file transfer
- `mcp` bind ChatGPT Azure file trust to OAuth provenance
- `mcp` make project plugins explicit opt-in installs
diff --git a/docs/INTEGRATIONS.md b/docs/INTEGRATIONS.md
index 6fe7dd2c..3f5d04ae 100644
--- a/docs/INTEGRATIONS.md
+++ b/docs/INTEGRATIONS.md
@@ -101,11 +101,13 @@ The managed dispatch boundary prevents accidental use of SC's parallel credentia
Open `/integrations`. Public instructions are readable before sign-in; an Owner
session is required to read/manage credential profiles or open their private forms.
Choose the credential user, provider, named connection, source and authentication.
-The browser workbench is intentionally progressive: the main surface shows the current
-connections, **Add connection**, and **More**. Credential owners, project routing,
-**Transfer & backup**, project MCP setup, and refresh live under More so users who only
-need one service account do not have to understand the whole credential model. Mobile
-uses the same hierarchy with the service picker collapsed to a native control.
+The browser workbench uses the same master/detail navigation grammar as Settings.
+Desktop has a searchable **224px sidebar** and a bounded **48rem detail pane**; below
+600px the sidebar becomes an accessible drawer. Providers live under **Connections**.
+**Credential owners**, **Project routing**, **Transfer & backup**, and **Add project MCP**
+live under **Manage**. Section state stays selected when the credential owner changes,
+and Transfer & backup renders in the detail pane instead of replacing the navigation.
+The secure credential-entry form remains an intentional drill-down from a connection.
When an agent needs external access, it must inspect Integrations before asking for a new
credential. Resolve the exact project/context → credential owner → provider → named
@@ -279,7 +281,7 @@ Official contracts: [MCP Apps](https://github.com/modelcontextprotocol/ext-apps)
## Move identities between standalone projects
-Open **More → Transfer & backup** or `/integrations?transfer=1`.
+Open **Integrations sidebar → Transfer & backup** or `/integrations?transfer=1`.
- **Encrypted JSON** is the default/recommended backup and may carry selected direct
credential values behind a separate backup passphrase.
diff --git a/docs/PROGRESS.md b/docs/PROGRESS.md
index df17568f..c895b48c 100644
--- a/docs/PROGRESS.md
+++ b/docs/PROGRESS.md
@@ -1,6 +1,12 @@
+## 2026-09-15 — Integrations adopts the Settings sidebar/detail layout
+
+Integrations now uses the same navigation grammar as Settings instead of its own toolbar + nested provider rail. Desktop uses a searchable 224px sidebar grouped into **Connections** and **Manage**, with a bounded 48rem detail pane; below 600px the same sidebar becomes an accessible drawer with Escape/backdrop close behavior. Credential owner selection stays in the sidebar, section state persists across owner changes, and connection counts are decorative so accessible button names remain stable.
+
+**Transfer & backup** now mounts inside the right detail pane rather than replacing the whole manager, so the sidebar remains present while exporting/importing. Credential setup remains an intentional secure drill-down. Provider CRUD, raw/encrypted export, copy/share, routing and project-MCP behavior are unchanged. Browser coverage exercises 320–1920px, light/dark, drawer navigation, persistent section state and inline transfer.
+
## 2026-09-15 — Integrations progressive UI + password-gated credential export
-Integrations now defaults to a simple connection-management surface: current account, **Add connection**, and **More**. Credential-owner administration, project routing, transfer/backup and project MCP setup are progressive-disclosure actions rather than peer-level toolbar controls. Connection cards distinguish linked **Share** from independent **Copy to another owner**.
+Integrations keeps provider actions simple inside the selected detail pane while navigation lives in the Settings-style sidebar. Connection cards still distinguish linked **Share** from independent **Copy to another owner**.
Transfer & backup adds All/Custom selection with an owner → provider → connection checkbox tree. Encrypted JSON remains the recommended secret-bearing backup; metadata JSON is value-free. Deliberate raw JSON/.env downloads require Owner role, the current MSO password, an explicit plaintext acknowledgement, a 90-second one-time grant bound to the selection, no-store response headers and audit metadata that never contains the password or exported values. Bulk imports remain preview-first/create-only. Agent guidance now requires checking Integrations before asking for a new credential.
diff --git a/lib/infra/connection-ui-layout.test.ts b/lib/infra/connection-ui-layout.test.ts
new file mode 100644
index 00000000..edb9450d
--- /dev/null
+++ b/lib/infra/connection-ui-layout.test.ts
@@ -0,0 +1,21 @@
+import { expect, it } from "vitest";
+import { CONNECTION_MANAGER_SCRIPT } from "./connection-ui";
+import { CONNECTION_MANAGER_STYLE } from "./connection-ui-style";
+
+it("uses the Settings master/detail navigation contract", () => {
+ expect(CONNECTION_MANAGER_SCRIPT).toContain('aria-label","Integrations sections"');
+ expect(CONNECTION_MANAGER_SCRIPT).toContain('integration-settings-sidebar');
+ expect(CONNECTION_MANAGER_SCRIPT).toContain('integration-settings-content');
+ expect(CONNECTION_MANAGER_SCRIPT).toContain('n("p","Connections","integration-nav-label")');
+ expect(CONNECTION_MANAGER_SCRIPT).toContain('n("p","Manage","integration-nav-label")');
+ expect(CONNECTION_MANAGER_SCRIPT).toContain('["transfer","Transfer & backup",showTransfer]');
+ expect(CONNECTION_MANAGER_SCRIPT).toContain('["project-mcp","Add project MCP",showProjectMcp]');
+ expect(CONNECTION_MANAGER_STYLE).toContain('grid-template-columns:14rem minmax(0,1fr)');
+ expect(CONNECTION_MANAGER_STYLE).toContain('width:min(100%,48rem)');
+ expect(CONNECTION_MANAGER_STYLE).toContain('@container integration (max-width:37.5rem)');
+ expect(CONNECTION_MANAGER_STYLE).toContain('integration-sidebar-toggle');
+});
+
+it("keeps transfer inside the selected detail pane when the browser bridge supports it", () => {
+ expect(CONNECTION_MANAGER_SCRIPT).toContain('bridge.mountTransfer(detail');
+});
diff --git a/lib/infra/connection-ui-style.ts b/lib/infra/connection-ui-style.ts
index 14126b36..a34ad3cc 100644
--- a/lib/infra/connection-ui-style.ts
+++ b/lib/infra/connection-ui-style.ts
@@ -73,4 +73,49 @@ export const CONNECTION_MANAGER_STYLE = String.raw`
.integration .identity-providers{overflow:visible}
@container integration (max-width:35rem){.integration .identity-current-owner{width:100%;max-width:none;margin-right:0}.integration .identity-bar>.primary{flex:1}.integration .service-picker{display:block;margin-bottom:var(--space-4)}.integration .connection-card{padding-inline:0}.integration .identity-summary dl{gap:var(--space-4)}.integration .identity-tools[open] .identity-actions{position:static;box-shadow:none;min-width:0}.integration .identity-credential-status>div{grid-template-columns:minmax(0,1fr) auto}.integration .identity-credential-status>div>button{grid-column:1/-1;justify-self:start}}
@container mso (max-height:20rem){.integration .service-picker{margin-bottom:var(--space-2);font-size:0}.integration .service-picker select{font-size:var(--type-small);margin:0}.integration .identity-heading,.integration .identity-summary{display:none}.integration .identity-bar{margin-block:var(--space-2)}.integration .identity-picker-label{display:none}}
+
+/* Integrations shares the Settings master/detail grammar: grouped searchable
+ sidebar, compact section detail, and a mobile side sheet. */
+.surface>.body.integration{margin:0!important;max-width:none!important;width:100%!important;padding:0!important}
+.integration.manager{container:integration / inline-size;position:relative;max-width:none;width:100%;height:100%;min-height:100%;overflow:hidden;background:var(--surface)}
+.integration .integration-settings-shell{display:grid;grid-template-columns:14rem minmax(0,1fr);height:100%;min-height:0;background:color-mix(in srgb,var(--surface) 92%,var(--field))}
+.integration .integration-settings-sidebar{display:flex;min-height:0;flex-direction:column;border-right:var(--stroke) solid var(--sep);background:color-mix(in srgb,var(--field) 70%,var(--surface));overflow:hidden}
+.integration .integration-sidebar-header{display:grid;gap:var(--space-3);padding:var(--space-5) var(--space-3) var(--space-3)}
+.integration .integration-sidebar-brand{display:flex;align-items:center;gap:var(--space-3);padding:0 var(--space-1) var(--space-1)}
+.integration .integration-sidebar-brand strong,.integration .integration-sidebar-brand small{display:block}.integration .integration-sidebar-brand strong{font-size:var(--type-small)}.integration .integration-sidebar-brand small{margin-top:2px;color:var(--text-dim);font-size:var(--type-caption)}
+.integration .integration-brand-icon{display:grid;width:44px;height:44px;place-items:center;border-radius:12px;background:var(--field);box-shadow:inset 0 0 0 var(--stroke) var(--sep-strong);font-size:11px;font-weight:800;letter-spacing:.04em}
+.integration .integration-sidebar-header>input[type=search]{width:100%;min-height:36px;margin:0;border-radius:9px;background:color-mix(in srgb,var(--surface) 75%,transparent);font-size:var(--type-caption)}
+.integration .integration-settings-sidebar .owner-picker{min-width:0;max-width:none;width:100%}.integration .integration-settings-sidebar .owner-picker-trigger{min-height:38px;font-size:var(--type-caption)}
+.integration .integration-settings-nav{min-height:0;flex:1;overflow-y:auto;padding:0 var(--space-2) var(--space-4);scrollbar-width:thin}
+.integration .integration-nav-group{display:grid;gap:2px;margin-top:var(--space-3)}
+.integration .integration-nav-label{margin:0;padding:0 var(--space-2) var(--space-1);font-size:11px;font-weight:650;color:var(--text-dim)}
+.integration .integration-nav-item{position:relative;display:flex;width:100%;min-height:42px;align-items:center;gap:10px;border:0;border-radius:7px;padding:6px 8px;text-align:left;background:transparent;color:var(--text);font-size:13px;font-weight:500}
+.integration .integration-nav-item:hover{background:var(--hover)}
+.integration .integration-nav-item[aria-current=page]{background:var(--os-accent);color:white;font-weight:650}
+.integration .integration-nav-item[aria-current=page] .provider-mark{border-color:color-mix(in srgb,white 45%,transparent);background:color-mix(in srgb,white 14%,transparent);color:white}
+.integration .integration-nav-item .provider-mark{width:25px;height:25px;border-radius:6px;box-shadow:0 1px 2px color-mix(in srgb,var(--text) 10%,transparent)}
+.integration .integration-nav-item .provider-count{margin-left:auto;font-size:11px;color:inherit;opacity:.72}
+.integration .integration-nav-utility{padding-left:10px}.integration .integration-nav-utility::before{content:"";width:7px;height:7px;flex:none;border-radius:50%;background:var(--sep-strong)}.integration .integration-nav-utility[aria-current=page]::before{background:white}
+.integration .integration-sidebar-footer{flex:none;border-top:var(--stroke) solid var(--sep);padding:var(--space-3)}.integration .integration-sidebar-footer button{width:100%;justify-content:center;border-color:transparent;background:transparent;color:var(--text-dim)}
+.integration .integration-settings-content{min-width:0;min-height:0;overflow-y:auto;background:var(--surface)}
+.integration .integration-settings-detail,.integration .identity-feedback,.integration .identity-readonly{width:min(100%,48rem);margin-inline:auto}
+.integration .integration-settings-detail{padding:var(--space-5);padding-bottom:max(var(--space-5),env(safe-area-inset-bottom))}.integration .identity-feedback{padding:0 var(--space-5) var(--space-5)}
+.integration .integration-settings-detail>h2,.integration .provider-title h2{font-size:20px;font-weight:650;letter-spacing:-.012em}
+.integration .provider-heading{align-items:flex-start;padding-bottom:var(--space-1)}.integration .provider-title{align-items:flex-start}.integration .provider-heading .provider-mark{width:38px;height:38px;border-radius:9px}.integration .provider-title p{max-width:58ch;color:var(--text-dim);font-size:var(--type-small);line-height:1.5}
+.integration .identity-summary-line{margin:var(--space-3) 0 0;padding-bottom:var(--space-3)}
+.integration .integration-mobile-toolbar{display:none}
+.integration .integration-sidebar-backdrop{display:none}
+.integration .integration-sidebar-toggle{min-height:38px}
+@container integration (max-width:37.5rem){
+ .integration .integration-settings-shell{display:block;position:relative;min-height:100%}
+ .integration .integration-settings-sidebar{position:absolute;inset:0 auto 0 0;z-index:30;width:min(82%,18rem);transform:translateX(-102%);transition:transform 160ms ease;box-shadow:var(--shadow-pop)}
+ .integration .integration-settings-sidebar[data-open=true]{transform:translateX(0)}
+ .integration .integration-sidebar-backdrop{position:absolute;inset:0;z-index:20;display:block;width:100%;height:100%;padding:0;border:0;border-radius:0;background:color-mix(in srgb,#000 38%,transparent)}
+ .integration .integration-sidebar-backdrop[hidden]{display:none}
+ .integration .integration-settings-content{height:100%;overflow-y:auto}
+ .integration .integration-mobile-toolbar{position:sticky;top:0;z-index:10;display:flex;align-items:center;border-bottom:var(--stroke) solid var(--sep);padding:6px var(--space-3);background:color-mix(in srgb,var(--surface) 94%,transparent);backdrop-filter:blur(14px)}
+ .integration .integration-settings-detail{padding:var(--space-4)}.integration .identity-feedback{padding:0 var(--space-4) var(--space-4)}
+ .integration .provider-heading{gap:var(--space-3);flex-wrap:wrap}.integration .provider-heading>.primary{width:100%}
+ .integration .connection-card{padding-inline:0}
+}
`;
\ No newline at end of file
diff --git a/lib/infra/connection-ui.ts b/lib/infra/connection-ui.ts
index bfcecf1f..4d18fdbc 100644
--- a/lib/infra/connection-ui.ts
+++ b/lib/infra/connection-ui.ts
@@ -4,7 +4,7 @@ import { PROVIDER_ICON_PATHS } from "./provider-icons";
export const CONNECTION_MANAGER_SCRIPT=PROJECT_MCP_UI_SCRIPT+`const PROVIDER_ICON_PATHS=${JSON.stringify(PROVIDER_ICON_PATHS)};`+String.raw`
function mountConnectionManager(root,catalog,bridge,initial={}){
let disposed=false,sequence=0,snapshot=initial.snapshot||{users:[],connections:[],bindings:[]},user=initial.user||snapshot.user||null,provider=catalog.find(p=>p.id===initial.provider)||catalog.find(p=>p.id==="github")||catalog[0];
- let detail,status,container,contextOpen=false;
+ let detail,status,container,sidebarPanel,sidebarBackdrop,sidebarToggle,navButtons=[],navMode="provider",sidebarOpen=false;
const ready=c=>c.state==="verified"||c.state==="ACTIVE";
const stateLabel=c=>ready(c)?"Verified":c.state==="incomplete"?"Needs setup":c.state==="configured"?"Not verified":c.state==="invalid"?"Access rejected":c.state==="unavailable"?"Check unavailable":c.state==="unconfigured"?"Needs setup":"Authorize";
const mark=p=>{const wrap=n("span",undefined,"provider-mark"),svg=document.createElementNS("http://www.w3.org/2000/svg","svg"),shape=document.createElementNS("http://www.w3.org/2000/svg","path");wrap.setAttribute("aria-hidden","true");svg.setAttribute("viewBox","0 0 24 24");shape.setAttribute("d",PROVIDER_ICON_PATHS[p.id]||"M8 2h8v5h5v10h-5v5H8v-5H3V7h5V2zm2 2v5H5v6h5v5h4v-5h5V9h-5V4z");svg.append(shape);wrap.append(svg);return wrap};
@@ -28,23 +28,45 @@ function mountConnectionManager(root,catalog,bridge,initial={}){
async function reload(){const version=++sequence;if(!bridge.query){draw();return}try{const next=await bridge.query({view:"snapshot",...(user?{user}:{})});if(disposed||version!==sequence)return;snapshot=next;user=next.user||user;draw();remember()}catch(e){if(!disposed){draw();status.textContent=textError(e)}}}
async function change(args,after=reload){if(!bridge.manage)return;try{status.textContent="Saving connection metadata…";await bridge.manage({...args,confirm:true});await after()}catch(e){status.textContent=textError(e)}}
function guide(method,parent=detail){const d=n("details",undefined,"identity-guide");d.open=parent!==detail;d.append(n("summary","How to get this credential / authorization"));const g=method.guidance,ol=n("ol");for(const step of g.steps)ol.append(n("li",step));d.append(ol);for(const[url,label]of [[g.url,"Official setup page"],[g.reference,"Documentation"]]){const a=n("a",label);a.href=url;a.rel="noopener noreferrer";a.target="_blank";if(bridge.openLink)a.addEventListener("click",e=>{e.preventDefault();Promise.resolve(bridge.openLink(url)).catch(error=>status.textContent=textError(error))});d.append(a)}parent.append(d)}
+ function setSidebar(open){const wasOpen=sidebarOpen;sidebarOpen=Boolean(open);if(sidebarPanel)sidebarPanel.dataset.open=String(sidebarOpen);if(sidebarBackdrop)sidebarBackdrop.hidden=!sidebarOpen;if(sidebarToggle)sidebarToggle.setAttribute("aria-expanded",String(sidebarOpen));if(sidebarOpen)setTimeout(()=>sidebarPanel?.querySelector("input,button")?.focus(),0);else if(wasOpen&&sidebarToggle)setTimeout(()=>sidebarToggle.focus(),0)}
+ function activateNav(mode){navMode=mode;for(const entry of navButtons){const on=entry.mode===mode&&(mode!=="provider"||entry.provider===provider.id);entry.button.setAttribute("aria-current",on?"page":"false");entry.button.setAttribute("aria-pressed",String(on))}}
+ function showProfiles(){navMode="owners";activateNav(navMode);setSidebar(false);profiles()}
+ function showBindings(){navMode="routing";activateNav(navMode);setSidebar(false);bindings()}
+ function showTransfer(){navMode="transfer";activateNav(navMode);setSidebar(false);if(bridge.mountTransfer)bridge.mountTransfer(detail,()=>{navMode="provider";activateNav(navMode);drawProvider()});else if(bridge.openTransfer)bridge.openTransfer();else bridge.openTransferBrowser?.()}
+ function showProjectMcp(){navMode="project-mcp";activateNav(navMode);setSidebar(false);mountProjectMcpForm(detail,bridge,snapshot,user,status,()=>{navMode="provider";activateNav(navMode);drawProvider()},{n,b,input})}
+ function selectProvider(p){provider=p;navMode="provider";remember();activateNav(navMode);setSidebar(false);drawProvider()}
function draw(){
root.replaceChildren();root.classList.add("integration","manager");
- const heading=n("header",undefined,"identity-heading"),title=n("div");title.append(n(bridge.headingLevel===1?"h1":"h2","Integrations"),n("p","Service connections for this VPS. Advanced routing and transfer tools stay under More."));heading.append(title,n("span",catalog.length+" services","identity-count"));root.append(heading);
- const toolbar=n("div",undefined,"identity-bar"),owner=choicePicker("Credential owner",snapshot.users.map(row=>({id:row.id,text:row.label+" · "+row.id+(row.isDefault?" · default":"")})),user,row=>{user=row.id;remember();void reload()}),currentOwner=n("span",snapshot.users.find(row=>row.id===user)?.label||"No credential owner","identity-current-owner");
- const addConnection=b("Add connection",()=>user?newConnection():profiles(),"primary");addConnection.disabled=!bridge.manage;const context=n("details",undefined,"identity-tools identity-context"),contextSummary=n("summary","More"),contextControls=n("div",undefined,"identity-actions");context.open=contextOpen;context.addEventListener("toggle",()=>{contextOpen=context.open});contextSummary.setAttribute("aria-label","More integration actions");
- const usersAction=b("Credential owners",profiles),routingAction=b("Project routing",bindings),transfer=b("Transfer & backup",()=>bridge.openTransfer?bridge.openTransfer():bridge.openTransferBrowser?.()),addMcp=b("Add project MCP",()=>mountProjectMcpForm(detail,bridge,snapshot,user,status,drawProvider,{n,b,input})),refresh=b("Refresh",reload);usersAction.disabled=routingAction.disabled=!bridge.manage;transfer.disabled=!bridge.openTransfer&&!bridge.openTransferBrowser;addMcp.disabled=!bridge.projectMcp;contextControls.append(owner.wrap,usersAction,routingAction,transfer,addMcp,refresh);context.append(contextSummary,contextControls);toolbar.append(currentOwner,addConnection,context);root.append(toolbar);
- if(!bridge.manage)root.append(n("p","Sign in as an MSO Owner to manage credentials. Device roles and credential users are different; the public guides remain available.","identity-readonly"));
- if(snapshot.connections.length){const count=snapshot.connections.filter(ready).length;root.append(n("p",snapshot.connections.length+" connection"+(snapshot.connections.length===1?"":"s")+" · "+count+" verified","identity-summary-line"))}
- container=n("div",undefined,"identity-layout");const sidebar=n("nav",undefined,"identity-providers"),search=n("input");search.type="search";search.placeholder="Search services";search.setAttribute("aria-label","Search services");sidebar.setAttribute("aria-label","Services");sidebar.append(search);
- const buttons=[];for(const p of catalog){const item=b(undefined,()=>{provider=p;serviceSelect.value=p.id;remember();drawProvider();for(const[row,button]of buttons)button.setAttribute("aria-pressed",String(row.id===provider.id))});item.append(mark(p),n("span",p.title));const count=snapshot.connections.filter(c=>c.provider===p.id).length;if(count)item.append(n("span",count,"provider-count"));item.setAttribute("aria-pressed",String(p.id===provider.id));buttons.push([p,item]);sidebar.append(item)}search.addEventListener("input",()=>{for(const[p,item]of buttons)item.hidden=!(p.title+" "+p.id).toLowerCase().includes(search.value.toLowerCase())});
- const serviceLabel=n("label","Service","service-picker"),serviceSelect=n("select");serviceSelect.setAttribute("aria-label","Service");
- for(const p of catalog){const option=n("option",p.title);option.value=p.id;serviceSelect.append(option)}serviceSelect.value=provider.id;
- serviceSelect.addEventListener("change",()=>{provider=catalog.find(p=>p.id===serviceSelect.value)||provider;remember();drawProvider();for(const[p,item]of buttons)item.setAttribute("aria-pressed",String(p.id===provider.id))});
- serviceLabel.append(serviceSelect);root.append(serviceLabel);
- detail=n("section",undefined,"identity-detail");status=n("p",undefined,"identity-feedback");status.setAttribute("role","status");status.setAttribute("aria-live","polite");container.append(sidebar,detail);root.append(container,status);drawProvider();
+ const shell=n("div",undefined,"integration-settings-shell");
+ sidebarBackdrop=b("",()=>setSidebar(false),"integration-sidebar-backdrop");sidebarBackdrop.hidden=true;sidebarBackdrop.setAttribute("aria-label","Close Integrations sections");
+ sidebarPanel=n("aside",undefined,"integration-settings-sidebar");sidebarPanel.id="integration-settings-sidebar";sidebarPanel.dataset.open="false";
+ const sidebarHeader=n("div",undefined,"integration-sidebar-header"),brand=n("div",undefined,"integration-sidebar-brand"),brandIcon=n("span","M","integration-brand-icon"),brandCopy=n("span");brandCopy.append(n("strong","MSO"),n("small","Integrations"));brand.append(brandIcon,brandCopy);
+ const search=n("input");search.type="search";search.placeholder="Search";search.setAttribute("aria-label","Search integrations");
+ const owner=choicePicker("Credential owner",snapshot.users.map(row=>({id:row.id,text:row.label+" · "+row.id+(row.isDefault?" · default":"")})),user,row=>{user=row.id;remember();void reload()});
+ sidebarHeader.append(brand,search,owner.wrap);sidebarPanel.append(sidebarHeader);sidebarPanel.addEventListener("keydown",event=>{if(event.key==="Escape"&&sidebarOpen){event.preventDefault();setSidebar(false)}});
+ const nav=n("nav",undefined,"integration-settings-nav");nav.setAttribute("aria-label","Integrations sections");
+ const connectionGroup=n("div",undefined,"integration-nav-group"),connectionLabel=n("p","Connections","integration-nav-label");connectionGroup.append(connectionLabel);
+ navButtons=[];for(const p of catalog){const item=b(undefined,()=>selectProvider(p),"integration-nav-item");item.append(mark(p),n("span",p.title));const count=snapshot.connections.filter(c=>c.provider===p.id).length;if(count){const badge=n("span",String(count),"provider-count");badge.setAttribute("aria-hidden","true");item.append(badge)}navButtons.push({mode:"provider",provider:p.id,button:item});connectionGroup.append(item)}
+ const manageGroup=n("div",undefined,"integration-nav-group"),manageLabel=n("p","Manage","integration-nav-label");manageGroup.append(manageLabel);
+ const management=[
+ ["owners","Credential owners",showProfiles],
+ ["routing","Project routing",showBindings],
+ ["transfer","Transfer & backup",showTransfer],
+ ["project-mcp","Add project MCP",showProjectMcp],
+ ];
+ for(const [mode,label,fn] of management){const item=b(label,fn,"integration-nav-item integration-nav-utility");if((mode==="owners"||mode==="routing")&&!bridge.manage)item.disabled=true;if(mode==="transfer"&&!bridge.openTransfer&&!bridge.openTransferBrowser)item.disabled=true;if(mode==="project-mcp"&&!bridge.projectMcp)item.disabled=true;navButtons.push({mode,provider:null,button:item});manageGroup.append(item)}
+ nav.append(connectionGroup,manageGroup);sidebarPanel.append(nav);
+ const sidebarFooter=n("div",undefined,"integration-sidebar-footer"),refresh=b("Refresh",reload);sidebarFooter.append(refresh);sidebarPanel.append(sidebarFooter);
+ search.addEventListener("input",()=>{const q=search.value.trim().toLowerCase();for(const entry of navButtons){if(entry.mode!=="provider")continue;const p=catalog.find(row=>row.id===entry.provider);entry.button.hidden=Boolean(q)&&!(p.title+" "+p.id).toLowerCase().includes(q)}});
+
+ const content=n("main",undefined,"integration-settings-content"),mobileBar=n("div",undefined,"integration-mobile-toolbar");sidebarToggle=b("Integrations sections",()=>setSidebar(true),"integration-sidebar-toggle");sidebarToggle.setAttribute("aria-controls","integration-settings-sidebar");sidebarToggle.setAttribute("aria-expanded","false");mobileBar.append(sidebarToggle);content.append(mobileBar);
+ if(!bridge.manage)content.append(n("p","Sign in as an MSO Owner to manage credentials. Device roles and credential users are different; public setup guides remain available.","identity-readonly"));
+ detail=n("section",undefined,"identity-detail integration-settings-detail");status=n("p",undefined,"identity-feedback");status.setAttribute("role","status");status.setAttribute("aria-live","polite");content.append(detail,status);
+ shell.append(sidebarPanel,sidebarBackdrop,content);root.append(shell);container=shell;
+ activateNav(navMode);
+ if(navMode==="owners")profiles();else if(navMode==="routing")bindings();else if(navMode==="project-mcp")showProjectMcp();else drawProvider();
}
- function confirmation(title,id,fn){detail.replaceChildren(n("h2",title),n("p","This changes only the selected identity. Type “"+id+"” to confirm."));const value=input("Confirmation");detail.append(value.label,b("Confirm",()=>{if(value.input.value!==id){status.textContent="Confirmation does not match.";return}void fn()},"danger"),b("Cancel",drawProvider));}
+ function confirmation(title,id,fn){detail.replaceChildren(n("h2",title),n("p","This changes only the selected identity. Type “"+id+"” to confirm."));const value=input("Confirmation");detail.append(value.label,b("Confirm",()=>{if(value.input.value!==id){status.textContent="Confirmation does not match.";return}void fn()},"danger"),b("Cancel",()=>{navMode="provider";activateNav(navMode);drawProvider()}));}
function profiles(){
detail.replaceChildren(n("h2","Credential owners"),n("p","These profiles isolate service accounts. They do not grant MSO device roles."));
const id=input("New user ID"),name=input("Display label");detail.append(id.label,name.label);const create=b("Create user",()=>change({action:"user.create",user:id.input.value,label:name.input.value||id.input.value},async()=>{user=id.input.value;await reload()}),"primary");create.disabled=!bridge.manage;detail.append(create);
@@ -60,14 +82,14 @@ function mountConnectionManager(root,catalog,bridge,initial={}){
for(const binding of snapshot.bindings){const card=n("div",undefined,"connection-card");card.append(n("strong",binding.path),n("p",binding.user+" · "+Object.entries(binding.connections).map(([p,id])=>p+"="+id).join(", ")));const remove=b("Remove binding",()=>change({action:"folder.unmap",path:binding.path}));remove.disabled=!bridge.manage;card.append(remove);detail.append(card)}
}
function drawProvider(){
- detail.replaceChildren();const heading=n("header",undefined,"provider-heading"),title=n("div",undefined,"provider-title"),copy=n("div");copy.append(n("h2",provider.title),n("p",provider.description));title.append(mark(provider),copy);heading.append(title);detail.append(heading);
+ navMode="provider";activateNav(navMode);detail.replaceChildren();const heading=n("header",undefined,"provider-heading"),title=n("div",undefined,"provider-title"),copy=n("div");copy.append(n("h2",provider.title),n("p",provider.description));title.append(mark(provider),copy);heading.append(title);const add=b("Add connection",()=>user?newConnection():showProfiles(),"primary");add.disabled=!bridge.manage;heading.append(add);detail.append(heading);
- const rows=snapshot.connections.filter(c=>c.provider===provider.id);
+ const rows=snapshot.connections.filter(c=>c.provider===provider.id);if(rows.length){const count=rows.filter(ready).length;detail.append(n("p",rows.length+" connection"+(rows.length===1?"":"s")+" · "+count+" verified","identity-summary-line"));}
if(!rows.length){const empty=n("div",undefined,"identity-empty");empty.append(n("h3","Connect "+provider.title),n("p",user?"Add an account to start using "+provider.title+" in your projects.":bridge.manage?"Select a credential owner to add an account.":"Read the setup guide below, then sign in to connect your account."));const start=b("Add "+provider.title+" account",newConnection,"primary");start.disabled=!user||!bridge.manage;if(bridge.manage)empty.append(start);detail.append(empty);const help=n("details");help.append(n("summary","Connection methods & setup guides"));for(const s of provider.sources)for(const m of s.methods){const info=n("section");info.append(n("h3",s.label+" · "+m.label));guide(m,info);help.append(info)}detail.append(help)}
for(const c of rows){const card=n("article",undefined,"connection-card");const top=n("header",undefined,"connection-heading"),name=n("div");name.append(n("h3",c.label),n("small",c.id));const state=n("span",stateLabel(c),"connection-state");state.dataset.ready=String(ready(c));top.append(name,state);card.append(top);const tags=n("div",undefined,"identity-tags");for(const value of [human(c.source),human(c.authMethod),c.sharedFrom?"Shared from "+c.sharedFrom.user:"",c.isDefault?"Default account":""])if(value)tags.append(n("span",value));card.append(tags);const actions=n("div",undefined,"identity-actions"),more=n("details",undefined,"identity-tools"),secondary=n("div",undefined,"identity-actions");more.append(n("summary","More"));more.append(secondary);
const open=b(c.source==="direct"?(c.fields.some(f=>f.stored)?"Update credentials":"Finish setup"):"Authorize",()=>{if(c.source==="direct")void bridge.openSetup({user,provider:provider.id,connection:c.id}).catch(e=>status.textContent=textError(e));else external(c)});open.disabled=!bridge.manage;if(!c.sharedFrom)actions.append(open);
const verify=b("Verify",async()=>{try{status.textContent="Checking selected connection…";const result=await bridge.execute({user,provider:provider.id,connection:c.id,operation:"verify"});await reload();status.textContent=(result.ok===true?"Verified: ":"Status: ")+result.detail}catch(e){status.textContent=textError(e)}});verify.disabled=!bridge.execute;actions.append(verify);
- const rename=b("Rename",()=>{detail.replaceChildren(n("h2","Rename connection"));const name=input("Label",c.label);detail.append(name.label,b("Save label",()=>change({action:"connection.rename",user,provider:provider.id,connection:c.id,label:name.input.value})),b("Cancel",drawProvider))});rename.disabled=!bridge.manage;secondary.append(rename);
+ const rename=b("Rename",()=>{detail.replaceChildren(n("h2","Rename connection"));const name=input("Label",c.label);detail.append(name.label,b("Save label",()=>change({action:"connection.rename",user,provider:provider.id,connection:c.id,label:name.input.value})),b("Cancel",()=>{navMode="provider";activateNav(navMode);drawProvider()}))});rename.disabled=!bridge.manage;secondary.append(rename);
if(c.sharedFrom){card.append(n("p","Read-only shared backing: "+c.sharedFrom.user+" / "+c.sharedFrom.connection,"identity-muted"));}else if(c.source==="direct"){const fields=n("div",undefined,"identity-credential-status");for(const f of c.fields){const line=n("div");line.append(n("span",f.label));const fieldState=n("span",f.stored?"Stored":"Missing","credential-field-state");fieldState.dataset.stored=String(f.stored);line.append(fieldState);if(f.stored){const remove=b("Remove",()=>confirmation("Remove credential field",f.key,()=>change({action:"credential.delete",user,provider:provider.id,connection:c.id,key:f.key})),"danger");remove.disabled=!bridge.manage;line.append(remove)}fields.append(line)}card.append(fields);if(c.fields.some(f=>f.stored)){const clear=b("Clear credentials",()=>confirmation("Clear this connection's credential fields",c.id,()=>change({action:"credential.delete",user,provider:provider.id,connection:c.id})),"danger");clear.disabled=!bridge.manage;secondary.append(clear)}}
if(!c.isDefault){const def=b("Make default",()=>change({action:"connection.default",user,provider:provider.id,connection:c.id}));def.disabled=!bridge.manage;secondary.append(def)}
if(c.sharedFrom){const unshare=b("Unshare",()=>confirmation("Remove shared alias",c.id,()=>change({action:"connection.unshare",user,provider:provider.id,connection:c.id})),"danger");unshare.disabled=!bridge.manage;secondary.append(unshare)}else{if(c.source==="direct"){const share=b("Share linked access",()=>shareConnection(c));share.disabled=!bridge.manage;secondary.append(share)}const duplicate=b("Copy to another owner",()=>copyConnection(c));duplicate.disabled=!bridge.manage;secondary.append(duplicate)}
@@ -80,10 +102,10 @@ function mountConnectionManager(root,catalog,bridge,initial={}){
for(const s of provider.sources){const o=n("option",s.label);o.value=s.id;source.append(o)}
function changeAuth(){auth.replaceChildren();for(const m of provider.sources.find(s=>s.id===source.value).methods){const o=n("option",m.label+" · "+m.scope);o.value=m.id;auth.append(o)}previewGuide()}
function previewGuide(){preview.replaceChildren();const method=provider.sources.find(s=>s.id===source.value).methods.find(m=>m.id===auth.value);if(method.fields.length)preview.append(n("p","Fields: "+method.fields.map(f=>f.label+(f.required?" *":"")).join(", ")));else preview.append(n("p","No provider tokens are stored locally for this source."));guide(method,preview)}source.addEventListener("change",changeAuth);auth.addEventListener("change",previewGuide);changeAuth();
- const fields=n("div",undefined,"identity-fields");fields.append(label.label,sourceLabel,authLabel);const advanced=n("details");advanced.append(n("summary","Connection identifier"),id.label);detail.append(fields,advanced,preview,b("Create & connect",()=>change({action:"connection.create",user,provider:provider.id,connection:id.input.value,label:label.input.value,source:source.value,authMethod:auth.value},async()=>{await reload();if(source.value==="direct")await bridge.openSetup({user,provider:provider.id,connection:id.input.value});else{const created=snapshot.connections.find(c=>c.provider===provider.id&&c.id===id.input.value);if(created)external(created)}}),"primary"),b("Cancel",drawProvider));label.input.focus();
+ const fields=n("div",undefined,"identity-fields");fields.append(label.label,sourceLabel,authLabel);const advanced=n("details");advanced.append(n("summary","Connection identifier"),id.label);detail.append(fields,advanced,preview,b("Create & connect",()=>change({action:"connection.create",user,provider:provider.id,connection:id.input.value,label:label.input.value,source:source.value,authMethod:auth.value},async()=>{await reload();if(source.value==="direct")await bridge.openSetup({user,provider:provider.id,connection:id.input.value});else{const created=snapshot.connections.find(c=>c.provider===provider.id&&c.id===id.input.value);if(created)external(created)}}),"primary"),b("Cancel",()=>{navMode="provider";activateNav(navMode);drawProvider()}));label.input.focus();
}
- function copyConnection(c){detail.replaceChildren(n("h2","Copy "+c.label),n("p","Creates an independent connection for another credential owner. Existing connections are never overwritten."));const targets=snapshot.users.filter(row=>row.id!==user).map(row=>({id:row.id,text:row.label+" · "+row.id})),target=choicePicker("Target credential owner",targets,targets[0]?.id||"",()=>sync()),id=input("New connection ID",c.id),label=input("New connection label",c.label),copy=input("","","checkbox"),make=input("","","checkbox");copy.label.className=make.label.className="identity-check";copy.label.append(document.createTextNode("Copy saved direct credentials"));copy.input.checked=c.source==="direct";copy.label.hidden=c.source!=="direct";make.label.append(document.createTextNode("Make the copied connection default for this service"));const submit=b("Copy connection",()=>change({action:"connection.duplicate",user,provider:provider.id,connection:c.id,target:target.value,targetConnection:id.input.value,label:label.input.value,copyCredentials:copy.input.checked,makeDefault:make.input.checked}),"primary"),sync=()=>{submit.disabled=!bridge.manage||!target.value||target.value===user||!id.input.value.trim()||!label.input.value.trim()};for(const control of[id.input,label.input])control.addEventListener("input",sync);sync();detail.append(target.wrap,id.label,label.label,copy.label,make.label,submit,b("Cancel",drawProvider));}
- function shareConnection(c){detail.replaceChildren(n("h2","Share "+c.label),n("p","Creates a read-only linked alias. Credential rotation stays with the current owner."));const targets=snapshot.users.filter(row=>row.id!==user).map(row=>({id:row.id,text:row.label+" · "+row.id})),target=choicePicker("Target credential owner",targets,targets[0]?.id||"",()=>sync()),label=input("New alias label",c.label),make=input("", "","checkbox");make.label.className="identity-check";make.label.append(document.createTextNode("Make this owner’s default for this service"));const submit=b("Create shared alias",()=>change({action:"connection.share",user,provider:provider.id,connection:c.id,target:target.value,label:label.input.value,makeDefault:make.input.checked}),"primary"),sync=()=>{submit.disabled=!bridge.manage||!target.value||target.value===user||!label.input.value.trim()};label.input.addEventListener("input",sync);sync();detail.append(target.wrap,label.label,make.label,submit,b("Cancel",drawProvider));}
+ function copyConnection(c){detail.replaceChildren(n("h2","Copy "+c.label),n("p","Creates an independent connection for another credential owner. Existing connections are never overwritten."));const targets=snapshot.users.filter(row=>row.id!==user).map(row=>({id:row.id,text:row.label+" · "+row.id})),target=choicePicker("Target credential owner",targets,targets[0]?.id||"",()=>sync()),id=input("New connection ID",c.id),label=input("New connection label",c.label),copy=input("","","checkbox"),make=input("","","checkbox");copy.label.className=make.label.className="identity-check";copy.label.append(document.createTextNode("Copy saved direct credentials"));copy.input.checked=c.source==="direct";copy.label.hidden=c.source!=="direct";make.label.append(document.createTextNode("Make the copied connection default for this service"));const submit=b("Copy connection",()=>change({action:"connection.duplicate",user,provider:provider.id,connection:c.id,target:target.value,targetConnection:id.input.value,label:label.input.value,copyCredentials:copy.input.checked,makeDefault:make.input.checked}),"primary"),sync=()=>{submit.disabled=!bridge.manage||!target.value||target.value===user||!id.input.value.trim()||!label.input.value.trim()};for(const control of[id.input,label.input])control.addEventListener("input",sync);sync();detail.append(target.wrap,id.label,label.label,copy.label,make.label,submit,b("Cancel",()=>{navMode="provider";activateNav(navMode);drawProvider()}));}
+ function shareConnection(c){detail.replaceChildren(n("h2","Share "+c.label),n("p","Creates a read-only linked alias. Credential rotation stays with the current owner."));const targets=snapshot.users.filter(row=>row.id!==user).map(row=>({id:row.id,text:row.label+" · "+row.id})),target=choicePicker("Target credential owner",targets,targets[0]?.id||"",()=>sync()),label=input("New alias label",c.label),make=input("", "","checkbox");make.label.className="identity-check";make.label.append(document.createTextNode("Make this owner’s default for this service"));const submit=b("Create shared alias",()=>change({action:"connection.share",user,provider:provider.id,connection:c.id,target:target.value,label:label.input.value,makeDefault:make.input.checked}),"primary"),sync=()=>{submit.disabled=!bridge.manage||!target.value||target.value===user||!label.input.value.trim()};label.input.addEventListener("input",sync);sync();detail.append(target.wrap,label.label,make.label,submit,b("Cancel",()=>{navMode="provider";activateNav(navMode);drawProvider()}));}
function external(c){
detail.replaceChildren(n("h2",c.label),n("p",user+" / "+provider.id+" / "+c.source+" / "+c.authMethod));const method=provider.sources.find(s=>s.id===c.source).methods.find(m=>m.id===c.authMethod);guide(method);
if(c.source==="native-mcp"){detail.append(n("p","Authorize in the provider's own MCP client. MSO will return this route, never substitute a stored API key."),b("Back",drawProvider));return}
diff --git a/lib/infra/portable/ui.ts b/lib/infra/portable/ui.ts
index b84dba77..f47a3a69 100644
--- a/lib/infra/portable/ui.ts
+++ b/lib/infra/portable/ui.ts
@@ -1,5 +1,5 @@
// Owner-only transfer workbench. The default Integrations screen stays simple;
-// this surface is opened explicitly from More → Transfer & backup.
+// this surface is opened explicitly from Integrations sidebar → Transfer & backup.
export const PORTABILITY_SCRIPT=String.raw`
function mountPortability(root,bridge){
let disposed=false,documentData=null,preview=null,tree=null,active='export';const selected=new Set();root.replaceChildren();root.classList.add('integration','portable-transfer');
diff --git a/lib/infra/setup-browser.ts b/lib/infra/setup-browser.ts
index 582f8629..7753cbd2 100644
--- a/lib/infra/setup-browser.ts
+++ b/lib/infra/setup-browser.ts
@@ -5,16 +5,19 @@ export const INTEGRATION_BROWSER_SCRIPT=String.raw`
async function json(url,init){const r=await fetch(url,{credentials:"same-origin",cache:"no-store",referrerPolicy:"no-referrer",...init});const data=await r.json();if(!r.ok)throw error(data);return data}
const post=(mode,input)=>json("/api/v1/integrations",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({mode,...input})});
function showForm(setup,token){cleanup();authController?.abort();cleanup=mountIntegrationForm(root,setup,{endpoint,token,onBack:loadManager})||(()=>{})}
+ const transferBridge=back=>({back,request:body=>json("/api/v1/integrations/transfer",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify(body)}),download:async body=>{const r=await fetch("/api/v1/integrations/transfer",{method:"POST",credentials:"same-origin",cache:"no-store",referrerPolicy:"no-referrer",headers:{"Content-Type":"application/json"},body:JSON.stringify(body)});if(!r.ok)throw error(await r.json());const disposition=r.headers.get("content-disposition")||"",match=/filename="([^"]+)"/.exec(disposition);return{blob:await r.blob(),filename:match?.[1]||"mso-credentials.txt"}}});
function openTransfer(){
cleanup();authController?.abort();wantsTransfer=true;
- cleanup=mountPortability(root,{back:()=>{wantsTransfer=false;void loadManager()},request:body=>json("/api/v1/integrations/transfer",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify(body)}),download:async body=>{const r=await fetch("/api/v1/integrations/transfer",{method:"POST",credentials:"same-origin",cache:"no-store",referrerPolicy:"no-referrer",headers:{"Content-Type":"application/json"},body:JSON.stringify(body)});if(!r.ok)throw error(await r.json());const disposition=r.headers.get("content-disposition")||"",match=/filename="([^"]+)"/.exec(disposition);return{blob:await r.blob(),filename:match?.[1]||"mso-credentials.txt"}}});
+ cleanup=mountPortability(root,transferBridge(()=>{wantsTransfer=false;void loadManager()}));
}
+ function mountTransfer(target,onBack){let release=()=>{};release=mountPortability(target,transferBridge(()=>{release();onBack?.()}));return release}
+
async function loadManager(){
cleanup();authController?.abort();authController=new AbortController();
let owner=false,authenticated=false,role=null;try{const auth=await json("/api/auth/me",{signal:authController.signal});owner=auth.role==="owner";authenticated=auth.authenticated===true;role=auth.role}catch{}
const bridge={headingLevel:1,remember:s=>state=s,openLink:url=>window.open(url,"_blank","noopener,noreferrer")};
if(owner){
- bridge.openTransfer=openTransfer;
+ bridge.openTransfer=openTransfer;bridge.mountTransfer=mountTransfer;
bridge.projectMcp=args=>json("/api/v1/project-mcp",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify(args)});
bridge.query=args=>json("/api/v1/integrations?"+new URLSearchParams(args));
bridge.manage=args=>post("manage",args);bridge.execute=args=>post("execute",args);
diff --git a/lib/infra/setup-page.ts b/lib/infra/setup-page.ts
index 10b9faa2..c1d95d0d 100644
--- a/lib/infra/setup-page.ts
+++ b/lib/infra/setup-page.ts
@@ -9,7 +9,7 @@ import { connectionCatalog } from "./connection-registry";
export function integrationSetupPage(embedded = false) {
const nonce = randomBytes(18).toString("base64");
const catalog = JSON.stringify(connectionCatalog()).replace(/</g,"\\u003c");
- const html = `<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="referrer" content="no-referrer"><title>Integrations · MSO</title><style nonce="${nonce}">${MSO_WIDGET_TOKENS}${INTEGRATION_FORM_STYLE}${CONNECTION_MANAGER_STYLE}${PORTABILITY_STYLE}*{box-sizing:border-box}body{margin:0;background:var(--surface);padding:clamp(var(--space-4),3vw,40px);font-family:var(--font-body);color:var(--text)}.site-bar{max-width:1180px;margin:0 auto 26px;font-size:var(--type-small);display:flex;justify-content:space-between;gap:var(--space-3)}.site-bar strong{display:flex;align-items:center;gap:var(--space-3);font-weight:750}.site-bar svg{width:30px;height:30px}.site-bar span{color:var(--text-dim)}button{border:var(--stroke) solid var(--sep-strong);border-radius:var(--radius-control);background:var(--field);color:var(--text);padding:var(--space-2) var(--space-3);cursor:pointer}a{color:var(--os-accent)}${embedded ? "body{padding:var(--space-4)}.site-bar{display:none}" : ""}</style></head><body><header class="site-bar"><strong>${MSO_LOGO_SVG} MSO</strong><span>Your service connections</span></header><main id="setup" class="integration"><h1>Integrations</h1><p>Preparing the native provider catalog…</p><noscript>Enable JavaScript to open the secure credential form. Credentials can also be entered through the MSO terminal.</noscript></main><script nonce="${nonce}">const INTEGRATIONS_CATALOG=${catalog};${INTEGRATION_FORM_SCRIPT}${CONNECTION_MANAGER_SCRIPT}${PORTABILITY_SCRIPT}${INTEGRATION_BROWSER_SCRIPT}</script></body></html>`;
+ const html = `<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="referrer" content="no-referrer"><title>Integrations · MSO</title><style nonce="${nonce}">${MSO_WIDGET_TOKENS}${INTEGRATION_FORM_STYLE}${CONNECTION_MANAGER_STYLE}${PORTABILITY_STYLE}*{box-sizing:border-box}body{margin:0;background:var(--surface);padding:clamp(var(--space-4),3vw,40px);font-family:var(--font-body);color:var(--text)}.site-bar{max-width:1180px;margin:0 auto 26px;font-size:var(--type-small);display:flex;justify-content:space-between;gap:var(--space-3)}.site-bar strong{display:flex;align-items:center;gap:var(--space-3);font-weight:750}.site-bar svg{width:30px;height:30px}.site-bar span{color:var(--text-dim)}button{border:var(--stroke) solid var(--sep-strong);border-radius:var(--radius-control);background:var(--field);color:var(--text);padding:var(--space-2) var(--space-3);cursor:pointer}a{color:var(--os-accent)}${embedded ? "html,body{height:100%}body{padding:0;overflow:hidden}.site-bar{display:none}#setup{height:100%}" : ""}</style></head><body><header class="site-bar"><strong>${MSO_LOGO_SVG} MSO</strong><span>Your service connections</span></header><main id="setup" class="integration"><h1>Integrations</h1><p>Preparing the native provider catalog…</p><noscript>Enable JavaScript to open the secure credential form. Credentials can also be entered through the MSO terminal.</noscript></main><script nonce="${nonce}">const INTEGRATIONS_CATALOG=${catalog};${INTEGRATION_FORM_SCRIPT}${CONNECTION_MANAGER_SCRIPT}${PORTABILITY_SCRIPT}${INTEGRATION_BROWSER_SCRIPT}</script></body></html>`;
return { html, csp: `default-src 'none'; script-src 'nonce-${nonce}'; style-src 'nonce-${nonce}'; connect-src 'self'; form-action 'none'; base-uri 'none'; frame-ancestors ${embedded ? "'self'" : "'none'"}` };
}
function integrationResponse(embedded: boolean) {
diff --git a/package.json b/package.json
index 64a15615..d697e14d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "mso",
- "version": "0.2.12",
+ "version": "0.2.13",
"private": true,
"engines": {
"node": ">=20.9",
diff --git a/scripts/e2e/automation.mjs b/scripts/e2e/automation.mjs
index 2e75792d..b5dbcc95 100644
--- a/scripts/e2e/automation.mjs
+++ b/scripts/e2e/automation.mjs
@@ -34,8 +34,7 @@ export async function automationJourney(page, fixture) {
return {status:response.status,body:await response.json()};
}, [route,body]);
await page.goto(fixture.base + "/integrations");
- await page.getByLabel("More integration actions", {exact:true}).click();
- await page.getByRole("button", {name:"Add project MCP",exact:true}).click();
+ await page.getByRole("navigation", {name:"Integrations sections",exact:true}).getByRole("button", {name:"Add project MCP",exact:true}).click();
await page.getByLabel("Project id or path").fill(project);
await page.getByLabel("Server alias", {exact:true}).fill("public-fixture");
await page.getByLabel("HTTPS MCP endpoint").fill("https://example.com/mcp");
diff --git a/scripts/e2e/integrations-shell.mjs b/scripts/e2e/integrations-shell.mjs
index 68a5d5f0..3f9ff450 100644
--- a/scripts/e2e/integrations-shell.mjs
+++ b/scripts/e2e/integrations-shell.mjs
@@ -19,11 +19,11 @@ try {
await launcher.click();
await expect(page).toHaveURL(fixture.base + "/connections");
const frame = page.frameLocator('iframe[title="MSO native Integrations manager"]');
- await expect(frame.getByRole("heading", { name: "Integrations", level: 1, exact: true })).toBeVisible();
+ await expect(frame.getByRole("heading", { name: "GitHub", level: 2, exact: true })).toBeVisible();
await expect(frame.getByRole("link", { name: "Sign in to MSO as Owner" })).toBeVisible();
expect(await page.evaluate(() => document.documentElement.scrollWidth <= innerWidth + 1)).toBe(true);
await page.reload();
- await expect(frame.getByRole("heading", { name: "Integrations", level: 1, exact: true })).toBeVisible();
+ await expect(frame.getByRole("heading", { name: "GitHub", level: 2, exact: true })).toBeVisible();
const response = await context.request.get(fixture.base + "/integrations/manager");
expect(response.headers()["x-frame-options"]).toBe("SAMEORIGIN");
expect(response.headers()["content-security-policy"]).toContain("frame-ancestors 'self'");
diff --git a/scripts/e2e/integrations.mjs b/scripts/e2e/integrations.mjs
index e49d95f3..5ef7234e 100644
--- a/scripts/e2e/integrations.mjs
+++ b/scripts/e2e/integrations.mjs
@@ -33,9 +33,10 @@ try{
});
await page.goto("https://mso.example.com/integrations");
await waitDelivery("initial");
- const accountTools=page.getByLabel("More integration actions",{exact:true});
- const expandTools=async()=>{if(!await accountTools.evaluate(el=>el.parentElement.open))await accountTools.click()};
- await expandTools();
+ const nav=page.getByRole("navigation",{name:"Integrations sections",exact:true});
+ const mobileToggle=page.getByRole("button",{name:"Integrations sections",exact:true});
+ const openSidebar=async()=>{if(await mobileToggle.isVisible()){if(await mobileToggle.getAttribute("aria-expanded")!=="true")await mobileToggle.click();await nav.waitFor();}};
+ const closeSidebar=async()=>{if(await mobileToggle.isVisible()&&await mobileToggle.getAttribute("aria-expanded")==="true")await page.keyboard.press("Escape");};
assert.equal(await page.getByRole("combobox",{name:"Credential owner"}).count(),0,"credential owner must not use a native select popup");checks++;
for(const width of [320,390,768,1440,1920]){
await page.setViewportSize({width,height:900});
@@ -43,26 +44,27 @@ try{
await page.evaluate(theme=>document.documentElement.dataset.theme=theme,theme);
assert(await page.evaluate(()=>document.documentElement.scrollWidth<=innerWidth+1),"no document overflow at "+width+" "+theme);checks++;
assert(await page.getByRole("button",{name:"Update credentials",exact:true}).isVisible());checks++;
- for(const action of ["Credential owners","Project routing","Transfer & backup"])assert(await page.getByRole("button",{name:action,exact:true}).isVisible(),action+" must stay discoverable");checks++;
+ await openSidebar();for(const action of ["Credential owners","Project routing","Transfer & backup","Add project MCP"])assert(await nav.getByRole("button",{name:action,exact:true}).isVisible(),action+" must stay discoverable in the Settings-style sidebar");checks++;await closeSidebar();
}
}
await page.setViewportSize({width:1440,height:900});
+ await nav.getByRole("button",{name:"Transfer & backup",exact:true}).click();await page.getByRole("heading",{name:"Transfer & backup",exact:true}).waitFor();assert(await nav.isVisible(),"Settings-style sidebar remains visible inside Transfer & backup");checks++;await page.getByRole("button",{name:"← Connections",exact:true}).click();await waitDelivery("after inline Transfer & backup");
await page.getByRole("button",{name:"Verify",exact:true}).click();
await page.getByRole("status").filter({hasText:"Verified: Connected to GitHub"}).waitFor();checks++;
assert(await page.getByRole("button",{name:"Remove",exact:true}).isVisible(),"stored credential fields expose per-field removal");checks++;
const connectionCard=page.getByRole("article").filter({hasText:"Delivery GitHub"});await connectionCard.getByText("More",{exact:true}).click();assert(await connectionCard.getByRole("button",{name:"Copy to another owner",exact:true}).isVisible());await connectionCard.getByRole("button",{name:"Share linked access",exact:true}).click();await page.getByRole("heading",{name:"Share Delivery GitHub"}).waitFor();assert(await page.getByRole("group",{name:"Target credential owner"}).getByRole("button").isVisible());assert(await page.getByRole("textbox",{name:"New alias label",exact:true}).isVisible());checks++;await page.getByRole("button",{name:"Cancel",exact:true}).click();
- await expandTools();
+ await openSidebar();
const owner=page.getByRole("group",{name:"Credential owner"}).getByRole("button");await owner.focus();await owner.press("ArrowDown");await page.getByRole("option",{name:/Studio/}).waitFor();await page.getByRole("option",{name:/Studio/}).press("ArrowDown");await page.getByRole("option",{name:/Personal/}).press("Enter");
await page.getByRole("button",{name:"Add GitHub account",exact:true}).waitFor();assert.equal(await page.getByRole("heading",{name:"Delivery GitHub"}).count(),0);checks++;
- await expandTools();await owner.click();await page.getByRole("option",{name:/Studio/}).click();await waitDelivery("after owner switch back to Studio");checks++;
- await expandTools();await page.getByRole("button",{name:"Credential owners",exact:true}).click();await page.getByRole("textbox",{name:"New user ID",exact:true}).fill("client-a");await page.getByRole("textbox",{name:"Display label",exact:true}).fill("Client A");await page.getByRole("button",{name:"Create user",exact:true}).click();await page.getByRole("group",{name:"Credential owner"}).getByRole("button").filter({hasText:/Client A/}).waitFor();checks++;
- await expandTools();await page.getByRole("button",{name:"Credential owners",exact:true}).click();await page.getByRole("textbox",{name:"Target user ID",exact:true}).fill("client-main");await page.getByRole("textbox",{name:"New display label",exact:true}).fill("Client Main");await page.getByRole("button",{name:"Rename user",exact:true}).click();await page.getByRole("group",{name:"Credential owner"}).getByRole("button").filter({hasText:/Client Main/}).waitFor();checks++;
- await expandTools();await page.getByRole("button",{name:"Credential owners",exact:true}).click();await page.getByRole("textbox",{name:"Target user ID",exact:true}).fill("client-copy");await page.getByRole("textbox",{name:"New display label",exact:true}).fill("Client Copy");await page.getByRole("button",{name:"Duplicate user",exact:true}).click();await page.getByRole("group",{name:"Credential owner"}).getByRole("button").filter({hasText:/Client Copy/}).waitFor();checks++;
- await expandTools();await page.getByRole("button",{name:"Credential owners",exact:true}).click();await page.getByRole("button",{name:"Delete user",exact:true}).click();await page.getByRole("textbox",{name:"Confirmation",exact:true}).fill("client-copy");await page.getByRole("button",{name:"Confirm",exact:true}).click();await page.getByRole("group",{name:"Credential owner"}).getByRole("button").waitFor();assert.equal(users.some(row=>row.id==="client-copy"),false);checks++;
- await expandTools();await owner.click();await page.getByRole("option",{name:/Studio/}).click();await waitDelivery("after user CRUD returns to Studio");
+ await openSidebar();await owner.click();await page.getByRole("option",{name:/Studio/}).click();await waitDelivery("after owner switch back to Studio");checks++;
+ await openSidebar();await page.getByRole("button",{name:"Credential owners",exact:true}).click();await page.getByRole("textbox",{name:"New user ID",exact:true}).fill("client-a");await page.getByRole("textbox",{name:"Display label",exact:true}).fill("Client A");await page.getByRole("button",{name:"Create user",exact:true}).click();await page.getByRole("group",{name:"Credential owner"}).getByRole("button").filter({hasText:/Client A/}).waitFor();checks++;
+ await openSidebar();await page.getByRole("button",{name:"Credential owners",exact:true}).click();await page.getByRole("textbox",{name:"Target user ID",exact:true}).fill("client-main");await page.getByRole("textbox",{name:"New display label",exact:true}).fill("Client Main");await page.getByRole("button",{name:"Rename user",exact:true}).click();await page.getByRole("group",{name:"Credential owner"}).getByRole("button").filter({hasText:/Client Main/}).waitFor();checks++;
+ await openSidebar();await page.getByRole("button",{name:"Credential owners",exact:true}).click();await page.getByRole("textbox",{name:"Target user ID",exact:true}).fill("client-copy");await page.getByRole("textbox",{name:"New display label",exact:true}).fill("Client Copy");await page.getByRole("button",{name:"Duplicate user",exact:true}).click();await page.getByRole("group",{name:"Credential owner"}).getByRole("button").filter({hasText:/Client Copy/}).waitFor();checks++;
+ await openSidebar();await page.getByRole("button",{name:"Credential owners",exact:true}).click();await page.getByRole("button",{name:"Delete user",exact:true}).click();await page.getByRole("textbox",{name:"Confirmation",exact:true}).fill("client-copy");await page.getByRole("button",{name:"Confirm",exact:true}).click();await page.getByRole("group",{name:"Credential owner"}).getByRole("button").waitFor();assert.equal(users.some(row=>row.id==="client-copy"),false);checks++;
+ await openSidebar();await owner.click();await page.getByRole("option",{name:/Studio/}).click();await nav.getByRole("button",{name:"GitHub",exact:true}).click();await waitDelivery("after user CRUD returns to Studio and selects GitHub");
await page.getByRole("button",{name:"Add GitHub account",exact:true}).count();
- await page.getByRole("searchbox",{name:"Search services"}).fill("cloudflare");assert.equal(await page.getByRole("navigation",{name:"Services"}).getByRole("button",{includeHidden:true}).count(),14);assert.equal(await page.getByRole("navigation",{name:"Services"}).getByRole("button").filter({visible:true}).count(),1);checks++;
- await page.getByRole("searchbox",{name:"Search services"}).fill("");
+ await page.getByRole("searchbox",{name:"Search integrations"}).fill("cloudflare");assert.equal(await page.locator(".integration-nav-group").first().getByRole("button",{includeHidden:true}).count(),14);assert.equal(await page.locator(".integration-nav-group").first().getByRole("button").filter({visible:true}).count(),1);checks++;
+ await page.getByRole("searchbox",{name:"Search integrations"}).fill("");
assert.deepEqual(errors,[]);checks++;
- console.log("Integrations browser: "+checks+" checks passed (320–1920 px, light/dark, semantic owner picker, user CRUD, search, setup, verification).");
+ console.log("Integrations browser: "+checks+" checks passed (Settings-style sidebar/detail, 320–1920 px, mobile drawer, light/dark, inline transfer, user CRUD).");
}finally{await browser.close()}
diff --git a/scripts/e2e/mcp-page.mjs b/scripts/e2e/mcp-page.mjs
index 5ad2f1fb..ba196168 100644
--- a/scripts/e2e/mcp-page.mjs
+++ b/scripts/e2e/mcp-page.mjs
@@ -107,7 +107,7 @@ try {
</script><iframe title="MSO Page" src="https://mso-ui.example.com/qa"></iframe></html>`}));
await page.goto("https://chatgpt.com/qa");
const component=page.frameLocator("iframe"),surface=component.locator(".surface"),body=component.locator("#surface-body");
- await component.getByLabel("More integration actions",{exact:true}).waitFor();
+ await component.getByRole("navigation",{name:"Integrations sections",exact:true}).waitFor();
await page.waitForFunction(()=>window.lastSize?.height===680);
assert.equal(await surface.evaluate(el=>el.getBoundingClientRect().height),680);assertions++;
assert.equal(await component.locator("html").getAttribute("data-theme"),"dark");assertions++;
@@ -139,9 +139,9 @@ try {
await setContext({theme:"light",containerDimensions:{height:200},styles:{variables:{"--font-family":"system-ui","--font-text-md-size":"18px","--font-text-sm-size":"16px","--border-radius-sm":"3px","--color-background-primary":"#ffffff","--color-text-primary":"#151515"}}});
await page.setViewportSize({width:320,height:900});
assert(await body.evaluate(el=>el.clientHeight>=130),"tiny embed keeps a usable scroll area");assertions++;
- assert.equal(await component.getByRole("combobox",{name:"Service",exact:true}).evaluate(el=>getComputedStyle(el).fontSize),"16px");assertions++;
- assert.equal(await component.getByRole("combobox",{name:"Service",exact:true}).evaluate(el=>getComputedStyle(el).borderRadius),"3px");assertions++;
- await component.getByRole("combobox",{name:"Service",exact:true}).selectOption("cloudflare");
+ const mobileSections=component.getByRole("button",{name:"Integrations sections",exact:true});assert.equal(await mobileSections.evaluate(el=>getComputedStyle(el).fontSize),"16px");assertions++;
+ assert.equal(await mobileSections.evaluate(el=>getComputedStyle(el).borderRadius),"3px");assertions++;
+ await mobileSections.click();await component.getByRole("navigation",{name:"Integrations sections",exact:true}).getByRole("button",{name:"Cloudflare",exact:true}).click();
await component.getByRole("heading",{name:"Cloudflare",exact:true}).waitFor();assertions++;
if(imageDir)await saveScreenshot("mso-page-320x200.png");
await component.getByRole("combobox",{name:"MSO page",exact:true}).selectOption("/monitor");
@@ -153,8 +153,7 @@ try {
await component.getByRole("combobox",{name:"MSO page",exact:true}).selectOption("/integrations");
await setContext({theme:"dark",containerDimensions:{height:680},styles:{variables:{}}});
await page.setViewportSize({width:736,height:900});
- await component.getByLabel("More integration actions",{exact:true}).click();
- await component.getByRole("button",{name:"Add project MCP",exact:true}).click();
+ await component.getByRole("navigation",{name:"Integrations sections",exact:true}).getByRole("button",{name:"Add project MCP",exact:true}).click();
await component.getByRole("heading",{name:"Add MCP to project",exact:true}).waitFor();
if(imageDir)await saveScreenshot("mso-page-add-mcp.png");
const audit=await new AxeBuilder({page}).withTags(["wcag2a","wcag2aa","wcag21aa"]).analyze();
diff --git a/scripts/e2e/release.mjs b/scripts/e2e/release.mjs
index c28546cd..6e54a704 100644
--- a/scripts/e2e/release.mjs
+++ b/scripts/e2e/release.mjs
@@ -19,9 +19,10 @@ try {
const errors = [];
page.on("pageerror", error => errors.push(error.message));
await page.goto(fixture.base + "/integrations");
- await expect(page.getByRole("heading", { name: "Integrations", exact: true, level: 1 })).toBeVisible();
- if (viewport.width < 600) await page.getByRole("combobox", { name: "Service", exact: true }).selectOption("github");
- else {await page.getByLabel("Search services").fill("GitHub");await page.getByRole("button", { name:"GitHub", exact:true }).click();}
+ await expect(page.getByRole("navigation", { name: "Integrations sections", exact: true })).toBeVisible();
+ await expect(page.getByRole("heading", { name: "GitHub", exact: true, level: 2 })).toBeVisible();
+ if (viewport.width < 600) {await page.getByRole("button", { name: "Integrations sections", exact: true }).click();await page.getByRole("navigation", { name: "Integrations sections", exact: true }).getByRole("button", { name:"GitHub", exact:true }).click();}
+ else {await page.getByLabel("Search integrations").fill("GitHub");await page.getByRole("navigation", { name: "Integrations sections", exact: true }).getByRole("button", { name:"GitHub", exact:true }).click();}
await expect(page.getByRole("heading", {name:"GitHub", exact:true})).toBeVisible();
await page.getByText("Connection methods & setup guides", { exact: true }).click();
await expect(page.getByRole("link", { name: "Official setup page" }).first()).toBeVisible();
@@ -79,9 +80,8 @@ try {
await page.locator('input[type="password"]').fill(fixture.password);
await page.getByRole("button", { name: "Unlock", exact: true }).click();
await expect(page).toHaveURL(fixture.base + "/integrations");
- await page.getByLabel("More integration actions", {exact:true}).click();
await expect(page.getByRole("group", { name: "Credential owner" }).getByRole("button")).toContainText("fixture");
- await page.getByRole("button", { name: "Transfer & backup", exact: true }).click();
+ await page.getByRole("navigation", { name: "Integrations sections", exact: true }).getByRole("button", { name: "Transfer & backup", exact: true }).click();
await expect(page.getByRole("heading", { name: "Transfer & backup", exact: true })).toBeVisible();
await expect(page.getByLabel("Export scope")).toHaveValue("all");
await page.getByLabel("Export scope").selectOption("custom");