@linxin666/dsh-remote-web-ui 0.3.0 → 0.3.2

package/lib/types/client/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/client/index.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAA;AAa7G,OAAO,EAAU,KAAK,SAAS,EAAE,MAAM,cAAc,CAAA;AAarD,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACzD,YAAY,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACrE,YAAY,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AACnE,YAAY,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAC7C,YAAY,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAA;AAC/F,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACzD,YAAY,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAErE,OAAO,QAAQ,kCAAkC,CAAC;IAChD,UAAU,kBAAkB;QAC1B,0CAA0C;QAC1C,MAAM,EAAE,SAAS,CAAA;KAClB;IAED,UAAU,OAAO;QACf;;;;WAIG;QACH,gBAAgB,EAAE;YAAE,IAAI,EAAE,QAAQ,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,uBAAuB,CAAA;SAAE,CAAA;QACnF;;;;;WAKG;QACH,oBAAoB,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,4BAA4B,CAAA;SAAE,CAAA;KAC3F;CACF;AAED,4GAA4G;AAC5G,MAAM,WAAW,uBAAuB;IACtC,oEAAoE;IACpE,IAAI,EAAE,OAAO,CAAA;CACd;AAED,mEAAmE;AACnE,MAAM,WAAW,4BAA4B;IAC3C,8DAA8D;IAC9D,QAAQ,CAAC,EAAE,KAAK,CAAA;CACjB;AAED,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf;;;;WAIG;QACH,aAAa,CAAC,EAAE;YAAE,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA;SAAE,CAAA;KAC1E;CACF;AAYD,wCAAwC;AACxC,eAAO,MAAM,MAAM,UAA+D,CAAA;AAElF;;;GAGG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,aAAa,GAAG,IAAI,CAkN9C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/client/index.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAA;AAa7G,OAAO,EAAU,KAAK,SAAS,EAAE,MAAM,cAAc,CAAA;AAarD,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACzD,YAAY,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACrE,YAAY,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AACnE,YAAY,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAC7C,YAAY,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAA;AAC/F,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACzD,YAAY,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAErE,OAAO,QAAQ,kCAAkC,CAAC;IAChD,UAAU,kBAAkB;QAC1B,0CAA0C;QAC1C,MAAM,EAAE,SAAS,CAAA;KAClB;IAED,UAAU,OAAO;QACf;;;;WAIG;QACH,gBAAgB,EAAE;YAAE,IAAI,EAAE,QAAQ,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,uBAAuB,CAAA;SAAE,CAAA;QACnF;;;;;WAKG;QACH,oBAAoB,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,4BAA4B,CAAA;SAAE,CAAA;KAC3F;CACF;AAED,4GAA4G;AAC5G,MAAM,WAAW,uBAAuB;IACtC,oEAAoE;IACpE,IAAI,EAAE,OAAO,CAAA;CACd;AAED,mEAAmE;AACnE,MAAM,WAAW,4BAA4B;IAC3C,8DAA8D;IAC9D,QAAQ,CAAC,EAAE,KAAK,CAAA;CACjB;AAED,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf;;;;WAIG;QACH,aAAa,CAAC,EAAE;YAAE,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA;SAAE,CAAA;KAC1E;CACF;AAYD,wCAAwC;AACxC,eAAO,MAAM,MAAM,UAA+D,CAAA;AAElF;;;GAGG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,aAAa,GAAG,IAAI,CAoO9C"}

package/lib/types/client/index.js

