@fbincon/claude-code-statusline 3.9.0 → 3.9.2
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 +92 -80
- package/candidate.json +310 -247
- package/node_modules/@fbincon/statusline-cli/dist/src/diagnostics/service.js +17 -7
- package/node_modules/@fbincon/statusline-cli/dist/src/diagnostics/service.js.map +1 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/management/service.js +7 -0
- package/node_modules/@fbincon/statusline-cli/dist/src/management/service.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 +3 -2
- package/node_modules/@fbincon/statusline-cli/dist/src/sources/automatic-state.js.map +1 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/sources/command.js +14 -5
- package/node_modules/@fbincon/statusline-cli/dist/src/sources/command.js.map +1 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/sources/service.d.ts +3 -1
- package/node_modules/@fbincon/statusline-cli/dist/src/sources/service.js +56 -22
- 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 +438 -2
- package/node_modules/@fbincon/statusline-cli/dist/src/ui/protocol.js +9 -3
- 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 +160 -86
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/backend.ts +3 -3
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/client/keys.ts +1 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/client/settings.ts +1 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/alignment-manager.ts +2 -1
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/draft.ts +45 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/forms.ts +1 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/group-manager.ts +1 -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/editor/quick-setup.ts +1 -0
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/source-manager.ts +15 -4
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/editor/source-validation.ts +2 -2
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/generated-contracts.ts +6 -3
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/i18n/generated-locales.ts +96 -6
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/lib/session.ts +28 -90
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/resource-manifest.json +25 -24
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/ui/client/draw.ts +7 -4
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/ui/client/surface.ts +16 -13
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/ui/components/preview.ts +9 -5
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/ui/components/section.ts +11 -7
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/ui/components/shortcuts.ts +5 -1
- package/node_modules/@fbincon/statusline-cli/resources/statusline-native/ui/frame.ts +72 -0
- 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/contracts/ui.d.ts +9 -3
- package/node_modules/@fbincon/statusline-core/dist/src/contracts/ui.js +2 -1
- 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 +3 -1
- 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 +3 -3
- 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 +16 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/draft.js +56 -0
- 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 +4 -0
- 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 +5 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/group-manager.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/profile-manager.js +32 -3
- package/node_modules/@fbincon/statusline-core/dist/src/editor/profile-manager.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/quick-setup.js +2 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/quick-setup.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/editor/source-manager.d.ts +1 -0
- package/node_modules/@fbincon/statusline-core/dist/src/editor/source-manager.js +24 -4
- 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-validation.js +2 -2
- package/node_modules/@fbincon/statusline-core/dist/src/editor/source-validation.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/extensions/model.d.ts +3 -1
- package/node_modules/@fbincon/statusline-core/dist/src/extensions/model.js +15 -1
- 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 +90 -0
- package/node_modules/@fbincon/statusline-core/dist/src/i18n/generated-locales.js +96 -6
- package/node_modules/@fbincon/statusline-core/dist/src/i18n/generated-locales.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/i18n/statusline/en.d.ts +2 -0
- package/node_modules/@fbincon/statusline-core/dist/src/i18n/statusline/en.js +3 -1
- package/node_modules/@fbincon/statusline-core/dist/src/i18n/statusline/en.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/i18n/statusline/ja.d.ts +2 -0
- package/node_modules/@fbincon/statusline-core/dist/src/i18n/statusline/ja.js +3 -1
- package/node_modules/@fbincon/statusline-core/dist/src/i18n/statusline/ja.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/i18n/statusline/ko.d.ts +2 -0
- package/node_modules/@fbincon/statusline-core/dist/src/i18n/statusline/ko.js +3 -1
- package/node_modules/@fbincon/statusline-core/dist/src/i18n/statusline/ko.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/i18n/statusline/zh-CN.d.ts +2 -0
- package/node_modules/@fbincon/statusline-core/dist/src/i18n/statusline/zh-CN.js +3 -1
- package/node_modules/@fbincon/statusline-core/dist/src/i18n/statusline/zh-CN.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/i18n/statusline/zh-HK.d.ts +2 -0
- package/node_modules/@fbincon/statusline-core/dist/src/i18n/statusline/zh-HK.js +3 -1
- package/node_modules/@fbincon/statusline-core/dist/src/i18n/statusline/zh-HK.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/i18n/statusline/zh-TW.d.ts +2 -0
- package/node_modules/@fbincon/statusline-core/dist/src/i18n/statusline/zh-TW.js +3 -1
- package/node_modules/@fbincon/statusline-core/dist/src/i18n/statusline/zh-TW.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/indicators.js +5 -4
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/indicators.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/items.js +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/items.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/preferences.d.ts +4 -1
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/preferences.js +6 -2
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/preferences.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/subagents.js +1 -1
- package/node_modules/@fbincon/statusline-core/dist/src/rendering/subagents.js.map +1 -1
- package/node_modules/@fbincon/statusline-core/resources/i18n/locales/en.json +16 -1
- package/node_modules/@fbincon/statusline-core/resources/i18n/locales/ja.json +16 -1
- package/node_modules/@fbincon/statusline-core/resources/i18n/locales/ko.json +16 -1
- package/node_modules/@fbincon/statusline-core/resources/i18n/locales/zh-CN.json +16 -1
- package/node_modules/@fbincon/statusline-core/resources/i18n/locales/zh-HK.json +16 -1
- package/node_modules/@fbincon/statusline-core/resources/i18n/locales/zh-TW.json +16 -1
- package/node_modules/@fbincon/statusline-platform/dist/src/darwin-process.d.ts +8 -0
- package/node_modules/@fbincon/statusline-platform/dist/src/darwin-process.js +33 -0
- package/node_modules/@fbincon/statusline-platform/dist/src/darwin-process.js.map +1 -0
- package/node_modules/@fbincon/statusline-platform/dist/src/npm.js +47 -16
- package/node_modules/@fbincon/statusline-platform/dist/src/npm.js.map +1 -1
- package/node_modules/@fbincon/statusline-platform/dist/src/package-copy.js +10 -0
- package/node_modules/@fbincon/statusline-platform/dist/src/package-copy.js.map +1 -1
- package/node_modules/@fbincon/statusline-platform/dist/src/performance.d.ts +2 -0
- package/node_modules/@fbincon/statusline-platform/dist/src/performance.js +17 -0
- package/node_modules/@fbincon/statusline-platform/dist/src/performance.js.map +1 -0
- package/node_modules/@fbincon/statusline-platform/dist/src/processes.js +7 -3
- package/node_modules/@fbincon/statusline-platform/dist/src/processes.js.map +1 -1
- package/node_modules/@fbincon/statusline-platform/dist/src/source-process.js +6 -12
- package/node_modules/@fbincon/statusline-platform/dist/src/source-process.js.map +1 -1
- package/node_modules/@fbincon/statusline-platform/dist/src/terminal/launchers.d.ts +1 -1
- package/node_modules/@fbincon/statusline-platform/dist/src/terminal/launchers.js +2 -5
- package/node_modules/@fbincon/statusline-platform/dist/src/terminal/launchers.js.map +1 -1
- package/node_modules/@fbincon/statusline-platform/dist/src/windows-command.d.ts +2 -0
- package/node_modules/@fbincon/statusline-platform/dist/src/windows-command.js +7 -0
- package/node_modules/@fbincon/statusline-platform/dist/src/windows-command.js.map +1 -0
- package/node_modules/@fbincon/statusline-platform/dist/src/windows-source-exec.d.ts +1 -0
- package/node_modules/@fbincon/statusline-platform/dist/src/windows-source-exec.js +65 -0
- package/node_modules/@fbincon/statusline-platform/dist/src/windows-source-exec.js.map +1 -0
- package/node_modules/@fbincon/statusline-tui/dist/src/drawing/shortcuts.js +4 -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 +1 -0
- package/node_modules/@fbincon/statusline-tui/dist/src/session.js +33 -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 +12 -0
- package/node_modules/@fbincon/statusline-tui/dist/src/state.js.map +1 -1
- package/package.json +2 -2
|
@@ -14,7 +14,7 @@ import { observations } from './observations.js';
|
|
|
14
14
|
import { resolvedDisplay } from '../rendering/configuration.js';
|
|
15
15
|
import { liveDirectory } from '@fbincon/statusline-core/rendering/items';
|
|
16
16
|
import { SourceService } from '../sources/service.js';
|
|
17
|
-
import {
|
|
17
|
+
import { projectPaths } from '@fbincon/statusline-platform/project-paths';
|
|
18
18
|
export function observedTime(value) {
|
|
19
19
|
if (value === undefined || value === null)
|
|
20
20
|
return null;
|
|
@@ -65,24 +65,34 @@ export async function diagnosisAdapter(service, options = {}) {
|
|
|
65
65
|
const env = baseEnvironment(languages.get(draft.display.statusline_language), { now: () => (observedAt === null ? now : Date.parse(observedAt)) / 1000 });
|
|
66
66
|
const local = observations(draft, payload.scope, payload.input, context, options.files ?? diagnosticFiles, facts, includeLocal, observedAt, env);
|
|
67
67
|
const sourceNodes = (payload.scope === 'main' ? draft.display.instances : draft.display.subagents.instances).filter(node => node.enabled && ['external-value', 'github-pr', 'github-ci'].includes(node.type_id));
|
|
68
|
-
if (sourceNodes.length
|
|
69
|
-
const serviceSources = new SourceService(service, () => now);
|
|
68
|
+
if (sourceNodes.length) {
|
|
69
|
+
const serviceSources = includeLocal ? new SourceService(service, () => now) : null;
|
|
70
70
|
const cache = new Map();
|
|
71
|
+
const recorded = new Set();
|
|
71
72
|
const supplied = payload.input;
|
|
72
73
|
env.source = (node, input, agent) => {
|
|
73
|
-
const key = (node.source?.binding ??
|
|
74
|
+
const key = JSON.stringify([node.source?.binding ?? null, liveDirectory(input) ?? liveDirectory(supplied), supplied.session_id, agent]);
|
|
74
75
|
let view = cache.get(key);
|
|
75
76
|
if (!view) {
|
|
76
77
|
try {
|
|
77
|
-
|
|
78
|
+
const directory = liveDirectory(input) ?? liveDirectory(supplied);
|
|
79
|
+
// A current Git query cannot establish the repository identity of a supplied snapshot.
|
|
80
|
+
const sourceContext = { project: directory ? projectPaths.canonical(directory) : null, session: typeof supplied.session_id === 'string' ? supplied.session_id : null, agent: agent ?? null, branch: null, head: null };
|
|
81
|
+
view = serviceSources ? serviceSources.view(node.source, sourceContext, false, observedAt === null ? undefined : Date.parse(observedAt)) : { source_id: null, name: '', state: 'missing', reason: 'input_only', observed_at: null, freshness: 'unknown', value: null, unit: null };
|
|
78
82
|
}
|
|
79
83
|
catch {
|
|
80
84
|
view = { source_id: null, name: node.source?.hint ?? '', state: 'error', reason: 'invalid', observed_at: null, freshness: 'unknown', value: null, unit: null };
|
|
81
85
|
}
|
|
82
86
|
cache.set(key, view);
|
|
83
87
|
}
|
|
84
|
-
const status = view.state === 'valid' ? view.freshness === 'stale' ? 'stale' : 'observed' : view.state === 'disabled' ? 'collector_off' : view.state === 'mismatch' ? 'session_mismatch' : view.state === 'partial' ? 'partial' : view.state === 'missing' || view.state === 'unbound' ? 'not_observed' : 'source_unavailable';
|
|
85
|
-
|
|
88
|
+
const status = !includeLocal ? 'input_only' : view.reason === 'newer_than_input' ? 'newer_than_input' : view.reason === 'association_unavailable' ? 'association_unavailable' : view.state === 'valid' ? view.freshness === 'stale' ? 'stale' : 'observed' : view.state === 'disabled' ? 'collector_off' : view.state === 'mismatch' ? 'session_mismatch' : view.state === 'partial' ? 'partial' : view.state === 'missing' || view.state === 'unbound' ? 'not_observed' : 'source_unavailable';
|
|
89
|
+
const evidenceKey = JSON.stringify([node.id, agent ?? null]);
|
|
90
|
+
if (!recorded.has(evidenceKey)) {
|
|
91
|
+
recorded.add(evidenceKey);
|
|
92
|
+
const entries = local.get(node.id) ?? [];
|
|
93
|
+
entries.push({ source: 'extension:' + (view.source_id ?? 'unbound'), scope: agent ? 'subagent:' + agent : 'local', status, observed_at: view.observed_at, freshness: status === 'newer_than_input' ? 'newer_than_input' : view.freshness, fields: [{ path: 'value', status: view.value === null ? 'not_observed' : 'observed' }, ...Object.keys(view.fields ?? {}).map(path => ({ path: 'fields.' + path, status: 'observed' }))] });
|
|
94
|
+
local.set(node.id, entries);
|
|
95
|
+
}
|
|
86
96
|
return view;
|
|
87
97
|
};
|
|
88
98
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/diagnostics/service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,4CAA4C,CAAC;AACjF,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACnE,OAAO,EAAE,eAAe,EAAwB,MAAM,+CAA+C,CAAC;AACtG,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAuB,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/diagnostics/service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { phaseMarker } from '@fbincon/statusline-platform/performance';
|
|
1
2
|
import * as fs from 'node:fs';
|
|
2
3
|
import { join, dirname } from 'node:path';
|
|
3
4
|
import { tmpdir } from 'node:os';
|
|
@@ -93,6 +94,7 @@ function targetIntegration(configDir, before, flags, origin, layout, env) {
|
|
|
93
94
|
return binding !== null;
|
|
94
95
|
}
|
|
95
96
|
export async function manage(argv, options) {
|
|
97
|
+
const mark = phaseMarker();
|
|
96
98
|
const { stdout, stderr } = options, environment = options.environment ?? process.env;
|
|
97
99
|
let flags, language = 'en', temporary, release, operation;
|
|
98
100
|
const controller = new AbortController(), cancel = () => controller.abort();
|
|
@@ -258,11 +260,13 @@ export async function manage(argv, options) {
|
|
|
258
260
|
saveOperation(operation);
|
|
259
261
|
const observeProcess = observeOperation(operation);
|
|
260
262
|
npm.onProcess = observeProcess;
|
|
263
|
+
mark('reviewed');
|
|
261
264
|
options.checkpoint?.('reviewed', operation);
|
|
262
265
|
verifyArchive(savedArchive, target);
|
|
263
266
|
if (installed?.version !== target.version) {
|
|
264
267
|
operation.stage = 'installing';
|
|
265
268
|
saveOperation(operation);
|
|
269
|
+
mark('installing');
|
|
266
270
|
options.checkpoint?.('installing', operation);
|
|
267
271
|
await npm.installArchive(savedArchive, layout.prefix);
|
|
268
272
|
}
|
|
@@ -270,11 +274,13 @@ export async function manage(argv, options) {
|
|
|
270
274
|
operation.stage = 'package_verified';
|
|
271
275
|
operation.results.package = true;
|
|
272
276
|
saveOperation(operation);
|
|
277
|
+
mark('package-verified');
|
|
273
278
|
options.checkpoint?.('package_verified', operation);
|
|
274
279
|
assertConfiguration(configDir, hashes);
|
|
275
280
|
if (integrated) {
|
|
276
281
|
operation.stage = 'integrating';
|
|
277
282
|
saveOperation(operation);
|
|
283
|
+
mark('integrating');
|
|
278
284
|
options.checkpoint?.('integrating', operation);
|
|
279
285
|
await (options.integrate ?? refreshIntegration)(layout.root, operation.after, configDir, host, hashes, temporary, false, environment, controller.signal, observeProcess);
|
|
280
286
|
}
|
|
@@ -283,6 +289,7 @@ export async function manage(argv, options) {
|
|
|
283
289
|
saveOperation(operation);
|
|
284
290
|
recordInstallation(operation);
|
|
285
291
|
finishOperation(operation);
|
|
292
|
+
mark('complete');
|
|
286
293
|
stdout(t('management.complete', language, { version: target.version, prefix: layout.prefix, backup: operation.snapshot ? operation.id : '—' }) + '\n');
|
|
287
294
|
if (runnerRoot)
|
|
288
295
|
stdout(t('management.runner', language, { entry: join(recoveryRunner, 'bin/claude-statusline.js') }) + '\n');
|
|
@@ -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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"}
|
|
@@ -32,4 +32,5 @@ export declare function automaticRequested(directory: string): boolean;
|
|
|
32
32
|
export declare function refreshIdentity(source: SourceDefinition, context: SourceContext): string;
|
|
33
33
|
export declare function activeLease(state: AutomaticState, identity: string, now: number): boolean;
|
|
34
34
|
export declare function automaticJobActive(directory: string, job: SourceJob, now: number): boolean;
|
|
35
|
+
export declare function manualJobActive(job: SourceJob, now: number): boolean;
|
|
35
36
|
export declare function automaticStatus(directory: string, source: SourceDefinition, context: SourceContext, now: number, jobs: SourceJob[]): AutomaticStatus;
|
|
@@ -48,11 +48,12 @@ 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
|
-
if (job.trigger !== 'automatic')
|
|
52
|
-
return true;
|
|
53
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);
|
|
54
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));
|
|
55
53
|
}
|
|
54
|
+
export function manualJobActive(job, now) {
|
|
55
|
+
return job.consumers.some(consumer => Date.parse(consumer.expires_at) > now);
|
|
56
|
+
}
|
|
56
57
|
export function automaticStatus(directory, source, context, now, jobs) {
|
|
57
58
|
const policy = sourceRegistry(directory).automatic.find(p => p.source_id === source.id);
|
|
58
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)) };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"automatic-state.js","sourceRoot":"","sources":["../../../src/sources/automatic-state.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"automatic-state.js","sourceRoot":"","sources":["../../../src/sources/automatic-state.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,28 +58,37 @@ export async function sourceCommand(args, configuration, language) {
|
|
|
58
58
|
const source = service.source(id), context = contextFor(typeof flags['--project'] === 'string' ? flags['--project'] : source.scope.project ?? process.cwd(), typeof flags['--session'] === 'string' ? flags['--session'] : null, typeof flags['--agent'] === 'string' ? flags['--agent'] : null);
|
|
59
59
|
if (action === 'diagnose')
|
|
60
60
|
return pretty(service.diagnose(id, context));
|
|
61
|
-
|
|
61
|
+
const owner = randomUUID();
|
|
62
62
|
if (flags['--no-wait'])
|
|
63
|
-
return pretty(
|
|
63
|
+
return pretty(service.start(id, context, owner));
|
|
64
|
+
let job, interrupted = false;
|
|
64
65
|
const cancel = () => {
|
|
66
|
+
interrupted = true;
|
|
67
|
+
if (!job)
|
|
68
|
+
return;
|
|
65
69
|
try {
|
|
66
|
-
job = service.
|
|
70
|
+
job = service.release(job.id, owner);
|
|
67
71
|
}
|
|
68
72
|
catch { /* Read the durable result below. */ }
|
|
69
73
|
};
|
|
70
74
|
process.once('SIGINT', cancel);
|
|
71
75
|
process.once('SIGTERM', cancel);
|
|
72
76
|
try {
|
|
73
|
-
|
|
77
|
+
job = service.start(id, context, owner);
|
|
78
|
+
if (interrupted)
|
|
79
|
+
cancel();
|
|
80
|
+
while (job.state === 'running' && !interrupted) {
|
|
74
81
|
await new Promise(r => setTimeout(r, 100));
|
|
75
82
|
job = service.job(job.id);
|
|
76
83
|
}
|
|
84
|
+
if (interrupted)
|
|
85
|
+
sourceError('cancelled');
|
|
86
|
+
return pretty(job);
|
|
77
87
|
}
|
|
78
88
|
finally {
|
|
79
89
|
process.removeListener('SIGINT', cancel);
|
|
80
90
|
process.removeListener('SIGTERM', cancel);
|
|
81
91
|
}
|
|
82
|
-
return pretty(job);
|
|
83
92
|
}
|
|
84
93
|
const payload = { action, id, expected_revision: current.revision };
|
|
85
94
|
if (action === 'add' || action === 'edit') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/sources/command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/sources/command.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,12 +22,14 @@ export declare class SourceService {
|
|
|
22
22
|
job(id: unknown): SourceJob;
|
|
23
23
|
jobs(): SourceJob[];
|
|
24
24
|
private cancelSource;
|
|
25
|
+
private interested;
|
|
26
|
+
release(id: unknown, owner: unknown): SourceJob;
|
|
25
27
|
cancel(id: unknown): SourceJob;
|
|
26
28
|
start(id: unknown, contextValue: unknown, owner: unknown, trigger?: 'manual' | 'automatic'): SourceJob;
|
|
27
29
|
private observationPath;
|
|
28
30
|
private stored;
|
|
29
31
|
private publish;
|
|
30
|
-
view(ref: SourceReference | undefined, context: SourceContext, publishLocal?: boolean): SourceView;
|
|
32
|
+
view(ref: SourceReference | undefined, context: SourceContext, publishLocal?: boolean, historicalAt?: number): SourceView;
|
|
31
33
|
diagnose(id: unknown, context: SourceContext): {
|
|
32
34
|
source: SourceDefinition;
|
|
33
35
|
view: SourceView;
|
|
@@ -2,7 +2,7 @@ import { spawn } from 'node:child_process';
|
|
|
2
2
|
import { randomUUID } from 'node:crypto';
|
|
3
3
|
import { join, resolve, isAbsolute } from 'node:path';
|
|
4
4
|
import { readdirSync, statSync, unlinkSync, mkdirSync, rmdirSync } from 'node:fs';
|
|
5
|
-
import { SOURCE_FILENAME, MAX_SOURCE_BYTES, emptyRegistry, registry, definition, sourceError, sourceId, sourceContext, matchesScope, sameContext, observationContext, sourceView, emptyObservation, stamp, scalar } from '@fbincon/statusline-core/extensions/model';
|
|
5
|
+
import { SOURCE_FILENAME, MAX_SOURCE_BYTES, emptyRegistry, registry, definition, sourceError, sourceId, sourceContext, matchesScope, sameContext, observationContext, observationAt, sourceView, emptyObservation, stamp, scalar } from '@fbincon/statusline-core/extensions/model';
|
|
6
6
|
import { object, ConfigError, integer } from '@fbincon/statusline-core/config/validation';
|
|
7
7
|
import { readJson } from '@fbincon/statusline-core/json-read';
|
|
8
8
|
import { revision } from '@fbincon/statusline-platform/hash';
|
|
@@ -15,7 +15,7 @@ import { jsonBytes, artifact } from '../config/storage.js';
|
|
|
15
15
|
import { commit } from '../recovery/files.js';
|
|
16
16
|
import { safeTarget } from '../integration/paths.js';
|
|
17
17
|
import { contextFor, authRevision } from './context.js';
|
|
18
|
-
import { automaticJobActive, automaticStatus, refreshIdentity, readAutomatic, writeAutomatic } from './automatic-state.js';
|
|
18
|
+
import { automaticJobActive, manualJobActive, automaticStatus, refreshIdentity, readAutomatic, writeAutomatic } from './automatic-state.js';
|
|
19
19
|
import { readLocal, refreshCommand, refreshGithub } from './providers.js';
|
|
20
20
|
export class SourceService {
|
|
21
21
|
configuration;
|
|
@@ -168,7 +168,7 @@ export class SourceService {
|
|
|
168
168
|
jobPath(id) { return join(this.root, 'jobs', sourceId(id) + '.json'); }
|
|
169
169
|
job(id) {
|
|
170
170
|
const value = this.readValue(this.jobPath(sourceId(id)));
|
|
171
|
-
if (!object(value) || ![1, 2].includes(value.version) || !['running', 'completed', 'failed', 'cancelled'].includes(value.state))
|
|
171
|
+
if (!object(value) || ![1, 2, 3].includes(value.version) || !['running', 'completed', 'failed', 'cancelled'].includes(value.state))
|
|
172
172
|
sourceError('not_found');
|
|
173
173
|
sourceId(value.id);
|
|
174
174
|
sourceId(value.source_id);
|
|
@@ -177,9 +177,19 @@ export class SourceService {
|
|
|
177
177
|
sourceContext(value.context);
|
|
178
178
|
if (!stamp(value.started_at) || !stamp(value.deadline_at) || typeof value.reason !== 'string')
|
|
179
179
|
sourceError('invalid');
|
|
180
|
-
const
|
|
180
|
+
const legacy = value.version === 1 ? { ...value, trigger: 'manual', identity: revision([value.source_id, value.source_revision, value.context]) } : value;
|
|
181
|
+
const job = { ...legacy, version: 3, consumers: value.version === 3 ? value.consumers : legacy.trigger === 'manual' ? [{ owner: value.owner, expires_at: value.deadline_at }] : [] };
|
|
181
182
|
if (!['manual', 'automatic'].includes(job.trigger) || !/^[a-f0-9]{64}$/.test(job.identity))
|
|
182
183
|
sourceError('invalid');
|
|
184
|
+
if (!Array.isArray(job.consumers) || job.consumers.length > 128 || new Set(job.consumers.map(c => c.owner)).size !== job.consumers.length)
|
|
185
|
+
sourceError('invalid');
|
|
186
|
+
for (const consumer of job.consumers) {
|
|
187
|
+
if (!object(consumer) || Object.keys(consumer).sort().join(',') !== 'expires_at,owner')
|
|
188
|
+
sourceError('invalid');
|
|
189
|
+
sourceId(consumer.owner);
|
|
190
|
+
if (!stamp(consumer.expires_at) || Date.parse(consumer.expires_at) > Date.parse(job.deadline_at))
|
|
191
|
+
sourceError('invalid');
|
|
192
|
+
}
|
|
183
193
|
if (job.state === 'running' && Date.parse(job.deadline_at) + 2000 < this.now())
|
|
184
194
|
return { ...job, state: 'failed', reason: 'timeout' };
|
|
185
195
|
return job;
|
|
@@ -201,9 +211,27 @@ export class SourceService {
|
|
|
201
211
|
}
|
|
202
212
|
cancelSource(id, automaticOnly = false) {
|
|
203
213
|
for (const job of this.jobs())
|
|
204
|
-
if (job.source_id === id && job.state === 'running' && (!automaticOnly || job.
|
|
214
|
+
if (job.source_id === id && job.state === 'running' && (!automaticOnly || !manualJobActive(job, this.now())))
|
|
205
215
|
this.write(this.jobPath(job.id), { ...job, state: 'cancelled', reason: 'cancelled' });
|
|
206
216
|
}
|
|
217
|
+
interested(job) {
|
|
218
|
+
return manualJobActive(job, this.now()) || automaticJobActive(this.configuration.context.configDir, job, this.now());
|
|
219
|
+
}
|
|
220
|
+
release(id, owner) {
|
|
221
|
+
const consumer = sourceId(owner);
|
|
222
|
+
return this.configuration.io.lock(this.configuration.context.configDir, () => {
|
|
223
|
+
const job = this.job(id);
|
|
224
|
+
if (job.state !== 'running' || !job.consumers.some(c => c.owner === consumer))
|
|
225
|
+
return job;
|
|
226
|
+
job.consumers = job.consumers.filter(c => c.owner !== consumer);
|
|
227
|
+
if (!this.interested(job)) {
|
|
228
|
+
job.state = 'cancelled';
|
|
229
|
+
job.reason = 'no_consumers';
|
|
230
|
+
}
|
|
231
|
+
this.write(this.jobPath(job.id), job);
|
|
232
|
+
return job;
|
|
233
|
+
});
|
|
234
|
+
}
|
|
207
235
|
cancel(id) {
|
|
208
236
|
return this.configuration.io.lock(this.configuration.context.configDir, () => {
|
|
209
237
|
const job = this.job(id);
|
|
@@ -228,19 +256,25 @@ export class SourceService {
|
|
|
228
256
|
if (!matchesScope(source.scope, actual))
|
|
229
257
|
sourceError('scope');
|
|
230
258
|
const context = observationContext(source, actual), identity = refreshIdentity(source, context);
|
|
231
|
-
const existing = this.jobs().find(job => job.source_id === source.id && job.state === 'running' && (source.kind !== 'github' || job.identity === identity));
|
|
259
|
+
const existing = this.jobs().find(job => job.source_id === source.id && job.state === 'running' && (source.kind !== 'github' || job.identity === identity || this.readValue(this.jobPath(job.id))?.version !== 3));
|
|
232
260
|
if (existing) {
|
|
233
261
|
if (source.kind !== 'github')
|
|
234
262
|
sourceError('busy');
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
263
|
+
const stored = this.readValue(this.jobPath(existing.id));
|
|
264
|
+
if (!object(stored) || stored.version !== 3 || Date.parse(existing.deadline_at) <= this.now())
|
|
265
|
+
sourceError('busy');
|
|
266
|
+
if (trigger === 'manual' && !existing.consumers.some(c => c.owner === ownerId)) {
|
|
267
|
+
if (existing.consumers.length >= 128)
|
|
268
|
+
sourceError('busy');
|
|
269
|
+
existing.consumers.push({ owner: ownerId, expires_at: existing.deadline_at });
|
|
238
270
|
this.write(this.jobPath(existing.id), existing);
|
|
239
271
|
}
|
|
240
272
|
return existing;
|
|
241
273
|
}
|
|
242
|
-
const created = { version:
|
|
274
|
+
const created = { version: 3, trigger, identity, id: randomUUID(), source_id: source.id, source_revision: source.revision, owner: ownerId, consumers: [], context,
|
|
243
275
|
started_at: new Date(this.now()).toISOString(), deadline_at: new Date(this.now() + (source.kind === 'github' ? 30000 : source.settings.timeout_ms ?? 5000)).toISOString(), state: 'running', reason: 'running' };
|
|
276
|
+
if (trigger === 'manual')
|
|
277
|
+
created.consumers.push({ owner: ownerId, expires_at: created.deadline_at });
|
|
244
278
|
if (trigger === 'automatic' && !automaticJobActive(this.configuration.context.configDir, created, this.now()))
|
|
245
279
|
sourceError('disabled');
|
|
246
280
|
this.write(this.jobPath(created.id), created);
|
|
@@ -297,7 +331,7 @@ export class SourceService {
|
|
|
297
331
|
this.write(this.observationPath(source, context), { version: 1, current: observation, good: observation.value !== null && ['valid', 'partial'].includes(observation.state) ? observation : previous?.good ?? null });
|
|
298
332
|
this.prune();
|
|
299
333
|
}
|
|
300
|
-
view(ref, context, publishLocal = true) {
|
|
334
|
+
view(ref, context, publishLocal = true, historicalAt) {
|
|
301
335
|
const registry = this.read(), binding = registry.bindings.find(b => b.id === ref?.binding), source = registry.sources.find(s => s.id === binding?.source_id);
|
|
302
336
|
if (!source || !source.enabled || !matchesScope(source.scope, context))
|
|
303
337
|
return sourceView(source, context, null, null, this.now());
|
|
@@ -305,18 +339,18 @@ export class SourceService {
|
|
|
305
339
|
if (source.kind === 'json') {
|
|
306
340
|
const observed = readLocal(source, context);
|
|
307
341
|
try {
|
|
308
|
-
if (publishLocal)
|
|
342
|
+
if (publishLocal && historicalAt === undefined)
|
|
309
343
|
this.publish(source, context, observed);
|
|
310
344
|
}
|
|
311
345
|
catch { /* Local cache is optional; report the actual read below. */ }
|
|
312
346
|
const prior = this.stored(source, context);
|
|
313
|
-
return sourceView(source, context, observed, prior?.good ?? null, this.now());
|
|
347
|
+
return sourceView(source, context, observed, prior?.good ?? null, this.now(), historicalAt);
|
|
314
348
|
}
|
|
315
349
|
const data = this.stored(source, context);
|
|
316
|
-
const identity = data?.current.identity ?? data?.good?.identity;
|
|
350
|
+
const identity = historicalAt === undefined ? data?.current.identity ?? data?.good?.identity : (observationAt(data?.current ?? null, historicalAt) ?? observationAt(data?.good ?? null, historicalAt))?.identity;
|
|
317
351
|
if (source.kind === 'github' && identity && (identity.auth_revision !== authRevision() || identity.host !== source.settings.host || identity.repository !== source.settings.repository || identity.account !== source.settings.account))
|
|
318
352
|
return { ...sourceView(source, context, null, null, this.now()), state: 'mismatch', reason: 'identity' };
|
|
319
|
-
return sourceView(source, context, data?.current ?? null, data?.good ?? null, this.now());
|
|
353
|
+
return sourceView(source, context, data?.current ?? null, data?.good ?? null, this.now(), historicalAt);
|
|
320
354
|
}
|
|
321
355
|
diagnose(id, context) {
|
|
322
356
|
const source = this.source(id), applicable = matchesScope(source.scope, context);
|
|
@@ -333,8 +367,8 @@ export class SourceService {
|
|
|
333
367
|
cancelInactiveAutomatic() {
|
|
334
368
|
this.configuration.io.lock(this.configuration.context.configDir, () => {
|
|
335
369
|
for (const job of this.jobs())
|
|
336
|
-
if (job.
|
|
337
|
-
this.write(this.jobPath(job.id), { ...job, state: 'cancelled', reason: 'lease_expired' });
|
|
370
|
+
if (job.state === 'running' && !this.interested(job))
|
|
371
|
+
this.write(this.jobPath(job.id), { ...job, state: 'cancelled', reason: job.trigger === 'automatic' ? 'lease_expired' : 'no_consumers' });
|
|
338
372
|
});
|
|
339
373
|
}
|
|
340
374
|
async work(id) {
|
|
@@ -354,7 +388,7 @@ export class SourceService {
|
|
|
354
388
|
const watcher = setInterval(() => {
|
|
355
389
|
try {
|
|
356
390
|
const source = this.source(job.source_id), current = this.job(id);
|
|
357
|
-
if (current.state !== 'running' || source.revision !== job.source_revision || !source.enabled ||
|
|
391
|
+
if (current.state !== 'running' || source.revision !== job.source_revision || !source.enabled || refreshIdentity(source, job.context) !== job.identity || !this.interested(current))
|
|
358
392
|
abort.abort();
|
|
359
393
|
}
|
|
360
394
|
catch {
|
|
@@ -364,7 +398,7 @@ export class SourceService {
|
|
|
364
398
|
const deadline = setTimeout(() => abort.abort(), Math.max(1, Date.parse(job.deadline_at) - this.now()));
|
|
365
399
|
try {
|
|
366
400
|
const source = this.source(job.source_id);
|
|
367
|
-
if (!source.enabled || source.revision !== job.source_revision ||
|
|
401
|
+
if (!source.enabled || source.revision !== job.source_revision || refreshIdentity(source, job.context) !== job.identity || !this.interested(this.job(id)))
|
|
368
402
|
return;
|
|
369
403
|
let observation;
|
|
370
404
|
if (!sameContext(observationContext(source, contextFor(job.context.project, job.context.session, job.context.agent)), job.context))
|
|
@@ -377,11 +411,11 @@ export class SourceService {
|
|
|
377
411
|
const latest = this.source(job.source_id), state = this.job(id);
|
|
378
412
|
if (state.state !== 'running' || !latest.enabled || latest.revision !== job.source_revision)
|
|
379
413
|
return;
|
|
380
|
-
if (!
|
|
381
|
-
this.write(this.jobPath(id), { ...state, state: 'cancelled', reason: 'lease_expired' });
|
|
414
|
+
if (!this.interested(state)) {
|
|
415
|
+
this.write(this.jobPath(id), { ...state, state: 'cancelled', reason: job.trigger === 'automatic' ? 'lease_expired' : 'no_consumers' });
|
|
382
416
|
return;
|
|
383
417
|
}
|
|
384
|
-
if (!sameContext(observationContext(latest, contextFor(job.context.project, job.context.session, job.context.agent)), job.context))
|
|
418
|
+
if (refreshIdentity(latest, job.context) !== job.identity || !sameContext(observationContext(latest, contextFor(job.context.project, job.context.session, job.context.agent)), job.context))
|
|
385
419
|
observation = emptyObservation(source, job.context, 'identity');
|
|
386
420
|
if (observation.reason !== 'identity' && observation.reason !== 'account')
|
|
387
421
|
this.publish(source, job.context, observation);
|