@fbincon/claude-code-statusline 3.11.0 → 3.13.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 +82 -79
- package/candidate.json +356 -254
- package/node_modules/@fbincon/statusline-cli/dist/src/config/arguments.d.ts +1 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/config/arguments.js +9 -0
- 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 +23 -0
- 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 -3
- package/node_modules/@fbincon/statusline-cli/dist/src/config/profile-command.js.map +1 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/config/reuse.d.ts +3 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/config/reuse.js +62 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/config/reuse.js.map +1 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/config/structural-review.d.ts +5 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/config/structural-review.js +45 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/config/structural-review.js.map +1 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/integration/configure.js +5 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/integration/configure.js.map +1 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/integration/editor-bootstrap.d.ts +1 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/integration/editor-bootstrap.js +41 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/integration/editor-bootstrap.js.map +1 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/integration/editor-worker-entry.d.ts +1 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/integration/editor-worker-entry.js +14 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/integration/editor-worker-entry.js.map +1 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/main.js +9 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/main.js.map +1 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/management/execution-worker-entry.d.ts +1 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/management/execution-worker-entry.js +4 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/management/execution-worker-entry.js.map +1 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/management/execution.d.ts +29 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/management/execution.js +228 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/management/execution.js.map +1 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/management/history.d.ts +4 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/management/history.js +150 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/management/history.js.map +1 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/management/inspection.js +30 -13
- package/node_modules/@fbincon/statusline-cli/dist/src/management/inspection.js.map +1 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/management/mod-transition.js +2 -2
- package/node_modules/@fbincon/statusline-cli/dist/src/management/mod-transition.js.map +1 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/management/review-jobs.d.ts +1 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/management/review-jobs.js +11 -6
- package/node_modules/@fbincon/statusline-cli/dist/src/management/review-jobs.js.map +1 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/management/service.d.ts +2 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/management/service.js +9 -5
- package/node_modules/@fbincon/statusline-cli/dist/src/management/service.js.map +1 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/management/store.js +6 -6
- package/node_modules/@fbincon/statusline-cli/dist/src/management/store.js.map +1 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/sources/automatic-state.d.ts +1 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/sources/automatic-state.js +6 -6
- package/node_modules/@fbincon/statusline-cli/dist/src/sources/automatic-state.js.map +1 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/sources/automatic.js +76 -28
- package/node_modules/@fbincon/statusline-cli/dist/src/sources/automatic.js.map +1 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/sources/bindings.d.ts +17 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/sources/bindings.js +176 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/sources/bindings.js.map +1 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/sources/command.js +11 -3
- package/node_modules/@fbincon/statusline-cli/dist/src/sources/command.js.map +1 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/sources/providers.js +26 -8
- package/node_modules/@fbincon/statusline-cli/dist/src/sources/providers.js.map +1 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/sources/service.d.ts +3 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/sources/service.js +54 -14
- package/node_modules/@fbincon/statusline-cli/dist/src/sources/service.js.map +1 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/ui/protocol.d.ts +3 -3
- package/node_modules/@fbincon/statusline-cli/dist/src/ui/protocol.js +50 -0
- 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 +30 -18
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/backend.ts +4 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/client/keys.ts +14 -3
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/client/settings.ts +8 -5
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/alignment-manager.ts +2 -2
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/change-review.ts +109 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/color-manager.ts +1 -1
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/draft.ts +74 -21
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/forms.ts +2 -9
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/group-manager.ts +2 -3
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/groups.ts +2 -2
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/history.ts +33 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/package-manager.ts +164 -291
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/package-validation.ts +10 -1
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/reuse-manager.ts +150 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/reuse.ts +96 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/source-compatibility.ts +7 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/source-manager.ts +64 -45
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/source-summary.ts +22 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/source-validation.ts +11 -2
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/structure.ts +30 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/generated-contracts.ts +49 -6
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/i18n/generated-locales.ts +7 -12722
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/i18n/locales/en.ts +2291 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/i18n/locales/ja.ts +2291 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/i18n/locales/ko.ts +2291 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/i18n/locales/zh-CN.ts +2291 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/i18n/locales/zh-HK.ts +2291 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/i18n/locales/zh-TW.ts +2291 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/resource-manifest.json +35 -22
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/ui/client/draw.ts +4 -1
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/ui/client/help.ts +3 -2
- package/node_modules/@fbincon/statusline-cli/resources/statusline-runtime/.claude-plugin/plugin.json +1 -1
- package/node_modules/@fbincon/statusline-cli/resources/statusline-runtime/hooks/observe.ts +10 -3
- package/node_modules/@fbincon/statusline-cli/resources/statusline-runtime/resource-manifest.json +4 -4
- package/node_modules/@fbincon/statusline-core/dist/src/contracts/ui.d.ts +127 -6
- 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.js +2 -2
- package/node_modules/@fbincon/statusline-core/dist/src/editor/alignment-manager.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/backend.js +6 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/backend.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/change-review.d.ts +32 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/change-review.js +155 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/change-review.js.map +1 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/color-manager.js +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/color-manager.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/draft.d.ts +20 -3
- package/node_modules/@fbincon/statusline-core/dist/src/editor/draft.js +121 -23
- 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 +2 -10
- package/node_modules/@fbincon/statusline-core/dist/src/editor/forms.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/group-manager.js +2 -5
- 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.d.ts +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/groups.js +2 -2
- package/node_modules/@fbincon/statusline-core/dist/src/editor/groups.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/history.d.ts +22 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/history.js +37 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/history.js.map +1 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/package-manager.d.ts +12 -4
- package/node_modules/@fbincon/statusline-core/dist/src/editor/package-manager.js +302 -85
- package/node_modules/@fbincon/statusline-core/dist/src/editor/package-manager.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/package-validation.js +12 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/package-validation.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/reuse-manager.d.ts +39 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/reuse-manager.js +271 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/reuse-manager.js.map +1 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/reuse.d.ts +6 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/reuse.js +135 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/reuse.js.map +1 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/source-compatibility.d.ts +3 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/source-compatibility.js +7 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/source-compatibility.js.map +1 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/source-manager.d.ts +9 -3
- package/node_modules/@fbincon/statusline-core/dist/src/editor/source-manager.js +85 -30
- package/node_modules/@fbincon/statusline-core/dist/src/editor/source-manager.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/source-summary.d.ts +5 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/source-summary.js +25 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/source-summary.js.map +1 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/source-validation.d.ts +1 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/source-validation.js +13 -2
- package/node_modules/@fbincon/statusline-core/dist/src/editor/source-validation.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/structure.d.ts +16 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/structure.js +28 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/structure.js.map +1 -0
- package/node_modules/@fbincon/statusline-core/dist/src/extensions/model.d.ts +2 -0
- package/node_modules/@fbincon/statusline-core/dist/src/extensions/model.js +15 -3
- package/node_modules/@fbincon/statusline-core/dist/src/extensions/model.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/i18n/generated-locales.d.ts +1032 -12
- package/node_modules/@fbincon/statusline-core/dist/src/i18n/generated-locales.js +1038 -18
- 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 +1 -0
- 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/resources/i18n/locales/en.json +173 -3
- package/node_modules/@fbincon/statusline-core/resources/i18n/locales/ja.json +173 -3
- package/node_modules/@fbincon/statusline-core/resources/i18n/locales/ko.json +173 -3
- package/node_modules/@fbincon/statusline-core/resources/i18n/locales/zh-CN.json +173 -3
- package/node_modules/@fbincon/statusline-core/resources/i18n/locales/zh-HK.json +173 -3
- package/node_modules/@fbincon/statusline-core/resources/i18n/locales/zh-TW.json +173 -3
- package/node_modules/@fbincon/statusline-platform/dist/src/native.d.ts +2 -0
- package/node_modules/@fbincon/statusline-platform/dist/src/native.js +2 -0
- package/node_modules/@fbincon/statusline-platform/dist/src/native.js.map +1 -1
- package/node_modules/@fbincon/statusline-platform/dist/src/npm.d.ts +2 -0
- package/node_modules/@fbincon/statusline-platform/dist/src/npm.js +20 -1
- package/node_modules/@fbincon/statusline-platform/dist/src/npm.js.map +1 -1
- package/node_modules/@fbincon/statusline-platform/dist/src/private-state.d.ts +3 -0
- package/node_modules/@fbincon/statusline-platform/dist/src/private-state.js +53 -0
- package/node_modules/@fbincon/statusline-platform/dist/src/private-state.js.map +1 -0
- package/node_modules/@fbincon/statusline-platform/dist/src/processes.d.ts +2 -0
- package/node_modules/@fbincon/statusline-platform/dist/src/processes.js +45 -0
- package/node_modules/@fbincon/statusline-platform/dist/src/processes.js.map +1 -1
- package/node_modules/@fbincon/statusline-platform/dist/src/terminal/windows-modes.d.ts +5 -0
- package/node_modules/@fbincon/statusline-platform/dist/src/terminal/windows-modes.js +8 -1
- package/node_modules/@fbincon/statusline-platform/dist/src/terminal/windows-modes.js.map +1 -1
- package/node_modules/@fbincon/statusline-tui/dist/src/drawing/pages.js +6 -0
- package/node_modules/@fbincon/statusline-tui/dist/src/drawing/pages.js.map +1 -1
- package/node_modules/@fbincon/statusline-tui/dist/src/drawing/shortcuts.js +3 -0
- package/node_modules/@fbincon/statusline-tui/dist/src/drawing/shortcuts.js.map +1 -1
- package/node_modules/@fbincon/statusline-tui/dist/src/session.d.ts +2 -1
- package/node_modules/@fbincon/statusline-tui/dist/src/session.js +26 -6
- package/node_modules/@fbincon/statusline-tui/dist/src/session.js.map +1 -1
- package/node_modules/@fbincon/statusline-tui/dist/src/state.d.ts +1 -1
- package/node_modules/@fbincon/statusline-tui/dist/src/state.js +39 -9
- package/node_modules/@fbincon/statusline-tui/dist/src/state.js.map +1 -1
- package/package.json +3 -3
|
@@ -1,16 +1,17 @@
|
|
|
1
|
+
import { activeExecution } from './execution.js';
|
|
1
2
|
import * as fs from 'node:fs';
|
|
2
3
|
import { dirname, join } from 'node:path';
|
|
3
4
|
import { VERSION } from '@fbincon/statusline-core/release';
|
|
4
5
|
import { PackageError } from '@fbincon/statusline-core/management/package';
|
|
5
6
|
import { compatibility, runtimeCompatibility } from '@fbincon/statusline-core/management/compatibility';
|
|
6
|
-
import { globalPackageRoot, productIdentity, productRoot } from '@fbincon/statusline-platform/npm';
|
|
7
|
+
import { globalPackageRoot, productIdentity, productRoot, readPackageManifest } from '@fbincon/statusline-platform/npm';
|
|
7
8
|
import { resolvedPath, which } from '@fbincon/statusline-platform/commands';
|
|
8
9
|
import { sha256 } from '@fbincon/statusline-platform/hash';
|
|
9
|
-
import {
|
|
10
|
+
import { processAlive } from '@fbincon/statusline-platform/processes';
|
|
10
11
|
import { previousBinding } from '../integration/ownership.js';
|
|
11
12
|
import { safeTarget } from '../integration/paths.js';
|
|
12
13
|
import { createStorage } from '../config/storage.js';
|
|
13
|
-
import {
|
|
14
|
+
import { readPrivateState } from '@fbincon/statusline-platform/private-state';
|
|
14
15
|
import { configurationBytes, configurationHashes, configurationCompatibility, readSnapshot } from './configuration.js';
|
|
15
16
|
import { MANAGEMENT_ROOT, operationPath, pendingPath, readInstallation, readOperation } from './store.js';
|
|
16
17
|
export const packageReason = (error) => error instanceof PackageError ? error.code : 'io_error';
|
|
@@ -67,7 +68,8 @@ export function inspectPackage(context, explicit = null, offset = 0) {
|
|
|
67
68
|
if (!identity)
|
|
68
69
|
reasons.push('not_installed');
|
|
69
70
|
else {
|
|
70
|
-
|
|
71
|
+
// npm manifests are ordinary public package files, not private journals.
|
|
72
|
+
const manifest = readPackageManifest(identity.root);
|
|
71
73
|
const declared = compatibility(manifest.statuslineCompatibility, identity.version);
|
|
72
74
|
const binding = previousBinding(configDir, createStorage());
|
|
73
75
|
reasons.push(...runtimeCompatibility(declared, process.versions.node, process.platform + '-' + process.arch, host, binding !== null));
|
|
@@ -108,8 +110,9 @@ export function inspectPackage(context, explicit = null, offset = 0) {
|
|
|
108
110
|
catch {
|
|
109
111
|
backup = 'invalid';
|
|
110
112
|
}
|
|
113
|
+
const states = (operation.executors ?? []).map(p => processAlive(p.pid, p.token));
|
|
111
114
|
return { id: operation.id, version: operation.version, created: operation.created, stage: operation.stage, backup,
|
|
112
|
-
running:
|
|
115
|
+
running: states.includes(true) ? true : states.includes(null) ? null : false };
|
|
113
116
|
};
|
|
114
117
|
const records = [];
|
|
115
118
|
let total = 0;
|
|
@@ -118,15 +121,21 @@ export function inspectPackage(context, explicit = null, offset = 0) {
|
|
|
118
121
|
safeTarget(configDir, folder);
|
|
119
122
|
if (fs.existsSync(folder)) {
|
|
120
123
|
const ids = fs.readdirSync(folder).filter(id => /^pkg-[0-9a-f-]{36}$/u.test(id)).sort();
|
|
121
|
-
|
|
124
|
+
const selected = ids.flatMap(id => {
|
|
125
|
+
try {
|
|
126
|
+
const path = join(folder, id, 'operation.json');
|
|
127
|
+
safeTarget(configDir, path);
|
|
128
|
+
const raw = JSON.parse(readPrivateState(path, 1024 * 1024).toString('utf8'));
|
|
129
|
+
return raw.prefix === prefix ? [{ id, created: typeof raw.created === 'string' ? raw.created : '' }] : [];
|
|
130
|
+
}
|
|
131
|
+
catch {
|
|
132
|
+
return [{ id, created: '' }];
|
|
133
|
+
}
|
|
134
|
+
}).sort((a, b) => b.created.localeCompare(a.created) || a.id.localeCompare(b.id));
|
|
135
|
+
total = selected.length;
|
|
122
136
|
if (prefix)
|
|
123
|
-
for (const id of
|
|
137
|
+
for (const { id } of selected.slice(offset, offset + 16)) {
|
|
124
138
|
try {
|
|
125
|
-
const path = join(folder, id, 'operation.json');
|
|
126
|
-
safeTarget(configDir, path);
|
|
127
|
-
const raw = JSON.parse(readRegular(path, 1024 * 1024).toString('utf8'));
|
|
128
|
-
if (raw.prefix !== prefix)
|
|
129
|
-
continue;
|
|
130
139
|
records.push(row(readOperation(configDir, prefix, id)));
|
|
131
140
|
}
|
|
132
141
|
catch {
|
|
@@ -138,8 +147,16 @@ export function inspectPackage(context, explicit = null, offset = 0) {
|
|
|
138
147
|
catch (error) {
|
|
139
148
|
reasons.push(packageReason(error));
|
|
140
149
|
}
|
|
150
|
+
let execution = null;
|
|
151
|
+
if (prefix)
|
|
152
|
+
try {
|
|
153
|
+
execution = activeExecution(configDir, prefix);
|
|
154
|
+
}
|
|
155
|
+
catch (error) {
|
|
156
|
+
reasons.push(packageReason(error));
|
|
157
|
+
}
|
|
141
158
|
const unique = [...new Set(reasons)];
|
|
142
|
-
return { version: 1, backend_version: VERSION, captured_at: new Date().toISOString(),
|
|
159
|
+
return { version: 1, execution, backend_version: VERSION, captured_at: new Date().toISOString(),
|
|
143
160
|
revision: sha256(JSON.stringify({ identity, history, pending, hashes, prefix, configDir, host })), prefix, entry: identity?.entry ?? null, config_dir: configDir,
|
|
144
161
|
current: identity?.version ?? null, previous: history?.previous?.version ?? null, channel: history?.channel ?? null, node_version: process.versions.node, host,
|
|
145
162
|
compatible: !!identity && !unique.length, reasons: unique, pending: pending ? row(pending) : null, history: records, offset, total };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspection.js","sourceRoot":"","sources":["../../../src/management/inspection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,6CAA6C,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AAExG,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"inspection.js","sourceRoot":"","sources":["../../../src/management/inspection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
/** Refresh owned Mod bytes with the newer ownership reader before an older installer runs. */
|
|
2
2
|
import { join } from 'node:path';
|
|
3
|
-
import { readFileSync } from 'node:fs';
|
|
4
3
|
import { compatibility, compareVersions } from '@fbincon/statusline-core/management/compatibility';
|
|
5
4
|
import { PACKAGE_NAME, VERSION } from '@fbincon/statusline-core/release';
|
|
6
5
|
import { PROTOCOL_VERSION } from '@fbincon/statusline-core/contracts/ui';
|
|
7
6
|
import { equalSettings } from '@fbincon/statusline-core/json-equality';
|
|
8
7
|
import { PackageError } from '@fbincon/statusline-core/management/package';
|
|
9
8
|
import { decodeUtf8 } from '@fbincon/statusline-platform/utf8';
|
|
9
|
+
import { readPackageManifest } from '@fbincon/statusline-platform/npm';
|
|
10
10
|
import { readJson } from '@fbincon/statusline-core/json-read';
|
|
11
11
|
import { NATIVE, RUNTIME } from '../integration/model.js';
|
|
12
12
|
import { owner } from '../integration/mod-ownership.js';
|
|
@@ -22,7 +22,7 @@ import { atLeast } from '../config/service.js';
|
|
|
22
22
|
import { assertConfiguration, configurationBytes, configurationHashes } from './configuration.js';
|
|
23
23
|
export function prepareModDowngrade(context, root, version, expected, dryRun) {
|
|
24
24
|
assertConfiguration(context.configDir, expected);
|
|
25
|
-
const manifest =
|
|
25
|
+
const manifest = readPackageManifest(root);
|
|
26
26
|
if (manifest.version !== version || manifest.name !== PACKAGE_NAME)
|
|
27
27
|
throw new PackageError('identity');
|
|
28
28
|
const target = compatibility(manifest.statuslineCompatibility, version);
|
|
@@ -1 +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,
|
|
1
|
+
{"version":3,"file":"mod-transition.js","sourceRoot":"","sources":["../../../src/management/mod-transition.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,9 +9,9 @@ import { atomicWrite, privateDirectory } from '@fbincon/statusline-platform/file
|
|
|
9
9
|
import { productRoot, productIdentity } from '@fbincon/statusline-platform/npm';
|
|
10
10
|
import { copyPackage } from '@fbincon/statusline-platform/package-copy';
|
|
11
11
|
import { startReviewWorker, waitReviewExit } from '@fbincon/statusline-platform/review-worker';
|
|
12
|
-
import {
|
|
12
|
+
import { processAlive } from '@fbincon/statusline-platform/processes';
|
|
13
13
|
import { removeTree } from '@fbincon/statusline-platform/remove-tree';
|
|
14
|
-
import {
|
|
14
|
+
import { readPrivateState } from '@fbincon/statusline-platform/private-state';
|
|
15
15
|
import { safeTarget } from '../integration/paths.js';
|
|
16
16
|
import { inspectPackage } from './inspection.js';
|
|
17
17
|
export const REVIEW_DEADLINE_MS = 10 * 60 * 1000;
|
|
@@ -25,9 +25,10 @@ export function reviewFolder(id) {
|
|
|
25
25
|
export function readReviewRecord(id) {
|
|
26
26
|
const folder = reviewFolder(id), path = join(folder, 'job.json');
|
|
27
27
|
safeTarget(folder, path);
|
|
28
|
-
const value = JSON.parse(
|
|
28
|
+
const value = JSON.parse(readPrivateState(path, 1024 * 1024).toString('utf8'));
|
|
29
29
|
if (!isPackageResult('package_review_status', value.job) || value.job.id !== id || typeof value.configDir !== 'string' || typeof value.origin !== 'string' ||
|
|
30
|
-
!(value.pid === null || Number.isSafeInteger(value.pid) && value.pid > 0) || !(value.token === null || typeof value.token === 'string')
|
|
30
|
+
!(value.pid === null || Number.isSafeInteger(value.pid) && value.pid > 0) || !(value.token === null || typeof value.token === 'string') ||
|
|
31
|
+
value.launched_at !== undefined && (typeof value.launched_at !== 'string' || !Number.isFinite(Date.parse(value.launched_at))))
|
|
31
32
|
throw new PackageError('journal');
|
|
32
33
|
return value;
|
|
33
34
|
}
|
|
@@ -52,6 +53,10 @@ export function startPackageReview(context, request, owner) {
|
|
|
52
53
|
throw new PackageError('identity');
|
|
53
54
|
entry = join(runner, 'node_modules/@fbincon/statusline-cli/dist/src/management/review-worker-entry.js');
|
|
54
55
|
}
|
|
56
|
+
// Runner preparation is part of the overall deadline, but not worker
|
|
57
|
+
// startup grace: an installed copy can take longer than fifteen seconds.
|
|
58
|
+
record.launched_at = new Date().toISOString();
|
|
59
|
+
writeReviewRecord(record);
|
|
55
60
|
startReviewWorker(entry, [job.id], folder);
|
|
56
61
|
return job;
|
|
57
62
|
}
|
|
@@ -70,7 +75,7 @@ export function packageReviewJob(context, id, owner, cancel = false) {
|
|
|
70
75
|
atomicWrite(join(reviewFolder(id), 'cancel.json'), '{}\n');
|
|
71
76
|
const stopped = waitReviewExit(() => {
|
|
72
77
|
const latest = readReviewRecord(id);
|
|
73
|
-
return !!latest.pid && !!latest.token &&
|
|
78
|
+
return !!latest.pid && !!latest.token && processAlive(latest.pid, latest.token) === false;
|
|
74
79
|
});
|
|
75
80
|
if (stopped) {
|
|
76
81
|
const finished = readReviewRecord(id).job;
|
|
@@ -81,7 +86,7 @@ export function packageReviewJob(context, id, owner, cancel = false) {
|
|
|
81
86
|
return readReviewRecord(id).job;
|
|
82
87
|
}
|
|
83
88
|
if (job.state === 'running' && (Date.now() - Date.parse(job.started_at) > REVIEW_DEADLINE_MS ||
|
|
84
|
-
Date.now() - Date.parse(job.started_at) > 15000 && (!record.pid ||
|
|
89
|
+
Date.now() - Date.parse(record.launched_at ?? job.started_at) > 15000 && (!record.pid || !!record.token && processAlive(record.pid, record.token) === false)))
|
|
85
90
|
return { ...job, state: 'failed', error: 'interrupted', finished_at: new Date().toISOString() };
|
|
86
91
|
if (job.state === 'complete' && inspectPackage(context, job.request.prefix).revision !== job.request.expected_revision)
|
|
87
92
|
return { ...job, state: 'failed', review: null, error: 'conflict' };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"review-jobs.js","sourceRoot":"","sources":["../../../src/management/review-jobs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,6CAA6C,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,oDAAoD,CAAC;AAEvG,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAC/F,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"review-jobs.js","sourceRoot":"","sources":["../../../src/management/review-jobs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,6CAA6C,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,oDAAoD,CAAC;AAEvG,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAC/F,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4CAA4C,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,cAAc,EAA0B,MAAM,iBAAiB,CAAC;AASzE,MAAM,CAAC,MAAM,kBAAkB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AACjD,MAAM,UAAU,YAAY,CAAC,EAAU;IACnC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,YAAY,CAAC,WAAW,CAAC,CAAC;IACxC,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,oBAAoB,GAAG,EAAE,CAAC,CAAC;IAC9F,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACzB,OAAO,MAAM,CAAC;AAClB,CAAC;AACD,MAAM,UAAU,gBAAgB,CAAC,EAAU;IACvC,MAAM,MAAM,GAAG,YAAY,CAAC,EAAE,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACjE,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACzB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAiB,CAAC;IAC/F,IAAI,CAAC,eAAe,CAAC,uBAAuB,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,OAAO,KAAK,CAAC,SAAS,KAAK,QAAQ,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ;QACtJ,CAAC,CAAC,KAAK,CAAC,GAAG,KAAK,IAAI,IAAI,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,CAAC;QACvI,KAAK,CAAC,WAAW,KAAK,SAAS,IAAI,CAAC,OAAO,KAAK,CAAC,WAAW,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;QAC7H,MAAM,IAAI,YAAY,CAAC,SAAS,CAAC,CAAC;IACtC,OAAO,KAAK,CAAC;AACjB,CAAC;AACD,MAAM,UAAU,iBAAiB,CAAC,MAAoB,IAAU,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,UAAU,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;AAC5J,MAAM,UAAU,kBAAkB,CAAC,OAA0B,EAAE,OAAgB,EAAE,KAAc;IAC3F,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,KAAK,CAAC;QACrG,MAAM,IAAI,YAAY,CAAC,WAAW,CAAC,CAAC;IACxC,IAAI,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAC,iBAAiB;QAC9E,MAAM,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC;IACvC,MAAM,GAAG,GAAqB,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,SAAS,GAAG,UAAU,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACjM,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACpC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACzB,MAAM,MAAM,GAAiB,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACnH,IAAI,CAAC;QACD,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAC1B,IAAI,KAAK,GAAG,aAAa,CAAC,IAAI,GAAG,CAAC,0BAA0B,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAChF,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3C,IAAI,MAAM,EAAE,CAAC;YACT,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YACtC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAC5B,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC;gBACxB,MAAM,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC;YACvC,KAAK,GAAG,IAAI,CAAC,MAAM,EAAE,iFAAiF,CAAC,CAAC;QAC5G,CAAC;QACD,qEAAqE;QACrE,yEAAyE;QACzE,MAAM,CAAC,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC9C,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAC1B,iBAAiB,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QAC3C,OAAO,GAAG,CAAC;IACf,CAAC;IACD,OAAO,KAAK,EAAE,CAAC;QACX,UAAU,CAAC,MAAM,CAAC,CAAC;QACnB,MAAM,KAAK,CAAC;IAChB,CAAC;AACL,CAAC;AACD,MAAM,UAAU,gBAAgB,CAAC,OAA0B,EAAE,EAAW,EAAE,KAAc,EAAE,MAAM,GAAG,KAAK;IACpG,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ;QACnD,MAAM,IAAI,YAAY,CAAC,WAAW,CAAC,CAAC;IACxC,MAAM,MAAM,GAAG,gBAAgB,CAAC,EAAE,CAAC,EAAE,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;IACtD,IAAI,MAAM,CAAC,SAAS,KAAK,OAAO,CAAC,SAAS,IAAI,GAAG,CAAC,KAAK,KAAK,KAAK;QAC7D,MAAM,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC;IACvC,IAAI,MAAM,EAAE,CAAC;QACT,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,EAAE,MAAM,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,EAAE;YAChC,MAAM,MAAM,GAAG,gBAAgB,CAAC,EAAE,CAAC,CAAC;YACpC,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC;QAC9F,CAAC,CAAC,CAAC;QACH,IAAI,OAAO,EAAE,CAAC;YACV,MAAM,QAAQ,GAAG,gBAAgB,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC;YAC1C,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC;YAC7B,OAAO,EAAC,GAAG,QAAQ,EAAE,KAAK,EAAC,WAAW,EAAE,WAAW,EAAC,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAC,CAAC;QAClF,CAAC;QACD,qFAAqF;QACrF,OAAO,gBAAgB,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC;IACpC,CAAC;IACD,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,kBAAkB;QACxF,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,CAAC;QAC7J,OAAO,EAAE,GAAG,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC;IACpG,IAAI,GAAG,CAAC,KAAK,KAAK,UAAU,IAAI,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,KAAK,GAAG,CAAC,OAAO,CAAC,iBAAiB;QAClH,OAAO,EAAE,GAAG,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;IACxE,OAAO,GAAG,CAAC;AACf,CAAC"}
|
|
@@ -16,6 +16,8 @@ export interface ManagementEnvironment {
|
|
|
16
16
|
confirm?: () => Promise<boolean>;
|
|
17
17
|
host?: () => readonly number[] | null;
|
|
18
18
|
integrate?: typeof refreshIntegration;
|
|
19
|
+
beforeMutation?: (review: PackageReview) => void;
|
|
20
|
+
operationStarted?: (operation: PackageOperation) => void;
|
|
19
21
|
checkpoint?: (stage: string, operation: PackageOperation) => void;
|
|
20
22
|
}
|
|
21
23
|
export declare function mutationAuthorized(flags: ManagementOptions, tty: boolean): void;
|
|
@@ -6,7 +6,7 @@ import { fileURLToPath } from 'node:url';
|
|
|
6
6
|
import { PackageError } from '@fbincon/statusline-core/management/package';
|
|
7
7
|
import { compatibility, compareVersions, runtimeCompatibility } from '@fbincon/statusline-core/management/compatibility';
|
|
8
8
|
import { t } from '@fbincon/statusline-core/i18n/messages';
|
|
9
|
-
import { Npm, productIdentity, productRoot, writablePrefix, within, verifyArchive, globalPackageRoot } from '@fbincon/statusline-platform/npm';
|
|
9
|
+
import { Npm, productIdentity, productRoot, writablePrefix, within, verifyArchive, globalPackageRoot, readPackageManifest } from '@fbincon/statusline-platform/npm';
|
|
10
10
|
import { lock, atomicWrite } from '@fbincon/statusline-platform/files';
|
|
11
11
|
import { copyPackage } from '@fbincon/statusline-platform/package-copy';
|
|
12
12
|
import { removeTree } from '@fbincon/statusline-platform/remove-tree';
|
|
@@ -23,7 +23,7 @@ import { configurationBytes, configurationHashes, configurationCompatibility, as
|
|
|
23
23
|
import { refreshIntegration } from './integration.js';
|
|
24
24
|
import { restoreConfiguration } from './restore.js';
|
|
25
25
|
import { ArgumentError } from '../config/arguments.js';
|
|
26
|
-
import {
|
|
26
|
+
import { processAlive } from '@fbincon/statusline-platform/processes';
|
|
27
27
|
export function mutationAuthorized(flags, tty) {
|
|
28
28
|
if (flags.check || flags.dryRun)
|
|
29
29
|
return;
|
|
@@ -53,11 +53,11 @@ function selection(flags, before, history) {
|
|
|
53
53
|
return { selector: channel, channel };
|
|
54
54
|
}
|
|
55
55
|
function installedCompatibility(current) {
|
|
56
|
-
const manifest =
|
|
56
|
+
const manifest = readPackageManifest(current.root);
|
|
57
57
|
return compatibility(manifest.statuslineCompatibility, current.version);
|
|
58
58
|
}
|
|
59
59
|
function observedPackage(layout, operation) {
|
|
60
|
-
if (operation.executors?.some(p =>
|
|
60
|
+
if (operation.executors?.some(p => processAlive(p.pid, p.token) !== false))
|
|
61
61
|
throw new PackageError('busy');
|
|
62
62
|
try {
|
|
63
63
|
const identity = productIdentity(layout.root, layout.prefix);
|
|
@@ -70,7 +70,7 @@ function observedPackage(layout, operation) {
|
|
|
70
70
|
throw error;
|
|
71
71
|
const manifest = join(layout.root, 'package.json');
|
|
72
72
|
if (fs.existsSync(manifest)) {
|
|
73
|
-
const value =
|
|
73
|
+
const value = readPackageManifest(layout.root);
|
|
74
74
|
if (value.name !== '@fbincon/claude-code-statusline' || ![operation.version, operation.before?.version].includes(value.version))
|
|
75
75
|
throw new PackageError('identity');
|
|
76
76
|
}
|
|
@@ -227,11 +227,15 @@ export async function manage(argv, options) {
|
|
|
227
227
|
else {
|
|
228
228
|
if (!installed || !sameIdentity(installed, before) || fs.existsSync(pendingPath(layout.prefix)))
|
|
229
229
|
throw new PackageError('conflict');
|
|
230
|
+
options.beforeMutation?.(review);
|
|
230
231
|
operation = startOperation(configDir, layout.prefix, target.version, target.registry, before, flags.command);
|
|
231
232
|
operation.snapshot = createStorage().lock(configDir, () => { assertConfiguration(configDir, hashes); return saveSnapshot(configDir, dirname(operationPath(operation)), bytes); });
|
|
232
233
|
operation.beforeCompatibility = installedCompatibility(before);
|
|
233
234
|
operation.previousChannel = history?.channel ?? null;
|
|
234
235
|
}
|
|
236
|
+
if (flags.package)
|
|
237
|
+
options.beforeMutation?.(review);
|
|
238
|
+
options.operationStarted?.(operation);
|
|
235
239
|
if (operation.before && !operation.snapshot) {
|
|
236
240
|
if (!installed || installed.version !== operation.before.version)
|
|
237
241
|
throw new PackageError('backup');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/management/service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/management/service.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,11 +4,11 @@ import { createHash, randomUUID } from 'node:crypto';
|
|
|
4
4
|
import { atomicWrite, privateDirectory, durableUnlink } from '@fbincon/statusline-platform/files';
|
|
5
5
|
import { PackageError } from '@fbincon/statusline-core/management/package';
|
|
6
6
|
import { safeTarget } from '../integration/paths.js';
|
|
7
|
-
import {
|
|
7
|
+
import { readPrivateState } from '@fbincon/statusline-platform/private-state';
|
|
8
8
|
import { exactVersion } from '@fbincon/statusline-core/management/package';
|
|
9
9
|
import { compatibility } from '@fbincon/statusline-core/management/compatibility';
|
|
10
10
|
import { globalPackageRoot } from '@fbincon/statusline-platform/npm';
|
|
11
|
-
import { processToken,
|
|
11
|
+
import { processToken, processAlive } from '@fbincon/statusline-platform/processes';
|
|
12
12
|
export const MANAGEMENT_ROOT = 'statusline_runtime/package-management';
|
|
13
13
|
export const prefixKey = (prefix) => createHash('sha256').update(prefix).digest('hex');
|
|
14
14
|
export const pendingPath = (prefix) => join(prefix, '.claude-statusline-operation.json');
|
|
@@ -40,7 +40,7 @@ export function finishOperation(operation) {
|
|
|
40
40
|
}
|
|
41
41
|
export function observeOperation(operation) {
|
|
42
42
|
return pid => {
|
|
43
|
-
operation.executors = (operation.executors ?? []).filter(p =>
|
|
43
|
+
operation.executors = (operation.executors ?? []).filter(p => processAlive(p.pid, p.token) !== false);
|
|
44
44
|
if (pid !== null) {
|
|
45
45
|
const token = processToken(pid);
|
|
46
46
|
if (!token)
|
|
@@ -59,7 +59,7 @@ export function readInstallation(configDir, prefix) {
|
|
|
59
59
|
safeTarget(configDir, path);
|
|
60
60
|
if (!fs.existsSync(path))
|
|
61
61
|
return null;
|
|
62
|
-
const value = JSON.parse(
|
|
62
|
+
const value = JSON.parse(readPrivateState(path, 1024 * 1024).toString('utf8'));
|
|
63
63
|
if (value.schema_version !== 1 || !exactVersion(value.current?.version) || value.current.prefix !== prefix || value.previous && !exactVersion(value.previous.version) || ![null, 'latest', 'beta'].includes(value.channel))
|
|
64
64
|
throw new PackageError('journal');
|
|
65
65
|
return value;
|
|
@@ -70,7 +70,7 @@ export function readOperation(configDir, prefix, id) {
|
|
|
70
70
|
safeTarget(prefix, marker);
|
|
71
71
|
if (!fs.existsSync(marker))
|
|
72
72
|
throw new PackageError('no_pending');
|
|
73
|
-
const value = JSON.parse(
|
|
73
|
+
const value = JSON.parse(readPrivateState(marker, 65536).toString('utf8'));
|
|
74
74
|
if (value.owner !== 'claude-code-statusline' || value.schema_version !== 1 || value.prefix !== prefix || value.configDir !== configDir)
|
|
75
75
|
throw new PackageError('journal');
|
|
76
76
|
id = value.id;
|
|
@@ -81,7 +81,7 @@ export function readOperation(configDir, prefix, id) {
|
|
|
81
81
|
safeTarget(configDir, path);
|
|
82
82
|
let value;
|
|
83
83
|
try {
|
|
84
|
-
value = JSON.parse(
|
|
84
|
+
value = JSON.parse(readPrivateState(path, 1024 * 1024).toString('utf8'));
|
|
85
85
|
}
|
|
86
86
|
catch {
|
|
87
87
|
throw new PackageError('journal');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../../src/management/store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAClG,OAAO,EAAE,YAAY,EAAwB,MAAM,6CAA6C,CAAC;AACjG,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../../src/management/store.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ export function readAutomatic(directory) {
|
|
|
19
19
|
return { version: 1, leases: [], schedules: [] };
|
|
20
20
|
const value = JSON.parse(decodeUtf8(bytes));
|
|
21
21
|
if (!object(value) || value.version !== 1 || !Array.isArray(value.leases) || !Array.isArray(value.schedules) || value.leases.length > 64 || value.schedules.length > 512 ||
|
|
22
|
-
!value.leases.every(l => object(l) && hash(l.id) && typeof l.session === 'string' && typeof l.epoch === 'string' && Number.isSafeInteger(l.seq) && typeof l.expires === 'number' && Number.isFinite(l.expires) && typeof l.closed === 'boolean' && Array.isArray(l.keys) && l.keys.length <=
|
|
22
|
+
!value.leases.every(l => object(l) && hash(l.id) && typeof l.session === 'string' && typeof l.epoch === 'string' && Number.isSafeInteger(l.seq) && typeof l.expires === 'number' && Number.isFinite(l.expires) && typeof l.closed === 'boolean' && Array.isArray(l.keys) && l.keys.length <= 32768 && l.keys.every(hash) && (l.contexts === undefined || Array.isArray(l.contexts) && l.contexts.length <= 257 && l.contexts.every(c => object(c) && ['project', 'session', 'agent', 'branch', 'head'].every(k => c[k] === null || typeof c[k] === 'string')))) ||
|
|
23
23
|
!value.schedules.every(s => object(s) && hash(s.key) && typeof s.source_id === 'string' && (s.job_id === null || typeof s.job_id === 'string') && (s.processed === null || typeof s.processed === 'string') && typeof s.next === 'number' && Number.isFinite(s.next) && Number.isSafeInteger(s.failures) && (s.paused === null || typeof s.paused === 'string') && [s.last_attempt, s.last_success].every(v => v === null || typeof v === 'string' && Number.isFinite(Date.parse(v)))))
|
|
24
24
|
throw new Error('Invalid automatic refresh state');
|
|
25
25
|
return value;
|
|
@@ -42,26 +42,26 @@ export function automaticRequested(directory) {
|
|
|
42
42
|
return sourceRegistry(directory).automatic.some(p => p.enabled);
|
|
43
43
|
}
|
|
44
44
|
export function refreshIdentity(source, context) {
|
|
45
|
-
return revision({ source: source.id, revision: source.revision, settings: source.settings, context: observationContext(source, context), auth: source.kind === 'github' ? authRevision() : null });
|
|
45
|
+
return revision({ source: source.id, revision: source.revision, scope: source.scope, settings: source.settings, context: observationContext(source, context), auth: source.kind === 'github' ? authRevision() : null });
|
|
46
46
|
}
|
|
47
47
|
export function activeLease(state, identity, now) {
|
|
48
48
|
return state.leases.some(l => !l.closed && l.expires > now && l.keys.includes(identity));
|
|
49
49
|
}
|
|
50
50
|
export function automaticJobActive(directory, job, now) {
|
|
51
51
|
const registry = sourceRegistry(directory), source = registry.sources.find(s => s.id === job.source_id), policy = registry.automatic.find(p => p.source_id === job.source_id);
|
|
52
|
-
return Boolean(source?.enabled && policy?.enabled && policy.review_revision === source.revision && policy.auth_revision === authRevision() && refreshIdentity(source, job.context) === job.identity && activeLease(readAutomatic(directory), job.identity, now));
|
|
52
|
+
return Boolean(source?.enabled && policy?.enabled && policy.review_revision === source.revision && (source.kind !== 'github' || policy.auth_revision === authRevision()) && refreshIdentity(source, job.context) === job.identity && activeLease(readAutomatic(directory), job.identity, now));
|
|
53
53
|
}
|
|
54
54
|
export function manualJobActive(job, now) {
|
|
55
55
|
return job.consumers.some(consumer => Date.parse(consumer.expires_at) > now);
|
|
56
56
|
}
|
|
57
57
|
export function automaticStatus(directory, source, context, now, jobs) {
|
|
58
58
|
const policy = sourceRegistry(directory).automatic.find(p => p.source_id === source.id);
|
|
59
|
-
const base = { state: 'off', reason: 'off', next_at: null, last_attempt: null, last_success: null, interval_seconds: policy?.interval_seconds ?? Math.max(60, Math.min(86400, source.ttl_seconds)) };
|
|
59
|
+
const base = { state: 'off', reason: 'off', next_at: null, last_attempt: null, last_success: null, interval_seconds: policy?.interval_seconds ?? (source.kind === 'command' ? 300 : Math.max(60, Math.min(86400, source.ttl_seconds))) };
|
|
60
60
|
if (!policy?.enabled || !source.enabled)
|
|
61
61
|
return base;
|
|
62
|
-
if (policy.auth_revision !== authRevision())
|
|
62
|
+
if (source.kind === 'github' && policy.auth_revision !== authRevision())
|
|
63
63
|
return { ...base, state: 'paused', reason: 'identity' };
|
|
64
|
-
if (!context.head || !context.branch || context.branch !== source.settings.branch)
|
|
64
|
+
if (source.kind === 'github' && (!context.head || !context.branch || context.branch !== source.settings.branch))
|
|
65
65
|
return { ...base, state: 'paused', reason: 'identity' };
|
|
66
66
|
const identity = refreshIdentity(source, context), state = readAutomatic(directory), schedule = state.schedules.find(s => s.key === identity);
|
|
67
67
|
const result = { ...base, last_attempt: schedule?.last_attempt ?? null, last_success: schedule?.last_success ?? null };
|