@@ -30,7 +30,14 @@ export const inject = ['slots', 'locale', 'connection', 'settingsScope', 'remote
  * @param ctx - client root context.
  */
 export function apply(ctx) {
-    ctx.effect(() => ctx.locale.register(NS, { zh, en }), 'remote-web-ui: dictionaries');
+    ctx.effect(() => {
+        try {
+            return ctx.locale.register(NS, { zh, en });
+        }
+        catch {
+            return () => { };
+        }
+    }, 'remote-web-ui: dictionaries');
     const t = ctx.locale.bind(NS);
     const binder = ctx.get('webUiSettings') ?? ctx.settingsScope;
     const settingsScope = binder.bind({ namespace: REMOTE_WEB_UI_NS });
@@ -49,7 +56,12 @@ export function apply(ctx) {
         let disposeEntry;
         const syncEntry = () => {
             if (enabled() && disposeEntry === undefined) {
-                disposeEntry = ctx.slots.register({ name: 'sidebar.remote', locale: NS }, RemoteEntry);
+                try {
+                    disposeEntry = ctx.slots.register({ name: 'sidebar.remote', locale: NS }, RemoteEntry);
+                }
+                catch {
+                    // ignore registration collision
+                }
             }
             else if (!enabled() && disposeEntry !== undefined) {
                 disposeEntry();
@@ -71,7 +83,12 @@ export function apply(ctx) {
         let disposeEntry;
         const syncEntry = () => {
             if (enabled() && disposeEntry === undefined) {
-                disposeEntry = ctx.slots.register({ name: 'sidebar.footer.action', id: 'remote-web-ui', locale: NS }, FooterRemoteEntry);
+                try {
+                    disposeEntry = ctx.slots.register({ name: 'sidebar.footer.action', id: 'remote-web-ui', locale: NS }, FooterRemoteEntry);
+                }
+                catch {
+                    // ignore registration collision
+                }
             }
             else if (!enabled() && disposeEntry !== undefined) {
                 disposeEntry();
@@ -89,17 +106,22 @@ export function apply(ctx) {
     // settings namespace, contributed to the Web UI plugin group.
     const remoteSettings = new RemoteSettingsCardController(settingsScope);
     ctx.slots.inject('web-ui.plugin.item', () => {
-        const unregister = ctx.slots.register({
-            name: 'web-ui.plugin.item',
-            id: 'remote-web-ui',
-            order: 90,
-            locale: NS,
-            inject: () => remoteSettings.inject(),
-        }, RemoteSettingsCard);
-        return () => {
-            remoteSettings.dispose();
-            unregister();
-        };
+        try {
+            const unregister = ctx.slots.register({
+                name: 'web-ui.plugin.item',
+                id: 'remote-web-ui',
+                order: 90,
+                locale: NS,
+                inject: () => remoteSettings.inject(),
+            }, RemoteSettingsCard);
+            return () => {
+                remoteSettings.dispose();
+                unregister();
+            };
+        }
+        catch {
+            return () => { };
+        }
     });
     // Phone-side boot flow + heartbeats. Loopback pages (the desktop) never
     // heartbeat; the server ignores unpaired heartbeats anyway. Both run only

package/lib/types/mobile/views/WorkspaceView.js

@@ -47,7 +47,7 @@ function DirectoryBrowser({ onCancel, onPick }) {
             setError(errorText(reason));
         }
     };
-    return (_jsxs("div", { className: "mobile dir-browser", children: [_jsxs("header", { className: "mobile-header", children: [_jsx("button", { type: "button", className: "mobile-headerAction", onClick: onCancel, children: "\u8FD4\u56DE" }), _jsx("h1", { className: "mobile-title", children: "\u9009\u62E9\u76EE\u5F55" })] }), listing !== undefined && (_jsx("div", { className: "dir-crumbs", children: listing.crumbs.map((crumb, idx) => (_jsxs("span", { children: [_jsx("button", { type: "button", className: "dir-crumb", onClick: () => setPath(crumb.path), children: crumb.name || '/' }), idx < listing.crumbs.length - 1 && _jsx("span", { className: "dir-crumb-separator", children: "/" })] }, crumb.path))) })), error !== undefined ? (_jsxs("div", { className: "mobile-empty", children: [_jsx("p", { className: "mobile-error", children: error }), _jsx("button", { type: "button", className: "mobile-button", onClick: () => setReload(n => n + 1), children: "\u91CD\u8BD5" })] })) : listing === undefined ? (_jsx("div", { className: "mobile-empty", children: _jsx("p", { className: "mobile-muted", children: "\u52A0\u8F7D\u4E2D\u2026" }) })) : (_jsx("ul", { className: "mobile-list", children: listing.entries.length === 0 ? (_jsx("div", { className: "mobile-empty dir-empty", children: _jsx("p", { className: "mobile-muted", children: "\u7A7A\u76EE\u5F55" }) })) : (listing.entries.map((entry) => (_jsx("li", { children: _jsx("button", { type: "button", className: `mobile-row dir-entry ${entry.hidden ? 'dir-entry-hidden' : ''}`, onClick: () => setPath(entry.path), children: _jsxs("span", { className: "mobile-rowTitle", children: ["\uD83D\uDCC1 ", entry.name] }) }) }, entry.path)))) })), _jsx("div", { className: "dir-select", children: _jsx("button", { type: "button", className: "mobile-button", disabled: listing === undefined || creating, onClick: () => void handleCreate(), children: creating ? '创建中…' : '选择此目录' }) })] }));
+    return (_jsxs("div", { className: "mobile dir-browser", children: [_jsxs("header", { className: "mobile-header", children: [_jsx("button", { type: "button", className: "mobile-headerAction", onClick: onCancel, children: "\u8FD4\u56DE" }), _jsx("h1", { className: "mobile-title", children: "\u9009\u62E9\u76EE\u5F55" })] }), listing !== undefined && (_jsx("div", { className: "dir-crumbs", children: listing.crumbs.map((crumb, idx) => (_jsxs("span", { children: [_jsx("button", { type: "button", className: "dir-crumb", onClick: () => setPath(crumb.path), children: crumb.name || '/' }), idx < listing.crumbs.length - 1 && _jsx("span", { className: "dir-crumb-separator", children: "/" })] }, crumb.path))) })), error !== undefined ? (_jsxs("div", { className: "mobile-empty", children: [_jsx("p", { className: "mobile-error", children: error }), _jsx("button", { type: "button", className: "mobile-button", onClick: () => setReload(n => n + 1), children: "\u91CD\u8BD5" })] })) : listing === undefined ? (_jsx("div", { className: "mobile-empty", children: _jsx("p", { className: "mobile-muted", children: "\u52A0\u8F7D\u4E2D\u2026" }) })) : (_jsx("ul", { className: "mobile-list", children: listing.entries.length === 0 ? (_jsx("div", { className: "mobile-empty dir-empty", children: _jsx("p", { className: "mobile-muted", children: "\u7A7A\u76EE\u5F55" }) })) : (listing.entries.map((entry) => (_jsx("li", { children: _jsx("button", { type: "button", className: `mobile-row dir-entry ${entry.hidden ? 'dir-entry-hidden' : ''}`, onClick: () => setPath(entry.path), children: _jsx("span", { className: "mobile-rowTitle", children: entry.name }) }) }, entry.path)))) })), _jsx("div", { className: "dir-select", children: _jsx("button", { type: "button", className: "mobile-button", disabled: listing === undefined || creating, onClick: () => void handleCreate(), children: creating ? '创建中…' : '选择此目录' }) })] }));
 }
 /**
  * Render the workspace roster.

package/lib/types/mobile/views/WorkspaceView.test.js

@@ -82,8 +82,8 @@ describe('mobile workspace creation', () => {
         // Verify crumbs
         expect(await screen.findByText('user')).toBeTruthy();
         // Verify entries
-        expect(await screen.findByText('📁 projects')).toBeTruthy();
-        expect(await screen.findByText('📁 .config')).toBeTruthy();
+        expect(await screen.findByText('projects')).toBeTruthy();
+        expect(await screen.findByText('.config')).toBeTruthy();
     });
     it('navigates into directory and allows breadcrumb navigation', async () => {
         listWorkspacesMock.mockResolvedValue(workspaces);
@@ -100,7 +100,7 @@ describe('mobile workspace creation', () => {
         // Open dir browser
         fireEvent.click(await screen.findByText('+ 新建工作区'));
         // Wait for first dir listing
-        const projBtn = await screen.findByText('📁 projects');
+        const projBtn = await screen.findByText('projects');
         // Prepare next listing
         listDirectoryMock.mockResolvedValueOnce({
             path: '/home/user/projects',
@@ -117,7 +117,7 @@ describe('mobile workspace creation', () => {
         // Click into folder
         fireEvent.click(projBtn);
         // Verify new contents load
-        expect(await screen.findByText('📁 foo')).toBeTruthy();
+        expect(await screen.findByText('foo')).toBeTruthy();
         // Check breadcrumb
         const homeCrumb = screen.getByText('home');
         expect(homeCrumb).toBeTruthy();
@@ -130,7 +130,7 @@ describe('mobile workspace creation', () => {
             truncated: false
         });
         fireEvent.click(homeCrumb);
-        expect(await screen.findByText('📁 user')).toBeTruthy();
+        expect(await screen.findByText('user')).toBeTruthy();
     });
     it('creates workspace successfully', async () => {
         listWorkspacesMock.mockResolvedValue(workspaces);

package/lib/types/paired-model-catalog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paired-model-catalog.d.ts","sourceRoot":"","sources":["../../src/paired-model-catalog.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAiE,MAAM,oCAAoC,CAAA;AACjI,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAA;AAE/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AA6BlD,eAAO,MAAM,0BAA0B;;;;CAI7B,CAAA;AAEV,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,cAAc,CAAA;IACvB,QAAQ,EAAE,QAAQ,CAAA;IAClB,iFAAiF;IACjF,YAAY,EAAE,SAAS,MAAM,EAAE,CAAA;CAChC;AAsGD,2DAA2D;AAC3D,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,sBAAsB,GAAG,QAAQ,EAAE,CA2ErF"}
+{"version":3,"file":"paired-model-catalog.d.ts","sourceRoot":"","sources":["../../src/paired-model-catalog.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAqF,MAAM,oCAAoC,CAAA;AACrJ,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAA;AAE/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AA6BlD,eAAO,MAAM,0BAA0B;;;;CAI7B,CAAA;AAEV,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,cAAc,CAAA;IACvB,QAAQ,EAAE,QAAQ,CAAA;IAClB,iFAAiF;IACjF,YAAY,EAAE,SAAS,MAAM,EAAE,CAAA;CAChC;AAsJD,2DAA2D;AAC3D,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,sBAAsB,GAAG,QAAQ,EAAE,CA2ErF"}

package/lib/types/paired-model-catalog.js

@@ -67,7 +67,11 @@ function fieldsOf(model, includeId) {
         fields.reasoningEfforts = Object.fromEntries(model.reasoningEfforts.map(effort => [effort, effort === 'off' ? null : effort]));
     return fields;
 }
-function groupFor(catalog, provider) { return catalog.groups.find(group => group.id === provider); }
+function groupFor(catalog, provider) {
+    if (catalog.failures.some(failure => failure.id === provider))
+        return undefined;
+    return catalog.groups.find(group => group.id === provider);
+}
 async function readCatalog(apiProxy) {
     try {
         return valueOf(await apiProxy.llm.models(request({})));
@@ -105,29 +109,84 @@ async function eligibleProvider(apiProxy, requested) {
         return { status: 403, error: `provider ${requested} is not eligible for the paired model catalog` };
     return { provider: { provider: requested, displayName: route.displayName, namespace, profile } };
 }
+function validIdentifier(value) {
+    const parsed = stringField(MAX_IDENTIFIER_LENGTH).safeParse(value);
+    return parsed.success && parsed.data === value;
+}
+function configuredModels(profile) {
+    if (!Object.hasOwn(profile, 'models'))
+        return { inherited: true };
+    if (!Array.isArray(profile.models))
+        return undefined;
+    if (profile.models.length === 0)
+        return { inherited: true };
+    const values = [];
+    for (const entry of profile.models) {
+        if (!isRecord(entry) || !validIdentifier(entry.id))
+            return undefined;
+        values.push({ ...entry });
+    }
+    return { inherited: false, values };
+}
+function configuredOverrides(profile) {
+    if (!Object.hasOwn(profile, 'modelOverrides'))
+        return { present: false, values: new Map() };
+    if (!isRecord(profile.modelOverrides))
+        return undefined;
+    const values = new Map();
+    for (const [id, value] of Object.entries(profile.modelOverrides)) {
+        if (!validIdentifier(id) || !isRecord(value))
+            return undefined;
+        values.set(id, { ...value });
+    }
+    return { present: true, values };
+}
 function updatedModels(existing, model) {
-    const next = existing.map(entry => isRecord(entry) ? { ...entry } : entry);
-    const index = next.findIndex(entry => isRecord(entry) && entry.id === model.id);
+    const next = existing.map(entry => ({ ...entry }));
+    const index = next.findIndex(entry => entry.id === model.id);
     const patch = fieldsOf(model, true);
-    if (index >= 0 && isRecord(next[index]))
+    if (index >= 0)
         next[index] = { ...next[index], ...patch };
     else
         next.push(patch);
     return next;
 }
 function mutationPlan(profile, provider, model, catalog) {
-    if (Array.isArray(profile.models))
-        return { path: ['providers', provider, 'models'], value: updatedModels(profile.models, model) };
+    const configured = configuredModels(profile);
+    const overrides = configuredOverrides(profile);
+    if (configured === undefined || overrides === undefined)
+        return undefined;
+    const modelsPath = ['providers', provider, 'models'];
+    const overridesPath = ['providers', provider, 'modelOverrides'];
+    if (!configured.inherited) {
+        if (overrides.values.size > 0)
+            return undefined;
+        const ops = [{ op: 'set', path: modelsPath, value: updatedModels(configured.values, model) }];
+        if (overrides.present)
+            ops.push({ op: 'unset', path: overridesPath });
+        return { ops };
+    }
     const group = groupFor(catalog, provider);
     if (group?.models.some(entry => entry.id === model.id) === true) {
-        const overrides = isRecord(profile.modelOverrides) ? profile.modelOverrides : undefined;
-        const current = overrides?.[model.id];
-        const existing = isRecord(current) ? current : {};
-        return { path: ['providers', provider, 'modelOverrides', model.id], value: { ...existing, ...fieldsOf(model, false) } };
+        const existing = overrides.values.get(model.id) ?? {};
+        return { ops: [{ op: 'set', path: [...overridesPath, model.id], value: { ...existing, ...fieldsOf(model, false) } }] };
     }
-    if (group === undefined || catalog.failures.some(failure => failure.id === provider))
+    if (group === undefined)
         return undefined;
-    return { path: ['providers', provider, 'models'], value: [...group.models.map(entry => ({ id: entry.id })), fieldsOf(model, true)] };
+    const materialized = [];
+    const materializedIds = new Set();
+    for (const installed of group.models) {
+        materialized.push({ ...overrides.values.get(installed.id), id: installed.id });
+        materializedIds.add(installed.id);
+    }
+    for (const [id, override] of overrides.values) {
+        if (!materializedIds.has(id))
+            materialized.push({ ...override, id });
+    }
+    const ops = [{ op: 'set', path: modelsPath, value: updatedModels(materialized, model) }];
+    if (overrides.present)
+        ops.push({ op: 'unset', path: overridesPath });
+    return { ops };
 }
 function paired(req, service) {
     const deviceId = readCookie(req.headers.cookie, service.config.cookieName);
@@ -227,7 +286,7 @@ export function makePairedModelCatalogRoutes(deps) {
             return reject(res, 502, `model catalog is unavailable for provider ${body.provider}`);
         let mutation;
         try {
-            mutation = await apiProxy.settings.mutate(request({ ns: 'llm-pi-ai', expectedRevision: eligible.provider.namespace.revision, ops: [{ op: 'set', path: plan.path, value: plan.value }] }));
+            mutation = await apiProxy.settings.mutate(request({ ns: 'llm-pi-ai', expectedRevision: eligible.provider.namespace.revision, ops: plan.ops }));
         }
         catch {
             return reject(res, 502, `model update failed for provider ${body.provider}`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@linxin666/dsh-remote-web-ui",
   "description": "Scan-to-pair mobile and PC remote control for the dsh web GUI: QR entry beside the settings button, one-time pairing tokens, a gated /remote/api desktop channel, live device status, and revocable sessions",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "type": "module",
   "engines": {
     "node": "^22.19.0 || >=24.0.0"

package/src/client/index.ts

@@ -106,7 +106,13 @@ export const inject = ['slots', 'locale', 'connection', 'settingsScope', 'remote
  * @param ctx - client root context.
  */
 export function apply(ctx: ClientContext): void {
-  ctx.effect(() => ctx.locale.register(NS, { zh, en }), 'remote-web-ui: dictionaries')
+  ctx.effect(() => {
+    try {
+      return ctx.locale.register(NS, { zh, en })
+    } catch {
+      return () => {}
+    }
+  }, 'remote-web-ui: dictionaries')
 
   const t = ctx.locale.bind(NS)
   const binder = ctx.get('webUiSettings') ?? ctx.settingsScope
@@ -127,7 +133,11 @@ export function apply(ctx: ClientContext): void {
     let disposeEntry: (() => void) | undefined
     const syncEntry = (): void => {
       if (enabled() && disposeEntry === undefined) {
-        disposeEntry = ctx.slots.register({ name: 'sidebar.remote', locale: NS }, RemoteEntry)
+        try {
+          disposeEntry = ctx.slots.register({ name: 'sidebar.remote', locale: NS }, RemoteEntry)
+        } catch {
+          // ignore registration collision
+        }
       } else if (!enabled() && disposeEntry !== undefined) {
         disposeEntry()
         disposeEntry = undefined
@@ -149,7 +159,11 @@ export function apply(ctx: ClientContext): void {
     let disposeEntry: (() => void) | undefined
     const syncEntry = (): void => {
       if (enabled() && disposeEntry === undefined) {
-        disposeEntry = ctx.slots.register({ name: 'sidebar.footer.action', id: 'remote-web-ui', locale: NS }, FooterRemoteEntry)
+        try {
+          disposeEntry = ctx.slots.register({ name: 'sidebar.footer.action', id: 'remote-web-ui', locale: NS }, FooterRemoteEntry)
+        } catch {
+          // ignore registration collision
+        }
       } else if (!enabled() && disposeEntry !== undefined) {
         disposeEntry()
         disposeEntry = undefined
@@ -167,16 +181,20 @@ export function apply(ctx: ClientContext): void {
   // settings namespace, contributed to the Web UI plugin group.
   const remoteSettings = new RemoteSettingsCardController(settingsScope)
   ctx.slots.inject('web-ui.plugin.item', () => {
-    const unregister = ctx.slots.register({
-      name: 'web-ui.plugin.item',
-      id: 'remote-web-ui',
-      order: 90,
-      locale: NS,
-      inject: () => remoteSettings.inject(),
-    }, RemoteSettingsCard)
-    return () => {
-      remoteSettings.dispose()
-      unregister()
+    try {
+      const unregister = ctx.slots.register({
+        name: 'web-ui.plugin.item',
+        id: 'remote-web-ui',
+        order: 90,
+        locale: NS,
+        inject: () => remoteSettings.inject(),
+      }, RemoteSettingsCard)
+      return () => {
+        remoteSettings.dispose()
+        unregister()
+      }
+    } catch {
+      return () => {}
     }
   })
 

package/src/mobile/views/WorkspaceView.test.tsx

@@ -100,8 +100,8 @@ describe('mobile workspace creation', () => {
     expect(await screen.findByText('user')).toBeTruthy()
     
     // Verify entries
-    expect(await screen.findByText('📁 projects')).toBeTruthy()
-    expect(await screen.findByText('📁 .config')).toBeTruthy()
+    expect(await screen.findByText('projects')).toBeTruthy()
+    expect(await screen.findByText('.config')).toBeTruthy()
   })
 
   it('navigates into directory and allows breadcrumb navigation', async () => {
@@ -123,7 +123,7 @@ describe('mobile workspace creation', () => {
     fireEvent.click(await screen.findByText('+ 新建工作区'))
     
     // Wait for first dir listing
-    const projBtn = await screen.findByText('📁 projects')
+    const projBtn = await screen.findByText('projects')
 
     // Prepare next listing
     listDirectoryMock.mockResolvedValueOnce({
@@ -143,7 +143,7 @@ describe('mobile workspace creation', () => {
     fireEvent.click(projBtn)
 
     // Verify new contents load
-    expect(await screen.findByText('📁 foo')).toBeTruthy()
+    expect(await screen.findByText('foo')).toBeTruthy()
     
     // Check breadcrumb
     const homeCrumb = screen.getByText('home')
@@ -159,7 +159,7 @@ describe('mobile workspace creation', () => {
     })
     
     fireEvent.click(homeCrumb)
-    expect(await screen.findByText('📁 user')).toBeTruthy()
+    expect(await screen.findByText('user')).toBeTruthy()
   })
 
   it('creates workspace successfully', async () => {

package/src/mobile/views/WorkspaceView.tsx

@@ -104,7 +104,7 @@ function DirectoryBrowser({ onCancel, onPick }: DirectoryBrowserProps) {
                   className={`mobile-row dir-entry ${entry.hidden ? 'dir-entry-hidden' : ''}`}
                   onClick={() => setPath(entry.path)}
                 >
-                  <span className="mobile-rowTitle">📁 {entry.name}</span>
+                  <span className="mobile-rowTitle">{entry.name}</span>
                 </button>
               </li>
             ))

package/src/paired-model-catalog.ts

@@ -1,6 +1,6 @@
 /** Paired-only model discovery and adoption routes; generic privileged RPCs stay loopback-only. */
 import type { IncomingMessage, ServerResponse } from 'node:http'
-import type { ApiProxy, ModelProviderGroup, RpcId, RpcResponse, SettingsNamespaceView } from '@deepseek-ai/dsh-host-apiproxy/api'
+import type { ApiProxy, ModelProviderGroup, RpcId, RpcResponse, SettingsNamespaceView, SettingsPathOpView } from '@deepseek-ai/dsh-host-apiproxy/api'
 import type { WebRoute } from '@deepseek-ai/dsh-host-webserver'
 import { z } from 'zod'
 import type { PairingService } from './pairing.ts'
@@ -90,7 +90,10 @@ function fieldsOf(model: ModelProfile, includeId: boolean): Record<string, unkno
   if (model.reasoningEfforts !== undefined) fields.reasoningEfforts = Object.fromEntries(model.reasoningEfforts.map(effort => [effort, effort === 'off' ? null : effort]))
   return fields
 }
-function groupFor(catalog: CatalogValue, provider: string): ModelProviderGroup | undefined { return catalog.groups.find(group => group.id === provider) }
+function groupFor(catalog: CatalogValue, provider: string): ModelProviderGroup | undefined {
+  if (catalog.failures.some(failure => failure.id === provider)) return undefined
+  return catalog.groups.find(group => group.id === provider)
+}
 async function readCatalog(apiProxy: ApiProxy): Promise<CatalogValue | undefined> {
   try { return valueOf(await apiProxy.llm.models(request({}))) } catch { return undefined }
 }
@@ -117,25 +120,70 @@ async function eligibleProvider(apiProxy: ApiProxy, requested: string): Promise<
   if (namespace === undefined || profile === undefined) return { status: 403, error: `provider ${requested} is not eligible for the paired model catalog` }
   return { provider: { provider: requested, displayName: route.displayName, namespace, profile } }
 }
-function updatedModels(existing: unknown[], model: ModelProfile): unknown[] {
-  const next = existing.map(entry => isRecord(entry) ? { ...entry } : entry)
-  const index = next.findIndex(entry => isRecord(entry) && entry.id === model.id)
+function validIdentifier(value: unknown): value is string {
+  const parsed = stringField(MAX_IDENTIFIER_LENGTH).safeParse(value)
+  return parsed.success && parsed.data === value
+}
+function configuredModels(profile: Record<string, unknown>): { inherited: true } | { inherited: false, values: Record<string, unknown>[] } | undefined {
+  if (!Object.hasOwn(profile, 'models')) return { inherited: true }
+  if (!Array.isArray(profile.models)) return undefined
+  if (profile.models.length === 0) return { inherited: true }
+  const values: Record<string, unknown>[] = []
+  for (const entry of profile.models) {
+    if (!isRecord(entry) || !validIdentifier(entry.id)) return undefined
+    values.push({ ...entry })
+  }
+  return { inherited: false, values }
+}
+function configuredOverrides(profile: Record<string, unknown>): { present: boolean, values: Map<string, Record<string, unknown>> } | undefined {
+  if (!Object.hasOwn(profile, 'modelOverrides')) return { present: false, values: new Map() }
+  if (!isRecord(profile.modelOverrides)) return undefined
+  const values = new Map<string, Record<string, unknown>>()
+  for (const [id, value] of Object.entries(profile.modelOverrides)) {
+    if (!validIdentifier(id) || !isRecord(value)) return undefined
+    values.set(id, { ...value })
+  }
+  return { present: true, values }
+}
+function updatedModels(existing: Record<string, unknown>[], model: ModelProfile): Record<string, unknown>[] {
+  const next = existing.map(entry => ({ ...entry }))
+  const index = next.findIndex(entry => entry.id === model.id)
   const patch = fieldsOf(model, true)
-  if (index >= 0 && isRecord(next[index])) next[index] = { ...next[index], ...patch }
+  if (index >= 0) next[index] = { ...next[index], ...patch }
   else next.push(patch)
   return next
 }
-function mutationPlan(profile: Record<string, unknown>, provider: string, model: ModelProfile, catalog: CatalogValue): { path: string[], value: unknown } | undefined {
-  if (Array.isArray(profile.models)) return { path: ['providers', provider, 'models'], value: updatedModels(profile.models, model) }
+function mutationPlan(profile: Record<string, unknown>, provider: string, model: ModelProfile, catalog: CatalogValue): { ops: SettingsPathOpView[] } | undefined {
+  const configured = configuredModels(profile)
+  const overrides = configuredOverrides(profile)
+  if (configured === undefined || overrides === undefined) return undefined
+  const modelsPath = ['providers', provider, 'models']
+  const overridesPath = ['providers', provider, 'modelOverrides']
+  if (!configured.inherited) {
+    if (overrides.values.size > 0) return undefined
+    const ops: SettingsPathOpView[] = [{ op: 'set', path: modelsPath, value: updatedModels(configured.values, model) }]
+    if (overrides.present) ops.push({ op: 'unset', path: overridesPath })
+    return { ops }
+  }
+
   const group = groupFor(catalog, provider)
   if (group?.models.some(entry => entry.id === model.id) === true) {
-    const overrides = isRecord(profile.modelOverrides) ? profile.modelOverrides : undefined
-    const current = overrides?.[model.id]
-    const existing: Record<string, unknown> = isRecord(current) ? current : {}
-    return { path: ['providers', provider, 'modelOverrides', model.id], value: { ...existing, ...fieldsOf(model, false) } }
+    const existing = overrides.values.get(model.id) ?? {}
+    return { ops: [{ op: 'set', path: [...overridesPath, model.id], value: { ...existing, ...fieldsOf(model, false) } }] }
+  }
+  if (group === undefined) return undefined
+  const materialized: Record<string, unknown>[] = []
+  const materializedIds = new Set<string>()
+  for (const installed of group.models) {
+    materialized.push({ ...overrides.values.get(installed.id), id: installed.id })
+    materializedIds.add(installed.id)
+  }
+  for (const [id, override] of overrides.values) {
+    if (!materializedIds.has(id)) materialized.push({ ...override, id })
   }
-  if (group === undefined || catalog.failures.some(failure => failure.id === provider)) return undefined
-  return { path: ['providers', provider, 'models'], value: [...group.models.map(entry => ({ id: entry.id })), fieldsOf(model, true)] }
+  const ops: SettingsPathOpView[] = [{ op: 'set', path: modelsPath, value: updatedModels(materialized, model) }]
+  if (overrides.present) ops.push({ op: 'unset', path: overridesPath })
+  return { ops }
 }
 function paired(req: IncomingMessage, service: PairingService): boolean {
   const deviceId = readCookie(req.headers.cookie, service.config.cookieName)
@@ -207,7 +255,7 @@ export function makePairedModelCatalogRoutes(deps: PairedModelCatalogDeps): WebR
     const plan = mutationPlan(eligible.provider.profile, body.provider, body.model, before)
     if (plan === undefined) return reject(res, 502, `model catalog is unavailable for provider ${body.provider}`)
     let mutation: Awaited<ReturnType<ApiProxy['settings']['mutate']>>
-    try { mutation = await apiProxy.settings.mutate(request({ ns: 'llm-pi-ai', expectedRevision: eligible.provider.namespace.revision, ops: [{ op: 'set', path: plan.path, value: plan.value }] })) } catch { return reject(res, 502, `model update failed for provider ${body.provider}`) }
+    try { mutation = await apiProxy.settings.mutate(request({ ns: 'llm-pi-ai', expectedRevision: eligible.provider.namespace.revision, ops: plan.ops })) } catch { return reject(res, 502, `model update failed for provider ${body.provider}`) }
     const code = errorCode(mutation)
     if (code === 'settings-conflict') return reject(res, 409, `model update conflicted for provider ${body.provider}`)
     if (code === 'settings-rejected') return reject(res, 422, `model update was rejected for provider ${body.provider}`)