@fbincon/claude-code-statusline 3.8.0 → 3.9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +77 -77
- package/candidate.json +294 -231
- package/node_modules/@fbincon/statusline-cli/dist/src/config/arguments.js +18 -4
- package/node_modules/@fbincon/statusline-cli/dist/src/config/arguments.js.map +1 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/config/commands.js +26 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/config/commands.js.map +1 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/config/profile-command.js +7 -2
- package/node_modules/@fbincon/statusline-cli/dist/src/config/profile-command.js.map +1 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/config/selective-import.d.ts +3 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/config/selective-import.js +40 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/config/selective-import.js.map +1 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/help.js +3 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/help.js.map +1 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/integration/mods.d.ts +4 -3
- package/node_modules/@fbincon/statusline-cli/dist/src/integration/mods.js +14 -13
- package/node_modules/@fbincon/statusline-cli/dist/src/integration/mods.js.map +1 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/integration/resources.d.ts +5 -2
- package/node_modules/@fbincon/statusline-cli/dist/src/integration/resources.js +8 -6
- package/node_modules/@fbincon/statusline-cli/dist/src/integration/resources.js.map +1 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/management/integration.js +12 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/management/integration.js.map +1 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/management/mod-transition-runner.d.ts +1 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/management/mod-transition-runner.js +16 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/management/mod-transition-runner.js.map +1 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/management/mod-transition.d.ts +3 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/management/mod-transition.js +96 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/management/mod-transition.js.map +1 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/ui/protocol.d.ts +1 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/ui/protocol.js +22 -6
- package/node_modules/@fbincon/statusline-cli/dist/src/ui/protocol.js.map +1 -1
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/.claude-plugin/plugin.json +1 -1
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/hooks/register.ts +1 -1
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/backend.ts +7 -4
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/client/keys.ts +9 -6
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/client/settings.ts +5 -1
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/alignment-manager.ts +59 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/alignments.ts +77 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/appearance.ts +3 -2
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/draft.ts +17 -4
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/forms.ts +18 -4
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/gradients.ts +29 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/group-manager.ts +5 -3
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/groups.ts +2 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/import-differences.ts +72 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/import-review.ts +49 -2
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/import-selection.ts +38 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/profile-manager.ts +14 -5
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/generated-contracts.ts +9 -3
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/i18n/generated-locales.ts +210 -6
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/i18n/presentation.ts +2 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/session.ts +3 -1
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/resource-manifest.json +26 -21
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/ui/client/draw.ts +6 -2
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/ui/client/help.ts +1 -1
- package/node_modules/@fbincon/statusline-cli/resources/statusline-runtime/.claude-plugin/plugin.json +1 -1
- package/node_modules/@fbincon/statusline-cli/resources/statusline-runtime/resource-manifest.json +3 -3
- package/node_modules/@fbincon/statusline-core/dist/src/config/defaults.js +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/config/display.d.ts +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/config/display.js +13 -4
- package/node_modules/@fbincon/statusline-core/dist/src/config/display.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/config/editor-fields.js +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/config/editor-fields.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/config/formatting.js +11 -4
- package/node_modules/@fbincon/statusline-core/dist/src/config/formatting.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/config/import-review.d.ts +2 -4
- package/node_modules/@fbincon/statusline-core/dist/src/config/import-review.js +2 -83
- package/node_modules/@fbincon/statusline-core/dist/src/config/import-review.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/config/instances.js +12 -3
- package/node_modules/@fbincon/statusline-core/dist/src/config/instances.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/contracts/ui.d.ts +15 -3
- package/node_modules/@fbincon/statusline-core/dist/src/contracts/ui.js +2 -2
- package/node_modules/@fbincon/statusline-core/dist/src/contracts/ui.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/alignment-manager.d.ts +18 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/alignment-manager.js +112 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/alignment-manager.js.map +1 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/alignments.d.ts +21 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/alignments.js +117 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/alignments.js.map +1 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/appearance.js +3 -2
- package/node_modules/@fbincon/statusline-core/dist/src/editor/appearance.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/backend.js +8 -4
- package/node_modules/@fbincon/statusline-core/dist/src/editor/backend.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/draft.d.ts +4 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/draft.js +16 -3
- package/node_modules/@fbincon/statusline-core/dist/src/editor/draft.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/forms.js +24 -4
- package/node_modules/@fbincon/statusline-core/dist/src/editor/forms.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/gradients.d.ts +16 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/gradients.js +31 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/gradients.js.map +1 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/group-manager.d.ts +2 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/group-manager.js +5 -3
- package/node_modules/@fbincon/statusline-core/dist/src/editor/group-manager.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/groups.js +3 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/groups.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/import-differences.d.ts +4 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/import-differences.js +86 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/import-differences.js.map +1 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/import-review.d.ts +8 -2
- package/node_modules/@fbincon/statusline-core/dist/src/editor/import-review.js +67 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/import-review.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/import-selection.d.ts +7 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/import-selection.js +42 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/import-selection.js.map +1 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/profile-manager.d.ts +4 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/profile-manager.js +16 -4
- package/node_modules/@fbincon/statusline-core/dist/src/editor/profile-manager.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/i18n/generated-locales.d.ts +204 -0
- package/node_modules/@fbincon/statusline-core/dist/src/i18n/generated-locales.js +210 -6
- package/node_modules/@fbincon/statusline-core/dist/src/i18n/generated-locales.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/management/compatibility.js +2 -1
- package/node_modules/@fbincon/statusline-core/dist/src/management/compatibility.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/release.d.ts +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/release.js +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/alignment.d.ts +3 -0
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/alignment.js +97 -0
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/alignment.js.map +1 -0
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/components.d.ts +1 -0
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/components.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/diagnose.js +2 -3
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/diagnose.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/explain.js +2 -0
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/explain.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/gradients.d.ts +13 -0
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/gradients.js +68 -0
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/gradients.js.map +1 -0
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/groups.js +5 -4
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/groups.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/items.d.ts +4 -1
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/items.js +41 -15
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/items.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/layout.d.ts +1 -0
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/layout.js +9 -3
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/layout.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/powerline.d.ts +4 -0
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/powerline.js +15 -1
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/powerline.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/subagents.js +7 -5
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/subagents.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/trace.d.ts +3 -0
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/trace.js +3 -0
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/trace.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/resources/i18n/locales/en.json +35 -1
- package/node_modules/@fbincon/statusline-core/resources/i18n/locales/ja.json +35 -1
- package/node_modules/@fbincon/statusline-core/resources/i18n/locales/ko.json +35 -1
- package/node_modules/@fbincon/statusline-core/resources/i18n/locales/zh-CN.json +35 -1
- package/node_modules/@fbincon/statusline-core/resources/i18n/locales/zh-HK.json +35 -1
- package/node_modules/@fbincon/statusline-core/resources/i18n/locales/zh-TW.json +35 -1
- package/node_modules/@fbincon/statusline-tui/dist/src/drawing/pages.js +5 -0
- package/node_modules/@fbincon/statusline-tui/dist/src/drawing/pages.js.map +1 -1
- package/node_modules/@fbincon/statusline-tui/dist/src/drawing/presentation.js +5 -0
- package/node_modules/@fbincon/statusline-tui/dist/src/drawing/presentation.js.map +1 -1
- package/node_modules/@fbincon/statusline-tui/dist/src/drawing/shortcuts.js +2 -2
- package/node_modules/@fbincon/statusline-tui/dist/src/drawing/shortcuts.js.map +1 -1
- package/node_modules/@fbincon/statusline-tui/dist/src/drawing.js +1 -1
- package/node_modules/@fbincon/statusline-tui/dist/src/drawing.js.map +1 -1
- package/node_modules/@fbincon/statusline-tui/dist/src/session.js +1 -1
- package/node_modules/@fbincon/statusline-tui/dist/src/session.js.map +1 -1
- package/node_modules/@fbincon/statusline-tui/dist/src/state.js +12 -5
- package/node_modules/@fbincon/statusline-tui/dist/src/state.js.map +1 -1
- package/package.json +3 -3
|
@@ -44,11 +44,11 @@ export function renderSkill(launch, external = false) {
|
|
|
44
44
|
}
|
|
45
45
|
return Buffer.from(template);
|
|
46
46
|
}
|
|
47
|
-
export function inventory(files, spec) {
|
|
47
|
+
export function inventory(files, spec, version = VERSION) {
|
|
48
48
|
const manifest = JSON.parse(files.get('.claude-plugin/plugin.json').toString('utf8'));
|
|
49
|
-
if (manifest.name !== spec.name || manifest.version !==
|
|
49
|
+
if (manifest.name !== spec.name || manifest.version !== version)
|
|
50
50
|
throw new Error('Bundled Mod/backend identity or version mismatch');
|
|
51
|
-
return { schema_version: 1, backend_version:
|
|
51
|
+
return { schema_version: 1, backend_version: version, mod_version: version, protocol_version: spec.protocol, files: Object.fromEntries([...files].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([name, raw]) => [name, digest(raw)])) };
|
|
52
52
|
}
|
|
53
53
|
export function sourceFiles(root) {
|
|
54
54
|
const names = new Set(['.claude-plugin/plugin.json', 'hooks/hooks.json']);
|
|
@@ -69,16 +69,18 @@ export function sourceFiles(root) {
|
|
|
69
69
|
walk(join(root, directory));
|
|
70
70
|
return new Map([...names].sort().map(name => { const path = join(root, name); safeTarget(root, path); return [name, fs.readFileSync(path)]; }));
|
|
71
71
|
}
|
|
72
|
-
export function bundledFiles(spec) {
|
|
73
|
-
const root = join(resourceRoot, spec.name), path = join(root, 'resource-manifest.json');
|
|
72
|
+
export function bundledFiles(spec, target) {
|
|
73
|
+
const root = target?.root ?? join(resourceRoot, spec.name), path = join(root, 'resource-manifest.json');
|
|
74
74
|
let files, record;
|
|
75
75
|
if (fs.existsSync(path)) {
|
|
76
76
|
record = JSON.parse(fs.readFileSync(path, 'utf8'));
|
|
77
77
|
files = new Map(Object.keys(record.files).map(name => { safeTarget(root, join(root, name)); return [name, fs.readFileSync(join(root, name))]; }));
|
|
78
|
-
if (JSON.stringify(record) !== JSON.stringify(inventory(files, spec)))
|
|
78
|
+
if (JSON.stringify(record) !== JSON.stringify(inventory(files, spec, target?.version ?? VERSION)))
|
|
79
79
|
throw new Error('Bundled resource inventory does not match');
|
|
80
80
|
}
|
|
81
81
|
else {
|
|
82
|
+
if (target)
|
|
83
|
+
throw new Error('Target package resource manifest is missing');
|
|
82
84
|
const checkout = fileURLToPath(new URL('../../../../../', import.meta.url));
|
|
83
85
|
if (!fs.existsSync(join(checkout, 'tsconfig.tools.json')))
|
|
84
86
|
throw new Error('Bundled resources are missing; reinstall the package');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resources.js","sourceRoot":"","sources":["../../../src/integration/resources.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAErE,OAAO,EAAE,QAAQ,EAAE,MAAM,yCAAyC,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACnF,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAgB,MAAM,YAAY,CAAC;AACpE,MAAM,YAAY,GAAG,aAAa,CAAC,IAAI,GAAG,CAAC,qBAAqB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AACpF,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,KAAsB,EAAU,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC3G,MAAM,UAAU,YAAY;IACxB,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,UAAU,EAAE,WAAW,CAAC,CAAU,EAAE,CAAC;QAClF,MAAM,KAAK,GAAG,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAClG,KAAK,MAAM,KAAK,IAAI,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACtD,KAAK,CAAC,IAAI,CAAC,QAAQ,KAAK,MAAM,KAAK,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1I,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,uHAAuH,CAAC,CAAC;IACpI,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC;AACD,MAAM,UAAU,WAAW,CAAC,MAAkB,EAAE,QAAQ,GAAG,KAAK;IAC5D,IAAI,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,CAAC;IACpG,MAAM,KAAK,GAAG,mCAAmC,CAAC;IAClD,IAAI,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,sBAAsB,CAAC,IAAI,QAAQ,IAAI,QAAQ,CAAC,QAAQ,CAAC,sBAAsB,CAAC;QACrH,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAC5D,IAAI,CAAC,QAAQ,EAAE,CAAC;QACZ,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9E,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9H,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC;QACjE,MAAM,KAAK,GAAG,CAAC,QAAQ,IAAI,YAAY,CAAC,CAAC;QACzC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO;YAC5B,KAAK,CAAC,IAAI,CAAC,cAAc,UAAU,YAAY,CAAC,CAAC;QACrD,MAAM,YAAY,GAAG,EAAE,aAAa,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,EAAE,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,KAAK,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,gBAAgB,EAAE,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5Q,sEAAsE;QACtE,0EAA0E;QAC1E,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,GAAW,EAAE,EAAE;YACvD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,GAAG,CAAC;gBACjC,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;YAC5D,OAAO,YAAY,CAAC,GAAgC,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;IACP,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACjC,CAAC;AAYD,MAAM,UAAU,SAAS,CAAC,KAAkC,EAAE,IAAa;
|
|
1
|
+
{"version":3,"file":"resources.js","sourceRoot":"","sources":["../../../src/integration/resources.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,19 @@ import { removeTree } from '@fbincon/statusline-platform/remove-tree';
|
|
|
7
7
|
import { PackageError } from '@fbincon/statusline-core/management/package';
|
|
8
8
|
export async function refreshIntegration(root, identity, configDir, host, hashes, workspace, dryRun, environment, signal, onProcess) {
|
|
9
9
|
const id = randomUUID(), request = join(workspace, id + '-request.json'), receipt = join(workspace, id + '-result.json');
|
|
10
|
-
|
|
10
|
+
const payload = { root, version: identity.version, entry: identity.entry, configDir, host, hashes, dryRun };
|
|
11
|
+
fs.writeFileSync(request, JSON.stringify(payload), { mode: 0o600 });
|
|
11
12
|
try {
|
|
13
|
+
const transition = await runSourceProcess({ executable: process.execPath, args: [fileURLToPath(new URL('./mod-transition-runner.js', import.meta.url)), request, receipt], cwd: workspace, input: '', timeoutMs: 180000, environment, signal, onProcess });
|
|
14
|
+
if (transition.reason === 'cancelled')
|
|
15
|
+
throw new PackageError('interrupted');
|
|
16
|
+
if (transition.reason !== 'completed')
|
|
17
|
+
throw new PackageError('integration_failed');
|
|
18
|
+
const prepared = JSON.parse(fs.readFileSync(receipt, 'utf8'));
|
|
19
|
+
if (!prepared.valid)
|
|
20
|
+
throw new PackageError('integration_failed');
|
|
21
|
+
fs.writeFileSync(request, JSON.stringify({ ...payload, hashes: prepared.hashes }), { mode: 0o600 });
|
|
22
|
+
fs.unlinkSync(receipt);
|
|
12
23
|
const result = await runSourceProcess({ executable: process.execPath, args: [fileURLToPath(new URL('./integration-runner.js', import.meta.url)), request, receipt], cwd: workspace, input: '', timeoutMs: 180000, environment, signal, onProcess });
|
|
13
24
|
if (result.reason === 'cancelled')
|
|
14
25
|
throw new PackageError('interrupted');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"integration.js","sourceRoot":"","sources":["../../../src/management/integration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,YAAY,EAAwB,MAAM,6CAA6C,CAAC;AAEjG,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,IAAY,EAAE,QAAyB,EAAE,SAAiB,EAAE,IAA8B,EAAE,MAAoB,EAAE,SAAiB,EAAE,MAAe,EAAE,WAA8B,EAAE,MAAoB,EAAE,SAAwC;IACzR,MAAM,EAAE,GAAG,UAAU,EAAE,EAAE,OAAO,GAAG,IAAI,CAAC,SAAS,EAAE,EAAE,GAAG,eAAe,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC,SAAS,EAAE,EAAE,GAAG,cAAc,CAAC,CAAC;IACzH,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"integration.js","sourceRoot":"","sources":["../../../src/management/integration.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
// A separate process keeps this runner's native adapter out of the target installer's process.
|
|
2
|
+
import { readFileSync, writeFileSync } from 'node:fs';
|
|
3
|
+
import { installContext } from '../integration/install.js';
|
|
4
|
+
import { prepareModDowngrade } from './mod-transition.js';
|
|
5
|
+
const [requestPath, receipt] = process.argv.slice(2);
|
|
6
|
+
try {
|
|
7
|
+
const request = JSON.parse(readFileSync(requestPath, 'utf8'));
|
|
8
|
+
const context = installContext(request.configDir, { executable: process.execPath, args: [request.entry] }, request.host);
|
|
9
|
+
const hashes = prepareModDowngrade(context, request.root, request.version, request.hashes, request.dryRun);
|
|
10
|
+
writeFileSync(receipt, JSON.stringify({ valid: true, hashes }) + '\n', { mode: 0o600 });
|
|
11
|
+
}
|
|
12
|
+
catch (error) {
|
|
13
|
+
writeFileSync(receipt, JSON.stringify({ valid: false, reason: error instanceof Error ? error.message : 'integration_failed' }) + '\n', { mode: 0o600 });
|
|
14
|
+
process.exitCode = 2;
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=mod-transition-runner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mod-transition-runner.js","sourceRoot":"","sources":["../../../src/management/mod-transition-runner.ts"],"names":[],"mappings":"AAAA,+FAA+F;AAC/F,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACrD,IAAI,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,WAAY,EAAE,MAAM,CAAC,CAAC,CAAC;IAC/D,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACzH,MAAM,MAAM,GAAG,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3G,aAAa,CAAC,OAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;AAC7F,CAAC;AAAC,OAAO,KAAK,EAAE,CAAC;IACb,aAAa,CAAC,OAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,oBAAoB,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACzJ,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;AACzB,CAAC"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import { type InstallContext } from '../integration/model.js';
|
|
2
|
+
import { type ConfigHashes } from './configuration.js';
|
|
3
|
+
export declare function prepareModDowngrade(context: InstallContext, root: string, version: string, expected: ConfigHashes, dryRun: boolean): ConfigHashes;
|
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
/** Refresh owned Mod bytes with the newer ownership reader before an older installer runs. */
|
|
2
|
+
import { join } from 'node:path';
|
|
3
|
+
import { readFileSync } from 'node:fs';
|
|
4
|
+
import { compatibility, compareVersions } from '@fbincon/statusline-core/management/compatibility';
|
|
5
|
+
import { PACKAGE_NAME, VERSION } from '@fbincon/statusline-core/release';
|
|
6
|
+
import { PROTOCOL_VERSION } from '@fbincon/statusline-core/contracts/ui';
|
|
7
|
+
import { equalSettings } from '@fbincon/statusline-core/json-equality';
|
|
8
|
+
import { PackageError } from '@fbincon/statusline-core/management/package';
|
|
9
|
+
import { decodeUtf8 } from '@fbincon/statusline-platform/utf8';
|
|
10
|
+
import { readJson } from '@fbincon/statusline-core/json-read';
|
|
11
|
+
import { NATIVE, RUNTIME } from '../integration/model.js';
|
|
12
|
+
import { owner } from '../integration/mod-ownership.js';
|
|
13
|
+
import { bundledFiles } from '../integration/resources.js';
|
|
14
|
+
import { integrate } from '../integration/mods.js';
|
|
15
|
+
import { BINDING_FILE } from '../integration/ownership.js';
|
|
16
|
+
import { administration } from '../recovery/service.js';
|
|
17
|
+
import { refreshIntents } from '../recovery/journal.js';
|
|
18
|
+
import { loadNative, loadRuntime } from '../config/backend-preferences.js';
|
|
19
|
+
import { readSettings } from '../config/storage.js';
|
|
20
|
+
import { automaticRequested } from '../sources/automatic-state.js';
|
|
21
|
+
import { atLeast } from '../config/service.js';
|
|
22
|
+
import { assertConfiguration, configurationBytes, configurationHashes } from './configuration.js';
|
|
23
|
+
export function prepareModDowngrade(context, root, version, expected, dryRun) {
|
|
24
|
+
assertConfiguration(context.configDir, expected);
|
|
25
|
+
const manifest = JSON.parse(readFileSync(join(root, 'package.json'), 'utf8'));
|
|
26
|
+
if (manifest.version !== version || manifest.name !== PACKAGE_NAME)
|
|
27
|
+
throw new PackageError('identity');
|
|
28
|
+
const target = compatibility(manifest.statuslineCompatibility, version);
|
|
29
|
+
const modes = loadRuntime(context.configDir, context.io);
|
|
30
|
+
const restricted = readSettings(context.configDir, context.io)[0].disableAllHooks === true;
|
|
31
|
+
const intents = refreshIntents(context.configDir);
|
|
32
|
+
const transitions = [NATIVE, RUNTIME].flatMap(original => {
|
|
33
|
+
const protocol = original.name === NATIVE.name ? target.editor_protocol : target.runtime_protocol;
|
|
34
|
+
const marker = owner(context.configDir, original, context.io, true);
|
|
35
|
+
if (!marker || marker.protocol_version <= protocol && compareVersions(marker.mod_version, version) <= 0 &&
|
|
36
|
+
target.editor_protocol >= PROTOCOL_VERSION && compareVersions(VERSION, version) <= 0)
|
|
37
|
+
return [];
|
|
38
|
+
const spec = { ...original, protocol };
|
|
39
|
+
const bundle = bundledFiles(spec, { root: join(root, 'node_modules/@fbincon/statusline-cli/resources', spec.name), version });
|
|
40
|
+
const requested = original.name === NATIVE.name ? loadNative(context.configDir, undefined, version, context.io)
|
|
41
|
+
: modes.native_timing || modes.live_metrics || automaticRequested(context.configDir);
|
|
42
|
+
return [{ spec, bundle, requested, disabled: !requested || restricted || intents.includes(spec.name) || !atLeast(context.version, spec.minimum) }];
|
|
43
|
+
});
|
|
44
|
+
if (dryRun || !transitions.length)
|
|
45
|
+
return expected;
|
|
46
|
+
const before = configurationBytes(context.configDir);
|
|
47
|
+
administration(context, false, tracked => {
|
|
48
|
+
assertConfiguration(context.configDir, expected);
|
|
49
|
+
for (const { spec, requested, bundle } of transitions) {
|
|
50
|
+
const result = integrate(tracked, spec, requested, !requested, bundle);
|
|
51
|
+
if (!['installed', 'plugin-disabled', 'disabled', 'suspended'].includes(result.state))
|
|
52
|
+
throw new PackageError('integration_failed');
|
|
53
|
+
}
|
|
54
|
+
});
|
|
55
|
+
const after = configurationBytes(context.configDir);
|
|
56
|
+
for (const name of Object.keys(before)) {
|
|
57
|
+
const a = before[name], b = after[name];
|
|
58
|
+
if (a === null ? b === null : b !== null && a.equals(b))
|
|
59
|
+
continue;
|
|
60
|
+
// Official refresh may rewrite formatting and the owned backend version.
|
|
61
|
+
// All other configuration values must still match the reviewed snapshot.
|
|
62
|
+
if (!['settings.json', BINDING_FILE].includes(name) || a === null || b === null)
|
|
63
|
+
throw new PackageError('conflict');
|
|
64
|
+
const left = readJson(decodeUtf8(a)), right = readJson(decodeUtf8(b));
|
|
65
|
+
if (name === 'settings.json') {
|
|
66
|
+
for (const { spec, requested } of transitions)
|
|
67
|
+
if (requested) {
|
|
68
|
+
const a = left.pluginConfigs?.[spec.plugin]?.options, b = right.pluginConfigs?.[spec.plugin]?.options;
|
|
69
|
+
if (a && b && b.backendVersion === version)
|
|
70
|
+
a.backendVersion = version;
|
|
71
|
+
}
|
|
72
|
+
for (const { spec, disabled } of transitions)
|
|
73
|
+
if (disabled) {
|
|
74
|
+
if (right.enabledPlugins?.[spec.plugin] === true)
|
|
75
|
+
throw new PackageError('conflict');
|
|
76
|
+
if (left.enabledPlugins)
|
|
77
|
+
delete left.enabledPlugins[spec.plugin];
|
|
78
|
+
if (right.enabledPlugins)
|
|
79
|
+
delete right.enabledPlugins[spec.plugin];
|
|
80
|
+
}
|
|
81
|
+
for (const value of [left, right])
|
|
82
|
+
if (value.enabledPlugins && !Object.keys(value.enabledPlugins).length)
|
|
83
|
+
delete value.enabledPlugins;
|
|
84
|
+
}
|
|
85
|
+
if (name === BINDING_FILE)
|
|
86
|
+
for (const value of [left, right]) {
|
|
87
|
+
value.refresh_disabled = value.refresh_disabled?.filter((name) => !transitions.some(t => t.spec.name === name && intents.includes(name)));
|
|
88
|
+
if (!value.refresh_disabled?.length)
|
|
89
|
+
delete value.refresh_disabled;
|
|
90
|
+
}
|
|
91
|
+
if (!equalSettings(left, right))
|
|
92
|
+
throw new PackageError('conflict');
|
|
93
|
+
}
|
|
94
|
+
return configurationHashes(after);
|
|
95
|
+
}
|
|
96
|
+
//# sourceMappingURL=mod-transition.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mod-transition.js","sourceRoot":"","sources":["../../../src/management/mod-transition.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,mDAAmD,CAAC;AACnG,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,6CAA6C,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,OAAO,EAAuB,MAAM,yBAAyB,CAAC;AAC/E,OAAO,EAAE,KAAK,EAAE,MAAM,iCAAiC,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,mBAAmB,EAAqB,MAAM,oBAAoB,CAAC;AAErH,MAAM,UAAU,mBAAmB,CAAC,OAAuB,EAAE,IAAY,EAAE,OAAe,EAAE,QAAsB,EAAE,MAAe;IAC/H,mBAAmB,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IAC9E,IAAI,QAAQ,CAAC,OAAO,KAAK,OAAO,IAAI,QAAQ,CAAC,IAAI,KAAK,YAAY;QAAE,MAAM,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC;IACvG,MAAM,MAAM,GAAG,aAAa,CAAC,QAAQ,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;IACxE,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IACzD,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,KAAK,IAAI,CAAC;IAC3F,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAClD,MAAM,WAAW,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QACrD,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC;QAClG,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACpE,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,gBAAgB,IAAI,QAAQ,IAAI,eAAe,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC;YACnG,MAAM,CAAC,eAAe,IAAI,gBAAgB,IAAI,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC;YAAE,OAAO,EAAE,CAAC;QACpG,MAAM,IAAI,GAAG,EAAE,GAAG,QAAQ,EAAE,QAAQ,EAAE,CAAC;QACvC,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,gDAAgD,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAC9H,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;YAC3G,CAAC,CAAC,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,YAAY,IAAI,kBAAkB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACzF,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,SAAS,IAAI,UAAU,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACvJ,CAAC,CAAC,CAAC;IACH,IAAI,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM;QAAE,OAAO,QAAQ,CAAC;IACnD,MAAM,MAAM,GAAG,kBAAkB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACrD,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE;QACrC,mBAAmB,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACjD,KAAK,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,WAAW,EAAE,CAAC;YACpD,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACvE,IAAI,CAAC,CAAC,WAAW,EAAC,iBAAiB,EAAC,UAAU,EAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC;gBAAE,MAAM,IAAI,YAAY,CAAC,oBAAoB,CAAC,CAAC;QACrI,CAAC;IACL,CAAC,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,kBAAkB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpD,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACrC,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAE,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,CAAE,CAAC;QAC1C,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YAAE,SAAS;QAClE,yEAAyE;QACzE,yEAAyE;QACzE,IAAI,CAAC,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,IAAI;YAAE,MAAM,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC;QACpH,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAwB,EAAE,KAAK,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAwB,CAAC;QACpH,IAAI,IAAI,KAAK,eAAe,EAAE,CAAC;YAC3B,KAAK,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,WAAW;gBAAE,IAAI,SAAS,EAAE,CAAC;oBAC3D,MAAM,CAAC,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;oBACtG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,cAAc,KAAK,OAAO;wBAAE,CAAC,CAAC,cAAc,GAAG,OAAO,CAAC;gBAC3E,CAAC;YACD,KAAK,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,WAAW;gBAAE,IAAI,QAAQ,EAAE,CAAC;oBACzD,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI;wBAAE,MAAM,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC;oBACrF,IAAI,IAAI,CAAC,cAAc;wBAAE,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBACjE,IAAI,KAAK,CAAC,cAAc;wBAAE,OAAO,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACvE,CAAC;YACD,KAAK,MAAM,KAAK,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC;gBAAE,IAAI,KAAK,CAAC,cAAc,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,MAAM;oBAAE,OAAO,KAAK,CAAC,cAAc,CAAC;QAC1I,CAAC;QACD,IAAI,IAAI,KAAK,YAAY;YAAE,KAAK,MAAM,KAAK,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;gBAC3D,KAAK,CAAC,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClJ,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,MAAM;oBAAE,OAAO,KAAK,CAAC,gBAAgB,CAAC;YACvE,CAAC;QACD,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC;YAAE,MAAM,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC;IACxE,CAAC;IACD,OAAO,mBAAmB,CAAC,KAAK,CAAC,CAAC;AACtC,CAAC"}
|
|
@@ -3,7 +3,7 @@ import type { Diagnose } from '../diagnostics/service.js';
|
|
|
3
3
|
import * as contracts from '@fbincon/statusline-core/contracts/ui';
|
|
4
4
|
import type { Draft } from '@fbincon/statusline-core/contracts/ui';
|
|
5
5
|
import { ConfigurationService, type EffectiveConfig } from '../config/service.js';
|
|
6
|
-
export declare const BACKEND_VERSION = "3.
|
|
6
|
+
export declare const BACKEND_VERSION = "3.9.0";
|
|
7
7
|
export declare const OPERATIONS: readonly ["sources_read", "sources_apply", "source_review", "source_context", "source_refresh", "source_status", "source_cancel", "source_diagnose", "describe", "read", "preview", "apply", "import", "export", "preset", "read_ui_preferences", "set_ui_language", "review_import", "explain", "diagnose", "profiles_read", "profiles_apply", "profile_import", "profile_export", "task_details"];
|
|
8
8
|
export type Preview = (draft: Draft, width: number, trace?: RenderTrace) => contracts.PreviewResult;
|
|
9
9
|
export declare function capabilities(version: readonly number[] | null): contracts.Capabilities;
|
|
@@ -13,6 +13,7 @@ import { ConfigError, object } from '@fbincon/statusline-core/config/validation'
|
|
|
13
13
|
import { ITEMS } from '@fbincon/statusline-core/config/catalog';
|
|
14
14
|
import { applyPreset } from '@fbincon/statusline-core/config/presets';
|
|
15
15
|
import { differences } from '@fbincon/statusline-core/config/import-review';
|
|
16
|
+
import { selectImport } from '@fbincon/statusline-core/editor/import-selection';
|
|
16
17
|
import { text } from '@fbincon/statusline-core/i18n/messages';
|
|
17
18
|
import { readJson, JsonSyntaxError } from '@fbincon/statusline-core/json-read';
|
|
18
19
|
import { safeInteger } from '@fbincon/statusline-core/json';
|
|
@@ -102,11 +103,16 @@ export class ConfigurationProtocol {
|
|
|
102
103
|
}
|
|
103
104
|
if (operation === 'profiles_apply')
|
|
104
105
|
return profiles.mutate(payload);
|
|
105
|
-
requestObject(payload, operation === 'profile_import' ? ['path'] : ['path', 'name', 'display', 'overwrite'], 'payload');
|
|
106
|
+
requestObject(payload, operation === 'profile_import' ? ['path', ...(object(payload) && Object.hasOwn(payload, 'selection') ? ['draft', 'selection'] : [])] : ['path', 'name', 'display', 'overwrite'], 'payload');
|
|
106
107
|
if (typeof payload.path !== 'string' || !payload.path.trim() || payload.path.includes('\0'))
|
|
107
108
|
throw new ConfigError('errors.protocol.path_must_be_nonempty_text_without_nul', {}, 'invalid_request');
|
|
108
|
-
if (operation === 'profile_import')
|
|
109
|
-
|
|
109
|
+
if (operation === 'profile_import') {
|
|
110
|
+
const imported = profiles.import(payload.path);
|
|
111
|
+
if (!Object.hasOwn(payload, 'selection'))
|
|
112
|
+
return imported;
|
|
113
|
+
const current = validateDraft(payload.draft, true);
|
|
114
|
+
return { name: imported.name, display: selective(current, { display: imported.display, host: current.host }, payload.selection).display };
|
|
115
|
+
}
|
|
110
116
|
if (typeof payload.name !== 'string' || typeof payload.overwrite !== 'boolean')
|
|
111
117
|
throw new ConfigError('profiles.error.invalid', { value: '' }, 'invalid_request');
|
|
112
118
|
return profiles.export(payload.path, payload.name, payload.display, payload.overwrite);
|
|
@@ -116,7 +122,7 @@ export class ConfigurationProtocol {
|
|
|
116
122
|
return operation === 'read_ui_preferences' ? readPreferences(this.service.context.configDir, this.service.io) : setLanguage(this.service.context.configDir, payload.ui_language, this.service.io);
|
|
117
123
|
}
|
|
118
124
|
if (['import', 'review_import', 'export', 'preset'].includes(operation)) {
|
|
119
|
-
requestObject(payload, operation === 'export' ? ['draft', 'path', 'overwrite'] : operation === 'preset' ? ['draft', 'preset'] : ['draft', 'path'], 'payload');
|
|
125
|
+
requestObject(payload, operation === 'export' ? ['draft', 'path', 'overwrite'] : operation === 'preset' ? ['draft', 'preset'] : ['draft', 'path', ...(object(payload) && Object.hasOwn(payload, 'selection') ? ['selection'] : [])], 'payload');
|
|
120
126
|
const current = validateDraft(payload.draft, true);
|
|
121
127
|
if (operation === 'preset') {
|
|
122
128
|
if (typeof payload.preset !== 'string')
|
|
@@ -127,9 +133,9 @@ export class ConfigurationProtocol {
|
|
|
127
133
|
if (typeof path !== 'string' || !path.trim() || path.includes('\0'))
|
|
128
134
|
throw new ConfigError('errors.protocol.path_must_be_nonempty_text_without_nul', {}, 'invalid_request');
|
|
129
135
|
if (operation === 'import')
|
|
130
|
-
return { draft: importFile(path, current) };
|
|
136
|
+
return { draft: object(payload) && Object.hasOwn(payload, 'selection') ? selective(current, importFile(path, current), payload.selection) : importFile(path, current) };
|
|
131
137
|
if (operation === 'review_import') {
|
|
132
|
-
const
|
|
138
|
+
const imported = importFile(path, current), candidate = object(payload) && Object.hasOwn(payload, 'selection') ? selective(current, imported, payload.selection) : imported;
|
|
133
139
|
return { draft: candidate, changes: differences(current, candidate) };
|
|
134
140
|
}
|
|
135
141
|
if (typeof payload.overwrite !== 'boolean')
|
|
@@ -213,4 +219,14 @@ export class ConfigurationProtocol {
|
|
|
213
219
|
}
|
|
214
220
|
}
|
|
215
221
|
}
|
|
222
|
+
function selective(current, incoming, selection) {
|
|
223
|
+
try {
|
|
224
|
+
return validateDraft(selectImport(current, incoming, selection), true);
|
|
225
|
+
}
|
|
226
|
+
catch (error) {
|
|
227
|
+
if (error instanceof Error && error.message === 'review.selection.invalid')
|
|
228
|
+
throw new ConfigError(error.message);
|
|
229
|
+
throw error;
|
|
230
|
+
}
|
|
231
|
+
}
|
|
216
232
|
//# sourceMappingURL=protocol.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../../src/ui/protocol.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../../src/ui/protocol.ts"],"names":[],"mappings":"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"}
|
|
@@ -343,7 +343,7 @@ async function transferDraft($: EngineInterface, state: Session, options: Plugin
|
|
|
343
343
|
const result = await callBackend($, options, 'review_import', {draft:copyDraft(candidate.draft), path:e.path});
|
|
344
344
|
if (state.epoch === epoch && state.view.editor === e) {
|
|
345
345
|
if (!sameDraft(e.draft, original)) { setMessage(state.view, 'message', localizedText('review.stale')); return; }
|
|
346
|
-
e.review = createReview(result);
|
|
346
|
+
e.review = createReview(result, candidate.draft);
|
|
347
347
|
state.view.preview = null;
|
|
348
348
|
state.previewKey = '';
|
|
349
349
|
state.view.message = '';
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
// Generated by tools/generation/resources.ts; do not edit.
|
|
2
|
+
import { validAlignments } from './editor/alignments.ts';
|
|
3
|
+
import { GRADIENT_KEYS, validGradient } from './editor/gradients.ts';
|
|
2
4
|
import { validCostRateOptions } from './editor/cost-rate.ts';
|
|
3
5
|
import { validGroups } from './editor/groups.ts';
|
|
4
6
|
import { INDICATOR_KEYS, validIndicatorOptions } from './editor/indicators.ts';
|
|
@@ -108,10 +110,10 @@ function formatOverrides(value: unknown): boolean {
|
|
|
108
110
|
function itemOptions(value: unknown, ids: readonly string[], scope: "main" | "subagent"): boolean {
|
|
109
111
|
if (!object(value)) return false;
|
|
110
112
|
return Object.entries(value).every(([id, option]) => ids.includes(id) && object(option) &&
|
|
111
|
-
exact(option, ['label', 'icon', 'priority', 'max_width', 'formatting', 'foreground', 'background', 'visibility', 'visibility_threshold', ...(option.link !== undefined ? ['link'] : []), ...INDICATOR_KEYS.filter(key => Object.hasOwn(option, key)), ...(Object.hasOwn(option, 'cost_rate_basis') ? ['cost_rate_basis'] : [])]) && (option.link === undefined || ['off','auto','on'].includes(String(option.link))) &&
|
|
113
|
+
exact(option, [...GRADIENT_KEYS.filter(key => Object.hasOwn(option, key)), 'label', 'icon', 'priority', 'max_width', 'formatting', 'foreground', 'background', 'visibility', 'visibility_threshold', ...(option.link !== undefined ? ['link'] : []), ...INDICATOR_KEYS.filter(key => Object.hasOwn(option, key)), ...(Object.hasOwn(option, 'cost_rate_basis') ? ['cost_rate_basis'] : [])]) && (option.link === undefined || ['off','auto','on'].includes(String(option.link))) &&
|
|
112
114
|
(option.label === null || (text(option.label) && [...option.label].length <= 256)) &&
|
|
113
115
|
(option.icon === null || (text(option.icon) && [...option.icon].length <= 256)) &&
|
|
114
|
-
validIndicatorOptions(option, scope, id) && validCostRateOptions(option, scope, id) && range(option.priority, 0, 100) && range(option.max_width, 2, 10000, true) &&
|
|
116
|
+
GRADIENT_KEYS.every(key => option[key] === undefined || id !== 'spacer' && validGradient(option[key])) && validIndicatorOptions(option, scope, id) && validCostRateOptions(option, scope, id) && range(option.priority, 0, 100) && range(option.max_width, 2, 10000, true) &&
|
|
115
117
|
formatOverrides(option.formatting) && validColor(option.foreground) && validColor(option.background) &&
|
|
116
118
|
typeof option.visibility === "string" && visibilityChoices(scope, id).includes(option.visibility) &&
|
|
117
119
|
range(option.visibility_threshold, 0, 100));
|
|
@@ -173,7 +175,7 @@ export function isDraft(value: unknown): value is Draft {
|
|
|
173
175
|
)
|
|
174
176
|
return false;
|
|
175
177
|
if (
|
|
176
|
-
d.schema_version !==
|
|
178
|
+
d.schema_version !== 15 ||
|
|
177
179
|
!object(d.powerline) || !exact(d.powerline, POWERLINE_FIELDS.map(f => f.key.slice(10))) ||
|
|
178
180
|
!POWERLINE_FIELDS.every(f => f.kind === 'boolean' ? typeof (d.powerline as Record<string, unknown>)[f.key.slice(10)] === 'boolean' :
|
|
179
181
|
(f.choices as readonly unknown[]).includes((d.powerline as Record<string, unknown>)[f.key.slice(10)])) ||
|
|
@@ -208,12 +210,13 @@ export function isDraft(value: unknown): value is Draft {
|
|
|
208
210
|
const ids = d.instances.map(i=>i.id);
|
|
209
211
|
const spacers = new Set(d.instances.filter(i=>i.type_id==='spacer').map(i=>i.id));
|
|
210
212
|
const layout = d.layout;
|
|
211
|
-
if (!object(layout) || !exact(layout, ['mode', 'rows']) ||
|
|
213
|
+
if (!object(layout) || !exact(layout, ['mode', 'rows', ...(Object.hasOwn(layout, 'alignments') ? ['alignments'] : [])]) ||
|
|
212
214
|
!['auto', 'explicit'].includes(String(layout.mode)) || !Array.isArray(layout.rows) ||
|
|
213
215
|
!layout.rows.every((r) => selection(r, ids) && r.length > 0 && r.filter(id => spacers.has(id)).length <= 1) ||
|
|
214
216
|
(layout.mode === 'auto' ? layout.rows.length !== 0 || spacers.size > 0 :
|
|
215
217
|
JSON.stringify(layout.rows.flat()) !== JSON.stringify(ids))) return false;
|
|
216
218
|
if (!validGroups(d.groups, d.instances, layout as unknown as import('./generated-contracts.ts').LayoutDraft) || !validGroups(sub.groups, sub.instances)) return false;
|
|
219
|
+
if (!validAlignments(layout.alignments, layout as unknown as import('./generated-contracts.ts').LayoutDraft, d.instances, d.groups)) return false;
|
|
217
220
|
// Exclusions come from describe; the backend remains the final draft validator.
|
|
218
221
|
return (
|
|
219
222
|
typeof h.padding === 'number' &&
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { openAlignments, alignmentsKey } from '../editor/alignment-manager.ts';
|
|
1
2
|
import { openGroups, groupsKey } from '../editor/group-manager.ts';
|
|
2
3
|
import { openSources, sourcesKey } from '../editor/source-manager.ts';
|
|
3
4
|
import { openExplanation, explanationKey } from '../editor/explanation.ts';
|
|
@@ -37,6 +38,7 @@ export function handleKey(view: View, event: NativeKeyEvent, columns: number, ro
|
|
|
37
38
|
const shortcut = /^[A-Z]$/.test(key) ? key.toLowerCase() : key;
|
|
38
39
|
if (!e || view.busy) return null;
|
|
39
40
|
if (event.overflow) { setMessage(view, 'message', localizedText('input.overflow')); return null; }
|
|
41
|
+
if (e.alignmentManager) return alignmentsKey(e,event);
|
|
40
42
|
if (e.groupManager) return groupsKey(e, event);
|
|
41
43
|
if (event.ctrl && key.toLowerCase() === 'b' && !view.input && !view.uncertain && !e.sources && !e.profiles && !e.review && !e.quick && !e.explanation && !event.text) { openGroups(e); return null; }
|
|
42
44
|
if (e.sources) return sourcesKey(e,event);
|
|
@@ -56,7 +58,7 @@ export function handleKey(view: View, event: NativeKeyEvent, columns: number, ro
|
|
|
56
58
|
if (view.uncertain) return event.ctrl || event.meta ? null : shortcut === 'k' ? 'reconcile' : shortcut === 'q' ? 'close' : null;
|
|
57
59
|
if (e.review) {
|
|
58
60
|
if (event.ctrl || event.meta) return null;
|
|
59
|
-
if (shortcut === 'a') {
|
|
61
|
+
if (shortcut === 'a' && !e.review.choosing) {
|
|
60
62
|
e.replaceDraft(e.review.result.draft);
|
|
61
63
|
setMessage(view, 'message', localizedText('review.accepted'));
|
|
62
64
|
return 'reviewPreview';
|
|
@@ -64,7 +66,7 @@ export function handleKey(view: View, event: NativeKeyEvent, columns: number, ro
|
|
|
64
66
|
if (shortcut === 'q') { cancelInput(view); return 'reviewPreview'; }
|
|
65
67
|
const layout = editorLayout(view, columns, rows);
|
|
66
68
|
navigateReview(e.review, key, view.language ?? 'en', Math.max(2, columns - (layout.framed ? 2 : 0)), Math.max(1, layout.bodyRows - 1));
|
|
67
|
-
return
|
|
69
|
+
return 'reviewPreview';
|
|
68
70
|
}
|
|
69
71
|
if (e.guidanceScroll !== null && e.detail) {
|
|
70
72
|
const layout = editorLayout(view, columns, rows);
|
|
@@ -141,11 +143,11 @@ export function handleKey(view: View, event: NativeKeyEvent, columns: number, ro
|
|
|
141
143
|
if(!event.meta && key.toLowerCase()==='a'&&!e.adding){e.openPicker(scope);return null;}
|
|
142
144
|
if(!event.meta && ['d','x'].includes(key.toLowerCase())&&!e.adding){
|
|
143
145
|
if(!e.instanceAction(scope,key.toLowerCase()==='d'?'copy':'remove'))
|
|
144
|
-
setMessage(view,'message',
|
|
146
|
+
setMessage(view,'message',e.compositionError);
|
|
145
147
|
return null;
|
|
146
148
|
}
|
|
147
149
|
if(e.adding&&!event.ctrl&&!event.meta&&(key==='return'||key===' ')){
|
|
148
|
-
if(!e.instanceAction(scope,'add',e.selected[scope]))setMessage(view,'message',
|
|
150
|
+
if(!e.instanceAction(scope,'add',e.selected[scope]))setMessage(view,'message',e.compositionError);
|
|
149
151
|
return null;
|
|
150
152
|
}
|
|
151
153
|
if(e.adding&&!event.ctrl&&!event.meta&&shortcut==='q'){e.closePicker(scope);return null;}
|
|
@@ -198,11 +200,12 @@ export function handleKey(view: View, event: NativeKeyEvent, columns: number, ro
|
|
|
198
200
|
if (isSettings) adjustSetting(view, key === 'left' ? -1 : 1);
|
|
199
201
|
else {
|
|
200
202
|
const delta = key === 'left' ? -1 : 1;
|
|
201
|
-
if (keys[index + delta] && !e.move(scope, delta)) setMessage(view, 'message',
|
|
203
|
+
if (keys[index + delta] && !e.move(scope, delta)) setMessage(view, 'message', e.compositionError);
|
|
202
204
|
}
|
|
203
205
|
return isSettings && e.setting === 'preview-background' ? 'previewBackground' : isSettings && e.setting === 'ui-language' ? 'uiLanguage' : null;
|
|
204
206
|
} else if (key === 'return' || key === ' ' || key === 'space') {
|
|
205
|
-
if (!isSettings) { if(!e.toggle(scope, selected))setMessage(view,"message",
|
|
207
|
+
if (!isSettings) { if(!e.toggle(scope, selected))setMessage(view,"message",e.compositionError); }
|
|
208
|
+
else if (e.setting === 'row-alignment') { openAlignments(e); return null; }
|
|
206
209
|
else if (e.setting === 'component-groups') { openGroups(e); return null; }
|
|
207
210
|
else if (e.setting === 'sources') {openSources(e);return 'sources';}
|
|
208
211
|
else if (e.setting === 'profiles') { if (e.acceptNumeric()) { openProfiles(e); return 'profiles'; } }
|
package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/client/settings.ts
CHANGED
|
@@ -16,7 +16,11 @@ export interface SettingRow {
|
|
|
16
16
|
export function settingRows(view: View): SettingRow[] {
|
|
17
17
|
const e = view.editor!;
|
|
18
18
|
if (e.detail) return [...(!e.adding ? [{key:'item-explain',label:'Configuration and sample explanation',group:'Item format',value:'Enter',editable:true}] : []), {key:'item-guidance', label:'Sources and requirements', group:'Item format', value:'Enter: read guidance', editable:true}, ...formRows(view)];
|
|
19
|
-
if (e.page === 'layout')
|
|
19
|
+
if (e.page === 'layout') {
|
|
20
|
+
const fields = formRows(view);
|
|
21
|
+
if (!e.draft.display.instances.length) return fields;
|
|
22
|
+
return [fields[0]!, {key:'row-alignment',label:'Align explicit main rows',group:'Layout',value:'Enter',editable:true}, ...fields.slice(1)];
|
|
23
|
+
}
|
|
20
24
|
const d = e.draft.display;
|
|
21
25
|
const h = e.draft.host;
|
|
22
26
|
const rows: SettingRow[] = [
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
// Generated by tools/generation/resources.ts; do not edit.
|
|
2
|
+
import type { AlignmentDraft, AlignmentRef } from '../generated-contracts.ts';
|
|
3
|
+
import type { Editor } from './draft.ts';
|
|
4
|
+
import type { TextKey } from './text-input.ts';
|
|
5
|
+
import { alignmentUnits, editAlignment, refKey } from './alignments.ts';
|
|
6
|
+
import { newInstance } from './instances.ts';
|
|
7
|
+
import { t, type Language } from '../i18n/index.ts';
|
|
8
|
+
import { wrapText } from '../../ui/text.ts';
|
|
9
|
+
export interface AlignmentManager {
|
|
10
|
+
page:'list'|'actions'|'form';cursor:number;selected:string|null;column:number;columns:AlignmentRef[][];error:boolean;
|
|
11
|
+
}
|
|
12
|
+
export function openAlignments(e: Editor): void {
|
|
13
|
+
e.alignmentManager={page:'list',cursor:0,selected:null,column:0,columns:[[]],error:false};
|
|
14
|
+
}
|
|
15
|
+
function form(e:Editor,value?:AlignmentDraft):void {
|
|
16
|
+
const m=e.alignmentManager!;m.page='form';m.cursor=0;m.selected=value?.id??null;m.columns=JSON.parse(JSON.stringify(value?.columns??[[]]));m.column=0;m.error=false;
|
|
17
|
+
}
|
|
18
|
+
export function alignmentsKey(e:Editor,event:TextKey):null {
|
|
19
|
+
const m=e.alignmentManager!;if(event.text||event.paste||event.meta||event.overflow)return null;
|
|
20
|
+
const key=event.key==='return'?'enter':event.key;
|
|
21
|
+
if(key==='escape'||event.ctrl&&key.toLowerCase()==='g') { if(m.page==='list')e.alignmentManager=null;else {m.page='list';m.cursor=0;m.error=false;}return null; }
|
|
22
|
+
if(event.ctrl)return null;
|
|
23
|
+
const d=e.draft.display, values=d.layout.alignments??[], length=m.page==='list'?values.length+1:m.page==='actions'?2:d.layout.rows.length+4;
|
|
24
|
+
if(['up','down','tab'].includes(key))m.cursor=Math.max(0,Math.min(length-1,m.cursor+(key==='up'?-1:1)));
|
|
25
|
+
if(key==='home')m.cursor=0;if(key==='end')m.cursor=length-1;
|
|
26
|
+
if(m.page==='list'&&key==='enter') { const value=values[m.cursor];if(value){m.selected=value.id;m.page='actions';m.cursor=0;}else form(e); }
|
|
27
|
+
else if(m.page==='actions'&&key==='enter') {
|
|
28
|
+
if(m.cursor===0)form(e,values.find(v=>v.id===m.selected));
|
|
29
|
+
else { e.draft={...e.draft,display:editAlignment(d,m.selected!)};m.page='list';m.cursor=0; }
|
|
30
|
+
} else if(m.page==='form'&&['left','right','enter','space',' '].includes(key)) {
|
|
31
|
+
const rows=d.layout.rows.length;
|
|
32
|
+
if(m.cursor===0)m.column=(m.column+(key==='left'?m.columns.length-1:1))%m.columns.length;
|
|
33
|
+
else if(m.cursor<=rows) {
|
|
34
|
+
const row=m.cursor-1, units=alignmentUnits(d.layout,d.instances,d.groups), choices=units.filter(u=>u.row===row);
|
|
35
|
+
const previous=m.columns[m.column]!.find(ref=>choices.some(u=>refKey(u.ref)===refKey(ref)));
|
|
36
|
+
const index=previous?choices.findIndex(u=>refKey(u.ref)===refKey(previous))+1:0;
|
|
37
|
+
const next=(index+(key==='left'?choices.length:1))%(choices.length+1);
|
|
38
|
+
m.columns[m.column]=m.columns[m.column]!.filter(ref=>!choices.some(u=>refKey(u.ref)===refKey(ref)));
|
|
39
|
+
if(next)m.columns[m.column]!.push(choices[next-1]!.ref);
|
|
40
|
+
} else if(key==='enter'&&m.cursor===rows+1) {m.columns.push([]);m.column=m.columns.length-1;m.cursor=1;}
|
|
41
|
+
else if(key==='enter'&&m.cursor===rows+2) {if(m.columns.length>1)m.columns.splice(m.column,1);else m.columns=[[]];m.column=Math.min(m.column,m.columns.length-1);}
|
|
42
|
+
else if(key==='enter'&&m.cursor===rows+3) {
|
|
43
|
+
try {
|
|
44
|
+
let id=m.selected??newInstance('text',d.instances).id;while(!m.selected&&values.some(v=>v.id===id))id=newInstance('text',d.instances).id;
|
|
45
|
+
e.draft={...e.draft,display:editAlignment(d,id,m.columns)};m.page='list';m.cursor=0;m.error=false;
|
|
46
|
+
}catch {m.error=true;}return null;
|
|
47
|
+
}
|
|
48
|
+
m.error=false;
|
|
49
|
+
}
|
|
50
|
+
return null;
|
|
51
|
+
}
|
|
52
|
+
export function alignmentsView(e:Editor,language:Language,width:number,height:number):{text:string;selected?:boolean}[] {
|
|
53
|
+
const m=e.alignmentManager!,d=e.draft.display,tr=(key:string)=>t('alignment.'+key,language),units=alignmentUnits(d.layout,d.instances,d.groups);
|
|
54
|
+
const label=(ref:AlignmentRef)=>{const u=units.find(u=>refKey(u.ref)===refKey(ref));return u?e.instanceLabel('main',ref.kind==='group'?d.groups.find(g=>g.id===ref.id)!.primary_id:ref.id,language)+(ref.kind==='group'?' · '+tr('group'):'')+' ('+ref.id+')':'—';};
|
|
55
|
+
const values=m.page==='list'?[...(d.layout.alignments??[]).map(v=>v.id+' · '+v.columns.length),tr('create')]:m.page==='actions'?[tr('edit'),tr('remove')]:
|
|
56
|
+
[tr('column')+': '+(m.column+1)+'/'+m.columns.length,...d.layout.rows.map((_,row)=>tr('row')+' '+(row+1)+': '+(m.columns[m.column]!.find(ref=>units.some(u=>u.row===row&&refKey(u.ref)===refKey(ref))) ? label(m.columns[m.column]!.find(ref=>units.some(u=>u.row===row&&refKey(u.ref)===refKey(ref)))!) : '—')),tr('add_column'),tr('remove_column'),tr('apply')];
|
|
57
|
+
const note=wrapText([tr(d.layout.mode!=='explicit'?'explicit':m.error?'invalid':'help')],width),capacity=Math.max(1,height-Math.min(2,note.length)),start=Math.max(0,m.cursor-capacity+1);
|
|
58
|
+
return [...values.slice(start,start+capacity).map((text,i)=>({text:(start+i===m.cursor?'› ':' ')+text,selected:start+i===m.cursor})),...note.slice(0,Math.max(0,height-Math.min(capacity,values.length))).map(text=>({text}))];
|
|
59
|
+
}
|