Merge remote-tracking branch 'origin/main' into review/framey-api

# Conflicts:
#	docs/framey-loader.md
#	tests/page/framey_actions.mjs
#	tests/test_framey_panel.py
#	ui/framey-host.js
#	ui/framey_panel.py

app/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "frame-control",
-  "version": "0.4.32",
+  "version": "0.4.31",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "frame-control",
-      "version": "0.4.32",
+      "version": "0.4.31",
       "license": "MIT",
       "devDependencies": {
         "electron": "^44.4.5",

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "frame-control",
   "productName": "Frame Control",
-  "version": "0.4.32",
+  "version": "0.4.31",
   "description": "Desktop app for managing a Valve Steam Frame over SSH",
   "private": true,
   "main": "main.js",

docs/current-support-matrix.md

@@ -1,6 +1,6 @@
 # What we have tested
 
-Current for Frame Control **v0.4.32**, 25 October 2026. “Real Frame + physical PC” means an actual headset and a non-virtual computer. “VM only” means a Windows virtual machine, sometimes connected to the real Frame. A CI test or a simulated device is **not** a physical hardware test. The date/version column is the last relevant check, not a promise that every new release was retested on that platform. See each link for the exact procedure and limits.
+Current for Frame Control **v0.4.31**, 25 October 2026. “Real Frame + physical PC” means an actual headset and a non-virtual computer. “VM only” means a Windows virtual machine, sometimes connected to the real Frame. A CI test or a simulated device is **not** a physical hardware test. The date/version column is the last relevant check, not a promise that every new release was retested on that platform. See each link for the exact procedure and limits.
 
 | Feature | Real Frame + physical PC tested | VM only | Untested or limited | Last check and proof |
 |---|---|---|---|---|
@@ -24,6 +24,6 @@ Current for Frame Control **v0.4.32**, 25 October 2026. “Real Frame + physical
 | Local Frame Control extensions | Example panel displayed live Frame status in a browser preview; the real Frame served a read-only example in the experimental headset panel | No | No wearer-visible extension view; third-party extensions and physical Windows/macOS extension folders untested | 25 Oct, v0.4.29: [PR #194](https://github.com/saphid/frame-control/pull/194), [PR #201](https://github.com/saphid/frame-control/pull/201), [extension guide](extensions.md) |
 | Experimental Frame Control SteamVR panel | Real Frame OS 0.5.6 installed its user service, registered an overlay, served authenticated live status and a read-only extension, saved a screenshot and short MP4, and removed owned resources | No | Headset was unworn in standby: overlay reported `not_visible`, stereo capture was dark; wearer-visible pixels and controller input are unverified. The new large read-only status screen has browser layout and packaging checks only | 25 Oct, v0.4.29 device check and v0.4.31 status screen: [PR #198](https://github.com/saphid/frame-control/pull/198), [PR #201](https://github.com/saphid/frame-control/pull/201), [PR #220](https://github.com/saphid/frame-control/pull/220), [panel guide](headset-app.md) |
 | Experimental Decky Loader manager | Real Frame OS 0.5.6 ARM64 user-service install, status, update and remove completed; seven official-store plugin backends loaded, and ProtonDB Badges completed managed store install/update/remove | No | Plugin pages, settings, routes, toasts and controller input in VR remain unverified; some plugins need root, x86_64 binaries or Deck-specific hardware | 25 Oct, v0.4.31: [PR #208](https://github.com/saphid/frame-control/pull/208), [compatibility table](decky-frame.md) |
-| Experimental Framey VR plugin panels and store | No live real-Frame panel test | No | ProtonDB Badges settings rendered and sent a setting call in local Chromium. The fake Frame and CI exercised the store search, install progress, quick actions, settings, local routes and toasts. Wearer-visible pixels, controller input and live settings persistence remain unverified | 25 Oct, v0.4.32: [#223](https://github.com/saphid/frame-control/pull/223), [#224](https://github.com/saphid/frame-control/pull/224), [#225](https://github.com/saphid/frame-control/pull/225), [#226](https://github.com/saphid/frame-control/pull/226), [#227](https://github.com/saphid/frame-control/pull/227), [browser/fake Frame evidence](evidence/framey-browser-2026-10-25.md), [guide](framey-loader.md) |
+| Experimental Framey VR plugin panels | No live real-Frame panel test | No | ProtonDB Badges settings rendered and sent a setting call in local Chromium; the fake Frame exercised the store and method bridge. Wearer-visible pixels, controller input and live settings persistence remain unverified | 25 Oct, [PR #223](https://github.com/saphid/frame-control/pull/223), [browser/fake Frame evidence](evidence/framey-browser-2026-10-25.md), [guide](framey-loader.md) |
 
 Release notes must preserve these limits until a newer recorded check changes them. When a feature is retested, add its date, exact app/Frame version, host type and proof here. The older [v0.3.1 matrix](support-matrix.html) is a historical snapshot and does not describe current coverage.

docs/decky-frame.md

@@ -165,8 +165,6 @@ It preserves plugin files and settings so unrelated user data is not deleted.
 Open **Official plugin store** to review a plugin, then confirm each install,
 update, or remove. Root and x86-only plugins are blocked. The manager only
 removes plugin folders that it installed; it leaves other Decky folders alone.
-The desktop app and headset panel share one lock for managed Decky changes.
-If another change is in progress, wait for it to finish and try again.
 Restart Steam or the headset to clear the frontend already injected into its
 current web helper process. No action wipes the headset.
 

docs/frame-plugin-author.md

@@ -32,9 +32,6 @@ Frame Control now has an experimental [Framey panel host](framey-loader.md)
 for API v2 Decky frontend bundles. It renders common settings controls in the
 separate SteamVR dashboard panel, but Steam library and store page patches
 remain unavailable. Wearer-visible use is not yet verified.
-The [settings sample](../examples/framey-settings/README.md) shows an official
-Decky JSX build, backend persistence, a toggle and a local toast. Framey offers
-only official-store-owned plugins in its VR panel.
 
 To test safely, use a separate Frame Control managed Decky install, verify the
 ZIP digest from the official store, install one plugin at a time, and inspect
@@ -50,10 +47,9 @@ none of these frontend controls has passed a worn-headset check yet.
 | Decky API or UI feature | Framey behavior | Verified in |
 | --- | --- | --- |
 | `definePlugin` with `content`, `titleView` | Renders a React panel and optional title | Local browser with ProtonDB Badges; host unit test |
-| Official `@decky/rollup` JSX (`SP_JSX.jsx`, `jsxs`, `Fragment`) | Creates React elements in the isolated panel | Sample bundle smoke test; host unit test |
 | `PanelSection`, rows, buttons, toggles, dropdowns | Local touch-sized controls | Local browser and host unit test |
 | Optional `settings`, `frameyQuickActions` | Separate settings tab; up to eight actions with result text | Host unit test; these fields are Framey additions |
-| `serverAPI.call` / `callable` | Calls only that plugin's Decky Python backend via the headset service | Fake Frame e2e for setting read/write across CEF calls, update, and reinstall; host unit test. Real Decky persistence remains unverified. |
+| `serverAPI.call` / `callable` | Calls only that plugin's Decky Python backend via the headset service | Fake Frame e2e for get/set setting; host unit test |
 | `toaster.toast` | Visible toast inside the plugin panel; `dismiss` and optional `onClick` | Host unit test; no Steam system notification |
 | `routerHook.addRoute` / `removeRoute`, `Navigation.Navigate` / `NavigateBack` | Local routes inside this plugin panel only | Host unit test |
 | `routerHook.addPatch`, global components | No-op; cannot patch Steam routes | Not applicable |

docs/framey-loader.md

@@ -54,12 +54,6 @@ has no supported injection target in the Frame Control panel.
 The [browser and fake Frame evidence](evidence/framey-browser-2026-10-25.md)
 records exactly what was exercised.
 
-The fake Frame integration test now writes a Decky setting through Framey's
-scoped backend endpoint, reads it in a new CEF request, updates the plugin,
-then checks it again. It also confirms removal blocks method calls and a
-reinstall can read the retained setting. This tests the bridge and fixture;
-real Decky settings persistence on a worn Frame is still unverified.
-
 The in-headset **Open official store** view loads the full official catalogue.
 Search matches names, authors, and descriptions. Filters show non-root plugins
 or installed plugins, and Previous/Next buttons browse 20 results per page.
@@ -76,9 +70,6 @@ operation after an error.
 
 ## For plugin authors
 
-Start with the [Framey settings sample](../examples/framey-settings/README.md)
-for a buildable Decky API v2 panel and Python settings backend.
-
 Publish a normal [Decky store](https://plugins.deckbrew.xyz/) API v2 release
 with `plugin.json`, a single `dist/index.js` ESM frontend entry point, and a
 Python backend if needed. Give the frontend a `content` React element returned

examples/framey-settings/.gitignore

@@ -1 +0,0 @@
-node_modules/

examples/framey-settings/README.md

@@ -1,37 +0,0 @@
-# Framey settings sample
-
-This is a small Decky API v2 plugin for authors. Its panel uses the official
-`@decky/api`, `@decky/ui`, and `@decky/rollup` packages. A toggle calls a Python
-backend method, stores one boolean under `decky.decky_SETTINGS_DIR`,
-and reads it back when the panel opens. The backend rejects other keys and
-values. The frontend also shows a local toast after a successful save.
-
-## Build
-
-From this directory, run:
-
-```sh
-pnpm install --frozen-lockfile
-pnpm build
-pnpm exec tsc --noEmit
-```
-
-The committed `dist/index.js` is the built frontend. For a Decky release ZIP,
-put `plugin.json`, `main.py`, and `dist/index.js` inside one top-level plugin
-folder. Publish it through the official Decky store if you want Frame Control's
-managed installer to offer it. Framey deliberately opens only plugins that the
-official store installed and marked as owned; copying this example into the
-plugin directory does not enable its VR panel.
-
-## Test and adapt
-
-Run `python3 -m unittest discover -s tests -p test_framey_sample.py` from the
-repository root. It checks backend persistence and evaluates the built bundle
-against Framey's actual host script. The fake Frame store flow is exercised by
-the repository's e2e suite. No worn-headset visibility or controller-input test
-has passed for this sample yet.
-
-The plugin needs no root access or system changes. Its settings remain after
-the managed plugin folder is removed, following Decky's settings behavior.
-For a production plugin, add migration and recovery handling for damaged
-settings files, and test every UI path in a worn headset.

examples/framey-settings/dist/index.js

@@ -1,71 +0,0 @@
-const manifest = {"name":"Framey Settings Sample"};
-const API_VERSION = 2;
-const internalAPIConnection = window.__DECKY_SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED_deckyLoaderAPIInit;
-if (!internalAPIConnection) {
-    throw new Error('[@decky/api]: Failed to connect to the loader as as the loader API was not initialized. This is likely a bug in Decky Loader.');
-}
-let api;
-try {
-    api = internalAPIConnection.connect(API_VERSION, manifest.name);
-}
-catch {
-    api = internalAPIConnection.connect(1, manifest.name);
-    console.warn(`[@decky/api] Requested API version ${API_VERSION} but the running loader only supports version 1. Some features may not work.`);
-}
-if (api._version != API_VERSION) {
-    console.warn(`[@decky/api] Requested API version ${API_VERSION} but the running loader only supports version ${api._version}. Some features may not work.`);
-}
-const callable = api.callable;
-const toaster = api.toaster;
-const definePlugin = (fn) => {
-    return (...args) => {
-        return fn(...args);
-    };
-};
-
-const getSetting = callable('get_setting');
-const setSetting = callable('set_setting');
-function Content() {
-    const [enabled, setEnabled] = SP_REACT.useState(false);
-    const [busy, setBusy] = SP_REACT.useState(true);
-    const [message, setMessage] = SP_REACT.useState('Loading setting…');
-    async function refresh() {
-        setBusy(true);
-        try {
-            const value = await getSetting('enabled', false);
-            setEnabled(value);
-            setMessage(`Saved setting: ${value ? 'on' : 'off'}`);
-        }
-        catch (error) {
-            setMessage(`Could not read setting: ${String(error)}`);
-        }
-        finally {
-            setBusy(false);
-        }
-    }
-    SP_REACT.useEffect(() => { void refresh(); }, []);
-    async function change(value) {
-        setBusy(true);
-        try {
-            await setSetting('enabled', value);
-            setEnabled(value);
-            setMessage(`Saved setting: ${value ? 'on' : 'off'}`);
-            toaster.toast({ title: 'Framey sample', body: 'Setting saved' });
-        }
-        catch (error) {
-            setMessage(`Could not save setting: ${String(error)}`);
-        }
-        finally {
-            setBusy(false);
-        }
-    }
-    return SP_JSX.jsxs(DFL.PanelSection, { title: "Framey settings sample", children: [SP_JSX.jsx(DFL.PanelSectionRow, { children: SP_JSX.jsx(DFL.ToggleField, { label: "Example setting", description: "Stored by the Decky Python backend", checked: enabled, disabled: busy, onChange: (value) => { void change(value); } }) }), SP_JSX.jsx(DFL.PanelSectionRow, { children: SP_JSX.jsx(DFL.ButtonItem, { disabled: busy, onClick: () => { void refresh(); }, children: "Reload saved setting" }) }), SP_JSX.jsx(DFL.PanelSectionRow, { children: SP_JSX.jsx("p", { role: "status", children: message }) })] });
-}
-var index = definePlugin(() => ({
-    name: 'Framey Settings Sample',
-    icon: SP_JSX.jsx("span", { "aria-hidden": "true", children: "\u2699" }),
-    content: SP_JSX.jsx(Content, {}),
-}));
-
-export { index as default };
-//# sourceMappingURL=index.js.map

examples/framey-settings/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sources":["decky://decky/plugin/Framey%20Settings%20Sample/node_modules/.pnpm/@decky+api@1.1.3/node_modules/@decky/api/dist/index.js","decky://decky/plugin/Framey%20Settings%20Sample/src/index.tsx"],"sourcesContent":["import _manifest from '@decky/manifest';\nexport * from \"./types\";\nconst manifest = _manifest;\nconst API_VERSION = 2;\nif (!manifest?.name) {\n    throw new Error('[@decky/api]: Failed to find plugin manifest.');\n}\nconst internalAPIConnection = window.__DECKY_SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED_deckyLoaderAPIInit;\nif (!internalAPIConnection) {\n    throw new Error('[@decky/api]: Failed to connect to the loader as as the loader API was not initialized. This is likely a bug in Decky Loader.');\n}\nlet api;\ntry {\n    api = internalAPIConnection.connect(API_VERSION, manifest.name);\n}\ncatch {\n    api = internalAPIConnection.connect(1, manifest.name);\n    console.warn(`[@decky/api] Requested API version ${API_VERSION} but the running loader only supports version 1. Some features may not work.`);\n}\nif (api._version != API_VERSION) {\n    console.warn(`[@decky/api] Requested API version ${API_VERSION} but the running loader only supports version ${api._version}. Some features may not work.`);\n}\nexport const call = api.call;\nexport const callable = api.callable;\nexport const addEventListener = api.addEventListener;\nexport const removeEventListener = api.removeEventListener;\nexport const routerHook = api.routerHook;\nexport const toaster = api.toaster;\nexport const openFilePicker = api.openFilePicker;\nexport const executeInTab = api.executeInTab;\nexport const injectCssIntoTab = api.injectCssIntoTab;\nexport const removeCssFromTab = api.removeCssFromTab;\nexport const fetchNoCors = api.fetchNoCors;\nexport const getExternalResourceURL = api.getExternalResourceURL;\nexport const useQuickAccessVisible = api.useQuickAccessVisible;\nexport const definePlugin = (fn) => {\n    return (...args) => {\n        return fn(...args);\n    };\n};\n","import {callable, definePlugin, toaster} from '@decky/api';\nimport {ButtonItem, PanelSection, PanelSectionRow, ToggleField} from '@decky/ui';\nimport {useEffect, useState} from 'react';\n\nconst getSetting = callable<[key: string, fallback: boolean], boolean>('get_setting');\nconst setSetting = callable<[key: string, value: boolean], boolean>('set_setting');\n\nfunction Content() {\n  const [enabled, setEnabled] = useState(false);\n  const [busy, setBusy] = useState(true);\n  const [message, setMessage] = useState('Loading setting…');\n\n  async function refresh() {\n    setBusy(true);\n    try {\n      const value = await getSetting('enabled', false);\n      setEnabled(value);\n      setMessage(`Saved setting: ${value ? 'on' : 'off'}`);\n    } catch (error) {\n      setMessage(`Could not read setting: ${String(error)}`);\n    } finally {\n      setBusy(false);\n    }\n  }\n\n  useEffect(() => {void refresh();}, []);\n\n  async function change(value: boolean) {\n    setBusy(true);\n    try {\n      await setSetting('enabled', value);\n      setEnabled(value);\n      setMessage(`Saved setting: ${value ? 'on' : 'off'}`);\n      toaster.toast({title: 'Framey sample', body: 'Setting saved'});\n    } catch (error) {\n      setMessage(`Could not save setting: ${String(error)}`);\n    } finally {\n      setBusy(false);\n    }\n  }\n\n  return <PanelSection title=\"Framey settings sample\">\n    <PanelSectionRow>\n      <ToggleField label=\"Example setting\" description=\"Stored by the Decky Python backend\"\n        checked={enabled} disabled={busy} onChange={(value: boolean) => {void change(value);}} />\n    </PanelSectionRow>\n    <PanelSectionRow><ButtonItem disabled={busy} onClick={() => {void refresh();}}>Reload saved setting</ButtonItem></PanelSectionRow>\n    <PanelSectionRow><p role=\"status\">{message}</p></PanelSectionRow>\n  </PanelSection>;\n}\n\nexport default definePlugin(() => ({\n  name: 'Framey Settings Sample',\n  icon: <span aria-hidden=\"true\">⚙</span>,\n  content: <Content />,\n}));\n"],"names":[],"mappings":"AAEA,MAAA,QAAA,GAAiB,CAAA,MAAA,CAAA,wBAAA,CAAS;AAC1B,MAAA,WAAA,GAAA,CAAA;AAIA,MAAA,qBAAA,GAAA,MAAA,CAAA,2EAAA;AACA,IAAA,CAAA,qBAAA,EAAA;AACA,IAAA,MAAA,IAAA,KAAA,CAAA,+HAAA,CAAA;AACA;AACA,IAAA,GAAA;AACA,IAAA;AACA,IAAA,GAAA,GAAA,qBAAA,CAAA,OAAA,CAAA,WAAA,EAAA,QAAA,CAAA,IAAA,CAAA;AACA;AACA,MAAA;AACA,IAAA,GAAA,GAAA,qBAAA,CAAA,OAAA,CAAA,CAAA,EAAA,QAAA,CAAA,IAAA,CAAA;AACA,IAAA,OAAA,CAAA,IAAA,CAAA,CAAA,mCAAA,EAAA,WAAA,CAAA,4EAAA,CAAA,CAAA;AACA;AACA,IAAA,GAAA,CAAA,QAAA,IAAA,WAAA,EAAA;AACA,IAAA,OAAA,CAAA,IAAA,CAAA,CAAA,mCAAA,EAAA,WAAA,CAAA,8CAAA,EAAA,GAAA,CAAA,QAAA,CAAA,6BAAA,CAAA,CAAA;AACA;AAEA,MAAA,QAAA,GAAA,GAAA,CAAA,QAAA;AAIA,MAAA,OAAA,GAAA,GAAA,CAAA,OAAA;AAQA,MAAA,YAAA,GAAA,CAAA,EAAA,KAAA;AACA,IAAA,OAAA,CAAA,GAAA,IAAA,KAAA;AACA,QAAA,OAAA,EAAA,CAAA,GAAA,IAAA,CAAA;AACA,IAAA,CAAA;AACA,CAAA;;ACnCA,MAAA,UAAA,GAAA,QAAA,CAAA,aAAA,CAAA;AACA,MAAA,UAAA,GAAA,QAAA,CAAA,aAAA,CAAA;AAEA,SAAA,OAAA,Line truncated

examples/framey-settings/main.py

@@ -1,41 +0,0 @@
-"""Small, unprivileged Decky backend for the Framey author example."""
-import json
-import os
-from pathlib import Path
-import tempfile
-import decky
-
-
-def settings_file():
-    # Decky provides this per-plugin path through its official Python module.
-    return Path(decky.decky_SETTINGS_DIR) / 'settings.json'
-
-
-class Plugin:
-    async def get_setting(self, key: str, default=False):
-        if key != 'enabled':
-            raise ValueError('Unknown setting')
-        try:
-            stored = json.loads(settings_file().read_text())
-        except FileNotFoundError:
-            return default
-        return stored.get(key, default)
-
-    async def set_setting(self, key: str, value: bool):
-        if key != 'enabled' or type(value) is not bool:
-            raise ValueError('Expected an enabled boolean')
-        target = settings_file()
-        target.parent.mkdir(mode=0o700, parents=True, exist_ok=True)
-        temporary = None
-        try:
-            with tempfile.NamedTemporaryFile('w', encoding='utf-8', dir=target.parent,
-                                             prefix='.settings-', delete=False) as output:
-                temporary = Path(output.name)
-                json.dump({'enabled': value}, output)
-                output.write('\n')
-            temporary.chmod(0o600)
-            os.replace(temporary, target)
-        finally:
-            if temporary is not None:
-                temporary.unlink(missing_ok=True)
-        return True

examples/framey-settings/package.json

@@ -1,20 +0,0 @@
-{
-  "name": "framey-settings-sample",
-  "version": "0.1.0",
-  "private": true,
-  "type": "module",
-  "scripts": {
-    "build": "rollup -c"
-  },
-  "dependencies": {
-    "@decky/api": "^1.1.3",
-    "@decky/ui": "^4.11.0",
-    "react": "^19.1.1"
-  },
-  "devDependencies": {
-    "@decky/rollup": "^1.0.2",
-    "@types/react": "^19.1.1",
-    "rollup": "^4.53.3",
-    "typescript": "^5.6.2"
-  }
-}

examples/framey-settings/plugin.json

@@ -1,6 +0,0 @@
-{
-  "name": "Framey Settings Sample",
-  "author": "Frame Control contributors",
-  "flags": [],
-  "api_version": 2
-}

examples/framey-settings/rollup.config.js

@@ -1,3 +0,0 @@
-import deckyPlugin from '@decky/rollup';
-
-export default deckyPlugin({});

examples/framey-settings/src/index.tsx

@@ -1,56 +0,0 @@
-import {callable, definePlugin, toaster} from '@decky/api';
-import {ButtonItem, PanelSection, PanelSectionRow, ToggleField} from '@decky/ui';
-import {useEffect, useState} from 'react';
-
-const getSetting = callable<[key: string, fallback: boolean], boolean>('get_setting');
-const setSetting = callable<[key: string, value: boolean], boolean>('set_setting');
-
-function Content() {
-  const [enabled, setEnabled] = useState(false);
-  const [busy, setBusy] = useState(true);
-  const [message, setMessage] = useState('Loading setting…');
-
-  async function refresh() {
-    setBusy(true);
-    try {
-      const value = await getSetting('enabled', false);
-      setEnabled(value);
-      setMessage(`Saved setting: ${value ? 'on' : 'off'}`);
-    } catch (error) {
-      setMessage(`Could not read setting: ${String(error)}`);
-    } finally {
-      setBusy(false);
-    }
-  }
-
-  useEffect(() => {void refresh();}, []);
-
-  async function change(value: boolean) {
-    setBusy(true);
-    try {
-      await setSetting('enabled', value);
-      setEnabled(value);
-      setMessage(`Saved setting: ${value ? 'on' : 'off'}`);
-      toaster.toast({title: 'Framey sample', body: 'Setting saved'});
-    } catch (error) {
-      setMessage(`Could not save setting: ${String(error)}`);
-    } finally {
-      setBusy(false);
-    }
-  }
-
-  return <PanelSection title="Framey settings sample">
-    <PanelSectionRow>
-      <ToggleField label="Example setting" description="Stored by the Decky Python backend"
-        checked={enabled} disabled={busy} onChange={(value: boolean) => {void change(value);}} />
-    </PanelSectionRow>
-    <PanelSectionRow><ButtonItem disabled={busy} onClick={() => {void refresh();}}>Reload saved setting</ButtonItem></PanelSectionRow>
-    <PanelSectionRow><p role="status">{message}</p></PanelSectionRow>
-  </PanelSection>;
-}
-
-export default definePlugin(() => ({
-  name: 'Framey Settings Sample',
-  icon: <span aria-hidden="true">⚙</span>,
-  content: <Content />,
-}));

examples/framey-settings/tsconfig.json

@@ -1,13 +0,0 @@
-{
-  "compilerOptions": {
-    "outDir": "dist",
-    "module": "ESNext",
-    "target": "ES2020",
-    "jsx": "react-jsx",
-    "moduleResolution": "node",
-    "strict": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true
-  },
-  "include": ["src"]
-}

tests/e2e/test_framey.py

@@ -109,25 +109,13 @@ u=h/'.config/systemd/user/frame-control-decky.service'; u.parent.mkdir(parents=T
                             {'id':123,'method':'get_setting','args':['theme','dark']})['result'], 'dark')
         self.assertTrue(ok('POST', '/api/framey/method',
                            {'id':123,'method':'set_setting','args':['theme','light']})['result'])
-        self.assertEqual(ok('POST', '/api/framey/method',
-                            {'id':123,'method':'get_setting','args':['theme','dark']})['result'], 'light')
         StoreFixture.release = 1
         job = finished(ok('POST', '/api/decky/plugin',
                           {'action':'update','id':123,'acknowledged':True}))
         self.assertFalse(job.get('error'), job)
         self.assertEqual(ok('GET', '/api/decky')['plugins'][0]['version'], '1.1.0')
-        self.assertEqual(ok('POST', '/api/framey/method',
-                            {'id':123,'method':'get_setting','args':['theme','dark']})['result'], 'light')
         job = finished(ok('POST', '/api/decky/plugin',
                           {'action':'remove','id':123,'acknowledged':True}))
         self.assertFalse(job.get('error'), job)
         self.assertEqual(ok('GET', '/api/decky')['plugins'], [])
         self.assertEqual(ssh('test -e ~/.local/share/frame-control/decky/plugins/sample-panel && echo yes || echo no').strip(), 'no')
-        status, _, _ = api('POST', '/api/framey/method',
-                           {'id':123,'method':'get_setting','args':['theme','dark']})
-        self.assertEqual(status, 400)  # No method calls while the plugin is removed.
-        job = finished(ok('POST', '/api/decky/plugin',
-                          {'action':'install','id':123,'acknowledged':True}))
-        self.assertFalse(job.get('error'), job)
-        self.assertEqual(ok('POST', '/api/framey/method',
-                            {'id':123,'method':'get_setting','args':['theme','dark']})['result'], 'light')

tests/fakeframe/rootfs/usr/local/lib/fakeframe/cef_shim.js

@@ -30,14 +30,8 @@ function build(steam) {
   const deckyBackend = {async call(route, plugin, method, ...args) {
     if (route !== 'loader/call_plugin_method' || plugin !== 'Sample Panel')
       throw Error('unexpected Decky plugin route');
-    const settings = (steam.decky_settings ||= {});
-    const owned = (settings[plugin] ||= {});
-    if (method === 'get_setting')
-      return Object.hasOwn(owned, args[0]) ? owned[args[0]] : args[1];
-    if (method === 'set_setting') {
-      owned[args[0]] = args[1];
-      return true;
-    }
+    if (method === 'get_setting') return args[1];
+    if (method === 'set_setting') return true;
     throw Error('method unavailable in fake Decky backend');
   }};
   const findShortcut = id => steam.shortcuts.find(s => s.appid === Number(id));

tests/page/framey_actions.mjs

@@ -19,15 +19,6 @@ const context=vm.createContext({window,document:{getElementById:id=>{
   navigator:{language:'en'}, parent,addEventListener:(type,handler)=>listeners.push({type,handler}),
   setTimeout:()=>1,clearTimeout(){}});
 vm.runInContext(testSource,context);
-// Official @decky/rollup bundles use the automatic JSX runtime, including keyed lists.
-const jsx=window.SP_JSX.jsx('p',{id:'message',children:'Saved'},'message-key');
-assert.equal(jsx.type,'p');
-assert.equal(jsx.props.id,'message');
-assert.equal(jsx.props.key,'message-key');
-assert.deepEqual(jsx.children,['Saved']);
-const fragments=window.SP_JSX.jsxs(window.SP_JSX.Fragment,{children:['one','two']});
-assert.equal(fragments.type,React.Fragment);
-assert.deepEqual(fragments.children,[['one','two']]);
 const nodes=(tree,type)=>[...(tree?.type===type?[tree]:[]),...(tree?.children||[]).flatMap(child=>nodes(child,type))];
 let called=0;
 const plugin={content:{type:'content'},settings:{type:'settings'},titleView:{type:'title'},

tests/page/framey_sample.mjs

@@ -1,25 +0,0 @@
-import assert from 'node:assert/strict';
-import {readFileSync} from 'node:fs';
-import vm from 'node:vm';
-
-const host=readFileSync(new URL('../../ui/framey-host.js',import.meta.url),'utf8')
-  .replace(/\n  start\(\);\n\}\)\(\);\s*$/, '\n})();');
-const bundle=readFileSync(new URL('../../examples/framey-settings/dist/index.js',import.meta.url),'utf8');
-assert.match(bundle,/SP_JSX\.jsx/);
-const React={Fragment:Symbol('fragment'),Component:class {},
-  createElement:(type,props,...children)=>({type,props:props||{},children}),
-  useState:value=>[value,()=>{}],useEffect(){},isValidElement:value=>!!value?.type};
-const window={React,ReactDOM:{createRoot:()=>({render(){}})},addEventListener(){}};
-const context=vm.createContext({window,document:{getElementById:()=>({})},
-  navigator:{language:'en'},parent:{postMessage(){}},addEventListener(){},
-  setTimeout:()=>1,clearTimeout(){}});
-vm.runInContext(host,context);
-Object.assign(context,{SP_REACT:window.SP_REACT,SP_JSX:window.SP_JSX,DFL:window.DFL});
-vm.runInContext(bundle.replace(/export \{ index as default \};/, 'window.sample = index;'),context);
-const plugin=window.sample();
-assert.equal(plugin.name,'Framey Settings Sample');
-assert.equal(typeof plugin.content.type,'function');
-const content=plugin.content.type();
-assert.equal(content.type,window.DFL.PanelSection);
-assert.equal(content.props.title,'Framey settings sample');
-assert.equal(content.children[0][0].type,window.DFL.PanelSectionRow);

tests/test_frame_decky_store.py

@@ -15,7 +15,6 @@ import zipfile
 
 sys.path.insert(0, str(Path(__file__).resolve().parent.parent / 'ui'))
 import frame_decky_store
-import frame_decky
 
 
 def archive(flags=(), extra=None):
@@ -112,28 +111,6 @@ class StoreTransaction(unittest.TestCase):
         self.assertNotEqual(result.returncode, 0)
         self.assertTrue(external.exists())
 
-    def test_shared_lock_rejects_plugin_and_loader_changes(self):
-        import fcntl
-
-        lock_path = Path(self.tmp.name) / '.local/share/frame-control/decky-transaction.lock'
-        lock_path.parent.mkdir(parents=True, exist_ok=True)
-        data, _ = archive()
-        with lock_path.open('w+b') as held:
-            fcntl.flock(held, fcntl.LOCK_EX | fcntl.LOCK_NB)
-            plugin = self.apply('install', data)
-            loader = subprocess.run([sys.executable, '-', 'remove', 'none', 'none', 'none'],
-                                    input=frame_decky.APPLY, text=True, capture_output=True,
-                                    env=self.env, timeout=15)
-            self.assertNotEqual(plugin.returncode, 0)
-            self.assertNotEqual(loader.returncode, 0)
-            self.assertIn('Another Decky change is in progress', plugin.stderr)
-            self.assertIn('Another Decky change is in progress', loader.stderr)
-            self.assertFalse(self.folder.exists())
-
-        installed = self.apply('install', data)
-        self.assertEqual(installed.returncode, 0, installed.stderr)
-        self.assertEqual(self.apply('remove').returncode, 0)
-
 
 class StoreHost(unittest.TestCase):
     def test_owned_plugin_can_be_removed_without_store_network(self):

tests/test_framey_sample.py

@@ -1,50 +0,0 @@
-"""The author example stores settings as a normal Decky user plugin."""
-import asyncio
-import importlib.util
-from pathlib import Path
-import subprocess
-import sys
-import tempfile
-import types
-import unittest
-from unittest.mock import patch
-
-
-EXAMPLE = Path(__file__).resolve().parents[1] / 'examples/framey-settings/main.py'
-
-
-def backend(settings_dir):
-    decky = types.ModuleType('decky')
-    decky.decky_SETTINGS_DIR = settings_dir
-    spec = importlib.util.spec_from_file_location('framey_sample', EXAMPLE)
-    module = importlib.util.module_from_spec(spec)
-    with patch.dict(sys.modules, {'decky': decky}):
-        spec.loader.exec_module(module)
-    return module.Plugin()
-
-
-class SamplePlugin(unittest.TestCase):
-    def test_frontend_bundle_loads_in_framey_host(self):
-        result = subprocess.run(['node', str(Path(__file__).parent / 'page/framey_sample.mjs')],
-                                capture_output=True, text=True, timeout=10)
-        self.assertEqual(result.returncode, 0, result.stderr)
-
-    def test_setting_survives_backend_instance_restart(self):
-        with tempfile.TemporaryDirectory() as folder:
-            first = backend(folder)
-            self.assertFalse(asyncio.run(first.get_setting('enabled', False)))
-            self.assertTrue(asyncio.run(first.set_setting('enabled', True)))
-            second = backend(folder)
-            self.assertTrue(asyncio.run(second.get_setting('enabled', False)))
-            self.assertTrue((Path(folder) / 'settings.json').is_file())
-
-    def test_backend_rejects_unknown_keys_and_non_boolean_values(self):
-        with tempfile.TemporaryDirectory() as folder:
-            plugin = backend(folder)
-            with self.assertRaises(ValueError): asyncio.run(plugin.get_setting('other'))
-            with self.assertRaises(ValueError): asyncio.run(plugin.set_setting('enabled', 'yes'))
-            self.assertFalse((Path(folder) / 'settings.json').exists())
-
-
-if __name__ == '__main__':
-    unittest.main()

ui/frame_decky.py

@@ -63,7 +63,7 @@ print(json.dumps({'arch':platform.machine(), 'frameOS':os_release.get('VERSION_I
 
 
 APPLY = r'''
-import fcntl, hashlib, json, os, pathlib, subprocess, sys
+import hashlib, json, os, pathlib, subprocess, sys
 action, token, digest, version = sys.argv[1:]
 home = pathlib.Path.home()
 base = home / '.local/share/frame-control/decky'
@@ -72,7 +72,6 @@ binary = base / 'PluginLoader'
 receipt = base / '.frame-control/receipt.json'
 legacy = base / 'settings/release.json'
 stage = pathlib.Path('/tmp/frame-control-decky-' + token)
-transaction_lock = None
 def systemd(*args):
     p = subprocess.run(['systemctl','--user',*args], capture_output=True, text=True, timeout=20)
     if p.returncode: raise RuntimeError((p.stderr or p.stdout).strip() or 'systemd failed')
@@ -80,13 +79,6 @@ def owned():
     try: return json.loads((receipt if receipt.exists() else legacy).read_text()).get('managedBy') == 'Frame Control' and service.is_file()
     except (OSError, ValueError): return False
 try:
-    # The desktop and headset servers are separate processes. Lock the shared
-    # user-service transaction on the Frame before inspecting or changing it.
-    base.parent.mkdir(parents=True, exist_ok=True)
-    lock_path = base.parent / 'decky-transaction.lock'
-    transaction_lock = os.fdopen(os.open(lock_path, os.O_CREAT | os.O_RDWR | os.O_NOFOLLOW, 0o600), 'r+b')
-    try: fcntl.flock(transaction_lock, fcntl.LOCK_EX | fcntl.LOCK_NB)
-    except BlockingIOError: raise RuntimeError('Another Decky change is in progress; try again after it finishes')
     if action == 'remove':
         if not owned(): raise RuntimeError('No Frame Control managed Decky install to remove')
         systemd('disable','--now','frame-control-decky.service')
@@ -149,7 +141,6 @@ try:
         print(json.dumps({'message':'Decky Loader '+version+' is running as a user service. The VR menu is experimental.'}))
 finally:
     stage.unlink(missing_ok=True)
-    if transaction_lock is not None: transaction_lock.close()
 '''
 
 

ui/frame_decky_store.py

@@ -104,7 +104,7 @@ def archive_info(data, expected_hash, expected_name):
 
 
 APPLY = r'''
-import fcntl,hashlib,json,os,pathlib,shutil,subprocess,sys,zipfile
+import hashlib,json,pathlib,shutil,subprocess,sys,zipfile
 action,token,plugin_id,digest,folder,version = sys.argv[1:]
 base=pathlib.Path.home()/'.local/share/frame-control/decky/plugins'
 unit=pathlib.Path.home()/'.config/systemd/user/frame-control-decky.service'
@@ -113,7 +113,6 @@ archive=pathlib.Path('/tmp/frame-control-decky-plugin-'+token)
 stage=base/('.frame-control-stage-'+token)
 backup=base/('.frame-control-old-'+token)
 marker='.frame-control-store.json'
-transaction_lock=None
 def owned():
     if target.is_symlink() or not target.is_dir(): return False
     try: return json.loads((target/marker).read_text()).get('storeId') == int(plugin_id)
@@ -121,19 +120,12 @@ def owned():
 def service(*args):
     p=subprocess.run(['systemctl','--user',*args],capture_output=True,text=True,timeout=25)
     if p.returncode: raise RuntimeError((p.stderr or p.stdout).strip()[-400:] or 'Decky service failed')
+if not unit.is_file(): raise RuntimeError('Install Frame Control managed Decky first')
+if action not in ('install','update','remove'): raise RuntimeError('Invalid plugin action')
+if action=='install' and (target.exists() or target.is_symlink()): raise RuntimeError('Plugin folder already exists')
+if action in ('update','remove') and not owned(): raise RuntimeError('Only a Frame Control store plugin can be changed')
+running=subprocess.run(['systemctl','--user','is-active','--quiet','frame-control-decky.service']).returncode==0
 try:
-    # A desktop request and a headset-panel request must not change the same
-    # Decky user service at once. Keep this lock until rollback/cleanup ends.
-    base.parent.parent.mkdir(parents=True,exist_ok=True)
-    lock_path=base.parent.parent/'decky-transaction.lock'
-    transaction_lock=os.fdopen(os.open(lock_path,os.O_CREAT|os.O_RDWR|os.O_NOFOLLOW,0o600),'r+b')
-    try: fcntl.flock(transaction_lock,fcntl.LOCK_EX|fcntl.LOCK_NB)
-    except BlockingIOError: raise RuntimeError('Another Decky change is in progress; try again after it finishes')
-    if not unit.is_file(): raise RuntimeError('Install Frame Control managed Decky first')
-    if action not in ('install','update','remove'): raise RuntimeError('Invalid plugin action')
-    if action=='install' and (target.exists() or target.is_symlink()): raise RuntimeError('Plugin folder already exists')
-    if action in ('update','remove') and not owned(): raise RuntimeError('Only a Frame Control store plugin can be changed')
-    running=subprocess.run(['systemctl','--user','is-active','--quiet','frame-control-decky.service']).returncode==0
     if action!='remove':
         data=archive.read_bytes()
         if not 1024<len(data)<=50*1024*1024 or hashlib.sha256(data).hexdigest()!=digest:
@@ -167,7 +159,6 @@ try:
 finally:
     archive.unlink(missing_ok=True)
     if stage.exists(): shutil.rmtree(stage)
-    if transaction_lock is not None: transaction_lock.close()
 '''
 
 

ui/framey-host.js

@@ -3,14 +3,6 @@
   'use strict';
   const R = window.SP_REACT = window.React;
   window.SP_REACTDOM = window.ReactDOM;
-  const jsx = (type, props, key) => {
-    const {children, ...elementProps} = props || {};
-    if (key !== undefined) elementProps.key = key;
-    return Object.prototype.hasOwnProperty.call(props || {}, 'children')
-      ? R.createElement(type, elementProps, children)
-      : R.createElement(type, elementProps);
-  };
-  window.SP_JSX = {jsx, jsxs:jsx, Fragment:R.Fragment};
   window.LocalizationManager = {m_rgLocalesToUse:[navigator.language || 'en']};
   const root = document.getElementById('framey-root');
   const error = document.getElementById('framey-error');