openmeld 0.3.288 → 0.3.290
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/dist/{add-me-membership-BQl3NpHs.js → add-me-membership-inSSCZiT.js} +2 -2
- package/dist/{add-me-membership-BQl3NpHs.js.map → add-me-membership-inSSCZiT.js.map} +1 -1
- package/dist/{agents-B0w90SR9.js → agents-Dai79qvd.js} +10 -10
- package/dist/{agents-B0w90SR9.js.map → agents-Dai79qvd.js.map} +1 -1
- package/dist/{api-client-foundation-RM1pxGSx.js → api-client-foundation-BFlKjR9I.js} +1 -1
- package/dist/{api-client-foundation-i2KBsQ7r.js → api-client-foundation-DERyHDAT.js} +6 -6
- package/dist/{api-client-foundation-i2KBsQ7r.js.map → api-client-foundation-DERyHDAT.js.map} +1 -1
- package/dist/{auth-session-DRQMn41Z.js → auth-session-B2lS_bSW.js} +4 -4
- package/dist/{auth-session-DRQMn41Z.js.map → auth-session-B2lS_bSW.js.map} +1 -1
- package/dist/auth-session-Cj6PrTZ3.js +3 -0
- package/dist/{auth-url-Dnpds8Yf.js → auth-url-LPP-DGsD.js} +2 -2
- package/dist/{auth-url-Dnpds8Yf.js.map → auth-url-LPP-DGsD.js.map} +1 -1
- package/dist/{base-url-b30kK86t.js → base-url-DuppOOaB.js} +2 -2
- package/dist/{base-url-b30kK86t.js.map → base-url-DuppOOaB.js.map} +1 -1
- package/dist/{base-url-Mw6hstaO.js → base-url-GJgAnOwO.js} +1 -1
- package/dist/{channel-CFIRo4fR.js → channel-DFsCrkPT.js} +17 -6
- package/dist/channel-DFsCrkPT.js.map +1 -0
- package/dist/{client-CBTgmyFC.js → client-BoQLTU0k.js} +2 -2
- package/dist/{client-CBTgmyFC.js.map → client-BoQLTU0k.js.map} +1 -1
- package/dist/{cloud-computer-CuWSimwt.js → cloud-computer-DYQpdovK.js} +6 -6
- package/dist/{cloud-computer-CuWSimwt.js.map → cloud-computer-DYQpdovK.js.map} +1 -1
- package/dist/{command-BqcCAQJ_.js → command-BMssGnS1.js} +19 -19
- package/dist/{command-BqcCAQJ_.js.map → command-BMssGnS1.js.map} +1 -1
- package/dist/{computer-connection-review-Bw3C24LC.js → computer-connection-review-B2VBvkUf.js} +5 -5
- package/dist/{computer-connection-review-Bw3C24LC.js.map → computer-connection-review-B2VBvkUf.js.map} +1 -1
- package/dist/{computer-disconnect-BXUbY8kY.js → computer-disconnect-BsO7SqGv.js} +9 -9
- package/dist/{computer-disconnect-BXUbY8kY.js.map → computer-disconnect-BsO7SqGv.js.map} +1 -1
- package/dist/{computer-setup-continuation-uk5s7_vp.js → computer-setup-continuation-DN9nvTdz.js} +5 -5
- package/dist/{computer-setup-continuation-uk5s7_vp.js.map → computer-setup-continuation-DN9nvTdz.js.map} +1 -1
- package/dist/{computer-update-wait-Bm_oW5Ne.js → computer-update-wait-DjNHPLHV.js} +4 -4
- package/dist/{computer-update-wait-Bm_oW5Ne.js.map → computer-update-wait-DjNHPLHV.js.map} +1 -1
- package/dist/{context-BvLQjNGR.js → context-C6GiteNY.js} +8 -8
- package/dist/{context-BvLQjNGR.js.map → context-C6GiteNY.js.map} +1 -1
- package/dist/{daemon-device-id-D-RHe9se.js → daemon-device-id-CGV19VtH.js} +4 -4
- package/dist/{daemon-device-id-D-RHe9se.js.map → daemon-device-id-CGV19VtH.js.map} +1 -1
- package/dist/{daemon-lifecycle-journal-AyDo0rCV.js → daemon-lifecycle-journal-YFnaFEDn.js} +4 -4
- package/dist/{daemon-lifecycle-journal-AyDo0rCV.js.map → daemon-lifecycle-journal-YFnaFEDn.js.map} +1 -1
- package/dist/{daemon-runtime-lease-CslvUjEq.js → daemon-runtime-lease-CgP8D7m8.js} +1 -1
- package/dist/{daemon-runtime-lease-DRYVXnBQ.js → daemon-runtime-lease-IKWq2O8q.js} +2 -2
- package/dist/{daemon-runtime-lease-DRYVXnBQ.js.map → daemon-runtime-lease-IKWq2O8q.js.map} +1 -1
- package/dist/{daemon-service-contract-CsANv7K_.js → daemon-service-contract-D8osKBM6.js} +2 -2
- package/dist/{daemon-service-contract-CsANv7K_.js.map → daemon-service-contract-D8osKBM6.js.map} +1 -1
- package/dist/{daemon-service-manager-DS4kFs8x.js → daemon-service-manager-CAGPGW2q.js} +1 -1
- package/dist/{daemon-service-manager-a5tY3qpR.js → daemon-service-manager-DB2rSviv.js} +4 -4
- package/dist/{daemon-service-manager-a5tY3qpR.js.map → daemon-service-manager-DB2rSviv.js.map} +1 -1
- package/dist/{daemon-service-runtime-CMi7bRwi.js → daemon-service-runtime-Dnu6mxCS.js} +12 -12
- package/dist/{daemon-service-runtime-CMi7bRwi.js.map → daemon-service-runtime-Dnu6mxCS.js.map} +1 -1
- package/dist/{daemon-service-update-state-BSn45OHj.js → daemon-service-update-state-GCIZ6nGp.js} +2 -2
- package/dist/{daemon-service-update-state-BSn45OHj.js.map → daemon-service-update-state-GCIZ6nGp.js.map} +1 -1
- package/dist/{daemon-state-CTOVPwNq.js → daemon-state-C72A-n6c.js} +3 -3
- package/dist/{daemon-state-CTOVPwNq.js.map → daemon-state-C72A-n6c.js.map} +1 -1
- package/dist/{dispatch-owned-runtime-CCeQTcjr.js → dispatch-owned-runtime-CoVWIxYl.js} +12 -12
- package/dist/{dispatch-owned-runtime-CCeQTcjr.js.map → dispatch-owned-runtime-CoVWIxYl.js.map} +1 -1
- package/dist/{dist-53uvP0DN.js → dist-BC0SB_h-.js} +3 -3
- package/dist/{dist-53uvP0DN.js.map → dist-BC0SB_h-.js.map} +1 -1
- package/dist/{dist-CqU093n8.js → dist-BuqY1gad.js} +2 -2
- package/dist/dist-DahbdeDi.js +34 -0
- package/dist/{dist-D7SkvUZW.js → dist-VZtPE-jT.js} +2 -2
- package/dist/{dist-D7SkvUZW.js.map → dist-VZtPE-jT.js.map} +1 -1
- package/dist/{dist-CZyGORfc.js → dist-zOvEcl-o.js} +1 -1
- package/dist/{dual-view-guide-catalog-Buq8NAPC.js → dual-view-guide-catalog-DJVTHfKM.js} +4 -4
- package/dist/{dual-view-guide-catalog-Buq8NAPC.js.map → dual-view-guide-catalog-DJVTHfKM.js.map} +1 -1
- package/dist/{elapsed-time-jRFzKVlC.js → elapsed-time-CzR72jgL.js} +2 -2
- package/dist/{elapsed-time-jRFzKVlC.js.map → elapsed-time-CzR72jgL.js.map} +1 -1
- package/dist/{entry-D-22_x6G.js → entry-hCEOH64N.js} +152 -82
- package/dist/entry-hCEOH64N.js.map +1 -0
- package/dist/{installation-inventory-B7Lj2s1Y.js → installation-inventory-CsSfOQgL.js} +4 -4
- package/dist/{installation-inventory-B7Lj2s1Y.js.map → installation-inventory-CsSfOQgL.js.map} +1 -1
- package/dist/{installer-BgUOrcah.js → installer-BytXmECH.js} +2 -2
- package/dist/{installer-BgUOrcah.js.map → installer-BytXmECH.js.map} +1 -1
- package/dist/{lock-DP8d33p_.js → lock-B0YzvcUu.js} +3 -3
- package/dist/lock-B0YzvcUu.js.map +1 -0
- package/dist/{meta-api-32dKpaJB.js → meta-api-YLzAzgov.js} +8 -8
- package/dist/{meta-api-32dKpaJB.js.map → meta-api-YLzAzgov.js.map} +1 -1
- package/dist/{openmeld-BOBD0Any.js → openmeld-Dt4vpNjB.js} +43 -43
- package/dist/{openmeld-BOBD0Any.js.map → openmeld-Dt4vpNjB.js.map} +1 -1
- package/dist/{openmeld-dev-environment-CAETyazL.js → openmeld-dev-environment-Rl0tTXNd.js} +3 -3
- package/dist/{openmeld-dev-environment-CAETyazL.js.map → openmeld-dev-environment-Rl0tTXNd.js.map} +1 -1
- package/dist/openmeld-dev.js +1 -1
- package/dist/{openmeld-environment-target-DydyKO8Z.js → openmeld-environment-target-KDkHbyUB.js} +4 -4
- package/dist/{openmeld-environment-target-DydyKO8Z.js.map → openmeld-environment-target-KDkHbyUB.js.map} +1 -1
- package/dist/{openmeld-maintenance-worker-C99TPCOq.js → openmeld-maintenance-worker-BIWvvyIf.js} +16 -16
- package/dist/{openmeld-maintenance-worker-C99TPCOq.js.map → openmeld-maintenance-worker-BIWvvyIf.js.map} +1 -1
- package/dist/{openmeld-tools-update-attempt-state-B6t53OYC.js → openmeld-tools-update-attempt-state-sK3W06wI.js} +2 -2
- package/dist/{openmeld-tools-update-attempt-state-B6t53OYC.js.map → openmeld-tools-update-attempt-state-sK3W06wI.js.map} +1 -1
- package/dist/{openmeld-tools-update-coordinator-DkC6z3PV.js → openmeld-tools-update-coordinator-BWFtknlg.js} +31 -26
- package/dist/{openmeld-tools-update-coordinator-DkC6z3PV.js.map → openmeld-tools-update-coordinator-BWFtknlg.js.map} +1 -1
- package/dist/{openmeld-tools-update-join-B0bVe2pL.js → openmeld-tools-update-join-vlA-GmSh.js} +4 -4
- package/dist/{openmeld-tools-update-join-B0bVe2pL.js.map → openmeld-tools-update-join-vlA-GmSh.js.map} +1 -1
- package/dist/openmeld.js +5 -5
- package/dist/{prepare-provider-runtime-m0GVd1Za.js → prepare-provider-runtime-D4X1jiYQ.js} +33 -17
- package/dist/prepare-provider-runtime-D4X1jiYQ.js.map +1 -0
- package/dist/{prepare-session-executor-C8tvGy6j.js → prepare-session-executor-Cwe666D0.js} +24 -24
- package/dist/{prepare-session-executor-C8tvGy6j.js.map → prepare-session-executor-Cwe666D0.js.map} +1 -1
- package/dist/{presenter-DMoE2U_q.js → presenter-CfWGbWdq.js} +2 -2
- package/dist/{presenter-DMoE2U_q.js.map → presenter-CfWGbWdq.js.map} +1 -1
- package/dist/{process-channel-DtJ01mUI.js → process-channel-AjxeujN8.js} +2 -2
- package/dist/{process-channel-DtJ01mUI.js.map → process-channel-AjxeujN8.js.map} +1 -1
- package/dist/{runtime-DDZRXE1m.js → runtime-DVaIwyJM.js} +163 -75
- package/dist/runtime-DVaIwyJM.js.map +1 -0
- package/dist/{runtime-agent-controller-reporting-submission-Br2qDki0.js → runtime-agent-controller-reporting-submission-CkiUg9j0.js} +8 -8
- package/dist/{runtime-agent-controller-reporting-submission-Br2qDki0.js.map → runtime-agent-controller-reporting-submission-CkiUg9j0.js.map} +1 -1
- package/dist/{runtime-transport-Dg7E0ROH.js → runtime-transport-CLpKUHk_.js} +5 -1
- package/dist/{runtime-transport-Dg7E0ROH.js.map → runtime-transport-CLpKUHk_.js.map} +1 -1
- package/dist/{sensitive-operation-credentials-Dr_neVvL.js → sensitive-operation-credentials-D9DHfCDf.js} +4 -4
- package/dist/{sensitive-operation-credentials-Dr_neVvL.js.map → sensitive-operation-credentials-D9DHfCDf.js.map} +1 -1
- package/dist/{service-CjVGm1FB.js → service-BoxFPDKp.js} +104 -37
- package/dist/service-BoxFPDKp.js.map +1 -0
- package/dist/{service-account-authorization-DiSsm3hB.js → service-account-authorization-MARMxBls.js} +5 -5
- package/dist/{service-account-authorization-DiSsm3hB.js.map → service-account-authorization-MARMxBls.js.map} +1 -1
- package/dist/{service-account-control-C3jIB8Pg.js → service-account-control-D0f6SaS2.js} +13 -13
- package/dist/{service-account-control-C3jIB8Pg.js.map → service-account-control-D0f6SaS2.js.map} +1 -1
- package/dist/{service-control-capabilities-Bd2t4hQ4.js → service-control-capabilities-C5lV5eqZ.js} +5 -5
- package/dist/{service-control-capabilities-Bd2t4hQ4.js.map → service-control-capabilities-C5lV5eqZ.js.map} +1 -1
- package/dist/{service-control-capabilities-IVIJRGI7.js → service-control-capabilities-DVnJWbBU.js} +1 -1
- package/dist/{state-YbqBm7wx.js → state-LIaPm3LW.js} +2 -2
- package/dist/{state-YbqBm7wx.js.map → state-LIaPm3LW.js.map} +1 -1
- package/dist/{updates-api-D4OvCDcm.js → updates-api-CV0uvAN1.js} +81 -77
- package/dist/updates-api-CV0uvAN1.js.map +1 -0
- package/dist/upgrade-Bi-kRFVX.js +3 -0
- package/dist/{upgrade-BWDsvax2.js → upgrade-C23MjDuG.js} +10 -10
- package/dist/{upgrade-BWDsvax2.js.map → upgrade-C23MjDuG.js.map} +1 -1
- package/dist/windows/openmeld-windows-process.exe +0 -0
- package/dist/{windows-user-task-CKb_u29X.js → windows-user-task-CR64LZEK.js} +3 -3
- package/dist/{windows-user-task-CKb_u29X.js.map → windows-user-task-CR64LZEK.js.map} +1 -1
- package/dist/{windows-user-task-zYK9uy2K.js → windows-user-task-Dr1wlrfz.js} +1 -1
- package/package.json +9 -9
- package/dist/auth-session-C9F7usbn.js +0 -3
- package/dist/channel-CFIRo4fR.js.map +0 -1
- package/dist/dist-CcuvAb_V.js +0 -34
- package/dist/entry-D-22_x6G.js.map +0 -1
- package/dist/lock-DP8d33p_.js.map +0 -1
- package/dist/prepare-provider-runtime-m0GVd1Za.js.map +0 -1
- package/dist/runtime-DDZRXE1m.js.map +0 -1
- package/dist/service-CjVGm1FB.js.map +0 -1
- package/dist/updates-api-D4OvCDcm.js.map +0 -1
- package/dist/upgrade-DUs1kUZ9.js +0 -3
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
|
|
3
|
-
import { at as formatOpenMeldCliCommand, it as formatInlineOpenMeldCliCommands } from "./auth-session-
|
|
3
|
+
import { at as formatOpenMeldCliCommand, it as formatInlineOpenMeldCliCommands } from "./auth-session-B2lS_bSW.js";
|
|
4
4
|
import { isCancel, select } from "@clack/prompts";
|
|
5
5
|
//#region src/runtime/interaction.ts
|
|
6
6
|
function canUseInteractivePrompts(context) {
|
|
@@ -119,4 +119,4 @@ function formatElapsedTime(durationMs) {
|
|
|
119
119
|
//#endregion
|
|
120
120
|
export { formatDaemonServiceDowngradeBlockedRecommendation as a, formatDaemonServiceMissingRecommendation as c, formatDaemonServiceMissingStatus as d, getDaemonDowngradeBlockedTitle as f, formatDaemonInstallFailedMessage as i, formatDaemonServiceMissingRunStepOne as l, canUseInteractivePrompts as m, resolveElapsedTimeMs as n, formatDaemonServiceMissingAction as o, runDaemonInstallDecisionPrompt as p, formatDaemonDowngradeBlockedNextStep as r, formatDaemonServiceMissingMeaning as s, formatElapsedTime as t, formatDaemonServiceMissingRunStepTwo as u };
|
|
121
121
|
|
|
122
|
-
//# sourceMappingURL=elapsed-time-
|
|
122
|
+
//# sourceMappingURL=elapsed-time-CzR72jgL.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"elapsed-time-jRFzKVlC.js","names":[],"sources":["../src/runtime/interaction.ts","../src/system/local-service-install-attention.ts","../src/ui/elapsed-time.ts"],"sourcesContent":["import type { RuntimeContext } from \"./types\";\n\nexport function canUseInteractivePrompts(context: RuntimeContext): boolean {\n return context.resolvedView === \"human\" && context.interactive;\n}\n","import { isCancel, select } from \"@clack/prompts\";\nimport {\n formatInlineOpenMeldCliCommands,\n formatOpenMeldCliCommand,\n} from \"../runtime/cli-entry-command\";\n\nexport const DAEMON_INSTALL_DECISION_CHOICE = {\n install: \"install\",\n notNow: \"not_now\",\n} as const;\n\nexport type DaemonInstallDecisionKind = \"missing\" | \"outdated\";\n\nexport type DaemonInstallDecisionChoice =\n | (typeof DAEMON_INSTALL_DECISION_CHOICE)[keyof typeof DAEMON_INSTALL_DECISION_CHOICE]\n | \"cancelled\";\n\ntype DaemonVersionInput = {\n installedVersion?: string;\n expectedVersion: string;\n};\n\ntype DaemonInstallDecisionPromptConfig = {\n message: string;\n initialValue: (typeof DAEMON_INSTALL_DECISION_CHOICE)[\"install\"];\n options: Array<{\n value:\n | (typeof DAEMON_INSTALL_DECISION_CHOICE)[\"install\"]\n | (typeof DAEMON_INSTALL_DECISION_CHOICE)[\"notNow\"];\n label: string;\n hint?: string;\n }>;\n};\n\nconst DAEMON_INSTALL_COMMAND = \"openmeld service install\";\nconst DAEMON_REPAIR_COMMAND = \"openmeld service repair\";\nconst DAEMON_UPGRADE_COMMAND = \"openmeld upgrade\";\nconst DAEMON_AUTO_INSTALL_ALWAYS_FLAG = \"`--service-auto-install always`\";\nconst DAEMON_DECISION_RECOMMENDED_HINT = \"Recommended\";\n\nconst DAEMON_INSTALL_DECISION_COPY = {\n missing: {\n question: \"OpenMeld Service is missing. Install it now?\",\n explanation: \"Without it, this computer can't receive local Wake work.\",\n primaryLabel: \"Yes, install it for me\",\n deferred:\n \"OpenMeld Service is still missing. Install it later with `openmeld service install` so this computer can receive local Wake work.\",\n failed:\n \"OpenMeld Service could not be installed. Run `openmeld service install` so this computer can receive local Wake work.\",\n },\n outdated: {\n question: \"OpenMeld Service update required. Update it now?\",\n explanation:\n \"This service artifact is not compatible with current local Wake execution.\",\n primaryLabel: \"Yes, update it for me\",\n deferred:\n \"OpenMeld Service update skipped. Run `openmeld service update` before using local Wake work.\",\n failed: \"OpenMeld Service was not updated. Run `openmeld service update`.\",\n },\n} as const satisfies Record<\n DaemonInstallDecisionKind,\n {\n question: string;\n explanation: string;\n primaryLabel: string;\n deferred: string;\n failed: string;\n }\n>;\n\nexport function buildDaemonInstallDecisionPromptConfig(input: {\n kind: DaemonInstallDecisionKind;\n installedVersion?: string;\n expectedVersion?: string;\n}): DaemonInstallDecisionPromptConfig {\n const copy = DAEMON_INSTALL_DECISION_COPY[input.kind];\n const detailLine =\n input.kind === \"outdated\" &&\n typeof input.installedVersion === \"string\" &&\n typeof input.expectedVersion === \"string\"\n ? `Installed v${input.installedVersion}, expected v${input.expectedVersion}.`\n : null;\n return {\n message: [copy.question, copy.explanation, detailLine]\n .filter((line) => typeof line === \"string\" && line.length > 0)\n .join(\"\\n\"),\n initialValue: DAEMON_INSTALL_DECISION_CHOICE.install,\n options: [\n {\n value: DAEMON_INSTALL_DECISION_CHOICE.install,\n label: copy.primaryLabel,\n hint: DAEMON_DECISION_RECOMMENDED_HINT,\n },\n {\n value: DAEMON_INSTALL_DECISION_CHOICE.notNow,\n label: \"Not now\",\n },\n ],\n };\n}\n\nexport async function promptForDaemonInstallDecision(input: {\n kind: DaemonInstallDecisionKind;\n installedVersion?: string;\n expectedVersion?: string;\n}): Promise<DaemonInstallDecisionChoice> {\n const choice = await select(buildDaemonInstallDecisionPromptConfig(input));\n if (isCancel(choice)) {\n return \"cancelled\";\n }\n return choice === DAEMON_INSTALL_DECISION_CHOICE.install\n ? DAEMON_INSTALL_DECISION_CHOICE.install\n : DAEMON_INSTALL_DECISION_CHOICE.notNow;\n}\n\nexport async function runDaemonInstallDecisionPrompt(input: {\n kind: DaemonInstallDecisionKind;\n installedVersion?: string;\n expectedVersion?: string;\n emitLine: (text: string) => Promise<void> | void;\n installService: () => Promise<void>;\n}): Promise<\"install\" | \"not_now\" | \"cancelled\" | \"failed\"> {\n const decision = await promptForDaemonInstallDecision({\n kind: input.kind,\n installedVersion: input.installedVersion,\n expectedVersion: input.expectedVersion,\n });\n if (decision === DAEMON_INSTALL_DECISION_CHOICE.install) {\n try {\n await input.installService();\n return \"install\";\n } catch {\n await input.emitLine(formatDaemonInstallFailedMessage(input.kind));\n return \"failed\";\n }\n }\n\n if (decision === \"cancelled\") {\n return \"cancelled\";\n }\n\n await input.emitLine(formatDaemonInstallDeferredMessage(input.kind));\n return decision;\n}\n\nexport function formatDaemonInstallDeferredMessage(\n kind: DaemonInstallDecisionKind\n): string {\n return formatInlineOpenMeldCliCommands(\n DAEMON_INSTALL_DECISION_COPY[kind].deferred\n );\n}\n\nexport function formatDaemonInstallFailedMessage(\n kind: DaemonInstallDecisionKind\n): string {\n return formatInlineOpenMeldCliCommands(\n DAEMON_INSTALL_DECISION_COPY[kind].failed\n );\n}\n\nexport function formatDaemonServiceMissingRecommendation(): string {\n return \"OpenMeld Service is not installed yet. Install it so this computer can receive local Wake work.\";\n}\n\nexport function formatDaemonServiceInstallRecommendationNextStep(): string {\n return `Run \\`${formatOpenMeldCliCommand(DAEMON_INSTALL_COMMAND)}\\` now, or re-run command with ${DAEMON_AUTO_INSTALL_ALWAYS_FLAG}.`;\n}\n\nexport function formatDaemonServiceMissingStatus(): string {\n return \"Not installed yet.\";\n}\n\nexport function formatDaemonServiceMissingMeaning(): string {\n return \"Missing — install OpenMeld Service before this computer can receive local Wake work.\";\n}\n\nexport function formatDaemonServiceMissingAction(): string {\n return `Run \\`${formatOpenMeldCliCommand(DAEMON_INSTALL_COMMAND)}\\` to set it up.`;\n}\n\nexport function formatDaemonServiceMissingRunStepOne(): string {\n return `\\`${formatOpenMeldCliCommand(DAEMON_INSTALL_COMMAND)}\\``;\n}\n\nexport function formatDaemonServiceMissingRunStepTwo(): string {\n return `\\`${formatOpenMeldCliCommand(\"openmeld service start\")}\\``;\n}\n\nexport function formatDaemonServiceOutdatedRecommendation(\n input: DaemonVersionInput\n): string {\n const installedVersion = input.installedVersion ?? \"unknown\";\n return `OpenMeld Service version differs from this CLI (installed v${installedVersion}, CLI v${input.expectedVersion}). This is diagnostic unless service compatibility fails.`;\n}\n\nexport function formatDaemonServiceOutdatedStatus(\n input: DaemonVersionInput\n): string {\n const installedVersion = input.installedVersion ?? \"unknown\";\n return `Version differs from this CLI (installed v${installedVersion}, CLI v${input.expectedVersion}).`;\n}\n\nexport function formatDaemonServiceDowngradeBlockedRecommendation(\n input: DaemonVersionInput\n): string {\n if (input.installedVersion) {\n return `OpenMeld Service is already newer (installed v${input.installedVersion}, current CLI v${input.expectedVersion}). OpenMeld will not downgrade it automatically. Run \\`${formatOpenMeldCliCommand(DAEMON_UPGRADE_COMMAND)}\\`.`;\n }\n return `OpenMeld Service is already newer than this CLI. OpenMeld will not downgrade it automatically. Run \\`${formatOpenMeldCliCommand(DAEMON_UPGRADE_COMMAND)}\\`.`;\n}\n\nexport function getDaemonDowngradeBlockedTitle(): string {\n return \"⛔ OpenMeld Service Downgrade Blocked\";\n}\n\nexport function formatDaemonDowngradeBlockedNextStep(): string {\n return `Run \\`${formatOpenMeldCliCommand(DAEMON_UPGRADE_COMMAND)}\\`.`;\n}\n\nexport function formatDaemonStartupRepairNotice(): string {\n return `Run \\`${formatOpenMeldCliCommand(DAEMON_REPAIR_COMMAND)}\\` to repair it now.`;\n}\n","export const MIN_VISIBLE_ELAPSED_TIME_MS = 100;\n\nexport function resolveElapsedTimeMs(\n startedAtMs: number,\n currentTimeMs = Date.now()\n): number {\n return Math.max(0, currentTimeMs - startedAtMs);\n}\n\nexport function formatElapsedTime(durationMs: number): string {\n const seconds = durationMs / 1000;\n return seconds < 10 ? `${seconds.toFixed(1)}s` : `${Math.round(seconds)}s`;\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"elapsed-time-CzR72jgL.js","names":[],"sources":["../src/runtime/interaction.ts","../src/system/local-service-install-attention.ts","../src/ui/elapsed-time.ts"],"sourcesContent":["import type { RuntimeContext } from \"./types\";\n\nexport function canUseInteractivePrompts(context: RuntimeContext): boolean {\n return context.resolvedView === \"human\" && context.interactive;\n}\n","import { isCancel, select } from \"@clack/prompts\";\nimport {\n formatInlineOpenMeldCliCommands,\n formatOpenMeldCliCommand,\n} from \"../runtime/cli-entry-command\";\n\nexport const DAEMON_INSTALL_DECISION_CHOICE = {\n install: \"install\",\n notNow: \"not_now\",\n} as const;\n\nexport type DaemonInstallDecisionKind = \"missing\" | \"outdated\";\n\nexport type DaemonInstallDecisionChoice =\n | (typeof DAEMON_INSTALL_DECISION_CHOICE)[keyof typeof DAEMON_INSTALL_DECISION_CHOICE]\n | \"cancelled\";\n\ntype DaemonVersionInput = {\n installedVersion?: string;\n expectedVersion: string;\n};\n\ntype DaemonInstallDecisionPromptConfig = {\n message: string;\n initialValue: (typeof DAEMON_INSTALL_DECISION_CHOICE)[\"install\"];\n options: Array<{\n value:\n | (typeof DAEMON_INSTALL_DECISION_CHOICE)[\"install\"]\n | (typeof DAEMON_INSTALL_DECISION_CHOICE)[\"notNow\"];\n label: string;\n hint?: string;\n }>;\n};\n\nconst DAEMON_INSTALL_COMMAND = \"openmeld service install\";\nconst DAEMON_REPAIR_COMMAND = \"openmeld service repair\";\nconst DAEMON_UPGRADE_COMMAND = \"openmeld upgrade\";\nconst DAEMON_AUTO_INSTALL_ALWAYS_FLAG = \"`--service-auto-install always`\";\nconst DAEMON_DECISION_RECOMMENDED_HINT = \"Recommended\";\n\nconst DAEMON_INSTALL_DECISION_COPY = {\n missing: {\n question: \"OpenMeld Service is missing. Install it now?\",\n explanation: \"Without it, this computer can't receive local Wake work.\",\n primaryLabel: \"Yes, install it for me\",\n deferred:\n \"OpenMeld Service is still missing. Install it later with `openmeld service install` so this computer can receive local Wake work.\",\n failed:\n \"OpenMeld Service could not be installed. Run `openmeld service install` so this computer can receive local Wake work.\",\n },\n outdated: {\n question: \"OpenMeld Service update required. Update it now?\",\n explanation:\n \"This service artifact is not compatible with current local Wake execution.\",\n primaryLabel: \"Yes, update it for me\",\n deferred:\n \"OpenMeld Service update skipped. Run `openmeld service update` before using local Wake work.\",\n failed: \"OpenMeld Service was not updated. Run `openmeld service update`.\",\n },\n} as const satisfies Record<\n DaemonInstallDecisionKind,\n {\n question: string;\n explanation: string;\n primaryLabel: string;\n deferred: string;\n failed: string;\n }\n>;\n\nexport function buildDaemonInstallDecisionPromptConfig(input: {\n kind: DaemonInstallDecisionKind;\n installedVersion?: string;\n expectedVersion?: string;\n}): DaemonInstallDecisionPromptConfig {\n const copy = DAEMON_INSTALL_DECISION_COPY[input.kind];\n const detailLine =\n input.kind === \"outdated\" &&\n typeof input.installedVersion === \"string\" &&\n typeof input.expectedVersion === \"string\"\n ? `Installed v${input.installedVersion}, expected v${input.expectedVersion}.`\n : null;\n return {\n message: [copy.question, copy.explanation, detailLine]\n .filter((line) => typeof line === \"string\" && line.length > 0)\n .join(\"\\n\"),\n initialValue: DAEMON_INSTALL_DECISION_CHOICE.install,\n options: [\n {\n value: DAEMON_INSTALL_DECISION_CHOICE.install,\n label: copy.primaryLabel,\n hint: DAEMON_DECISION_RECOMMENDED_HINT,\n },\n {\n value: DAEMON_INSTALL_DECISION_CHOICE.notNow,\n label: \"Not now\",\n },\n ],\n };\n}\n\nexport async function promptForDaemonInstallDecision(input: {\n kind: DaemonInstallDecisionKind;\n installedVersion?: string;\n expectedVersion?: string;\n}): Promise<DaemonInstallDecisionChoice> {\n const choice = await select(buildDaemonInstallDecisionPromptConfig(input));\n if (isCancel(choice)) {\n return \"cancelled\";\n }\n return choice === DAEMON_INSTALL_DECISION_CHOICE.install\n ? DAEMON_INSTALL_DECISION_CHOICE.install\n : DAEMON_INSTALL_DECISION_CHOICE.notNow;\n}\n\nexport async function runDaemonInstallDecisionPrompt(input: {\n kind: DaemonInstallDecisionKind;\n installedVersion?: string;\n expectedVersion?: string;\n emitLine: (text: string) => Promise<void> | void;\n installService: () => Promise<void>;\n}): Promise<\"install\" | \"not_now\" | \"cancelled\" | \"failed\"> {\n const decision = await promptForDaemonInstallDecision({\n kind: input.kind,\n installedVersion: input.installedVersion,\n expectedVersion: input.expectedVersion,\n });\n if (decision === DAEMON_INSTALL_DECISION_CHOICE.install) {\n try {\n await input.installService();\n return \"install\";\n } catch {\n await input.emitLine(formatDaemonInstallFailedMessage(input.kind));\n return \"failed\";\n }\n }\n\n if (decision === \"cancelled\") {\n return \"cancelled\";\n }\n\n await input.emitLine(formatDaemonInstallDeferredMessage(input.kind));\n return decision;\n}\n\nexport function formatDaemonInstallDeferredMessage(\n kind: DaemonInstallDecisionKind\n): string {\n return formatInlineOpenMeldCliCommands(\n DAEMON_INSTALL_DECISION_COPY[kind].deferred\n );\n}\n\nexport function formatDaemonInstallFailedMessage(\n kind: DaemonInstallDecisionKind\n): string {\n return formatInlineOpenMeldCliCommands(\n DAEMON_INSTALL_DECISION_COPY[kind].failed\n );\n}\n\nexport function formatDaemonServiceMissingRecommendation(): string {\n return \"OpenMeld Service is not installed yet. Install it so this computer can receive local Wake work.\";\n}\n\nexport function formatDaemonServiceInstallRecommendationNextStep(): string {\n return `Run \\`${formatOpenMeldCliCommand(DAEMON_INSTALL_COMMAND)}\\` now, or re-run command with ${DAEMON_AUTO_INSTALL_ALWAYS_FLAG}.`;\n}\n\nexport function formatDaemonServiceMissingStatus(): string {\n return \"Not installed yet.\";\n}\n\nexport function formatDaemonServiceMissingMeaning(): string {\n return \"Missing — install OpenMeld Service before this computer can receive local Wake work.\";\n}\n\nexport function formatDaemonServiceMissingAction(): string {\n return `Run \\`${formatOpenMeldCliCommand(DAEMON_INSTALL_COMMAND)}\\` to set it up.`;\n}\n\nexport function formatDaemonServiceMissingRunStepOne(): string {\n return `\\`${formatOpenMeldCliCommand(DAEMON_INSTALL_COMMAND)}\\``;\n}\n\nexport function formatDaemonServiceMissingRunStepTwo(): string {\n return `\\`${formatOpenMeldCliCommand(\"openmeld service start\")}\\``;\n}\n\nexport function formatDaemonServiceOutdatedRecommendation(\n input: DaemonVersionInput\n): string {\n const installedVersion = input.installedVersion ?? \"unknown\";\n return `OpenMeld Service version differs from this CLI (installed v${installedVersion}, CLI v${input.expectedVersion}). This is diagnostic unless service compatibility fails.`;\n}\n\nexport function formatDaemonServiceOutdatedStatus(\n input: DaemonVersionInput\n): string {\n const installedVersion = input.installedVersion ?? \"unknown\";\n return `Version differs from this CLI (installed v${installedVersion}, CLI v${input.expectedVersion}).`;\n}\n\nexport function formatDaemonServiceDowngradeBlockedRecommendation(\n input: DaemonVersionInput\n): string {\n if (input.installedVersion) {\n return `OpenMeld Service is already newer (installed v${input.installedVersion}, current CLI v${input.expectedVersion}). OpenMeld will not downgrade it automatically. Run \\`${formatOpenMeldCliCommand(DAEMON_UPGRADE_COMMAND)}\\`.`;\n }\n return `OpenMeld Service is already newer than this CLI. OpenMeld will not downgrade it automatically. Run \\`${formatOpenMeldCliCommand(DAEMON_UPGRADE_COMMAND)}\\`.`;\n}\n\nexport function getDaemonDowngradeBlockedTitle(): string {\n return \"⛔ OpenMeld Service Downgrade Blocked\";\n}\n\nexport function formatDaemonDowngradeBlockedNextStep(): string {\n return `Run \\`${formatOpenMeldCliCommand(DAEMON_UPGRADE_COMMAND)}\\`.`;\n}\n\nexport function formatDaemonStartupRepairNotice(): string {\n return `Run \\`${formatOpenMeldCliCommand(DAEMON_REPAIR_COMMAND)}\\` to repair it now.`;\n}\n","export const MIN_VISIBLE_ELAPSED_TIME_MS = 100;\n\nexport function resolveElapsedTimeMs(\n startedAtMs: number,\n currentTimeMs = Date.now()\n): number {\n return Math.max(0, currentTimeMs - startedAtMs);\n}\n\nexport function formatElapsedTime(durationMs: number): string {\n const seconds = durationMs / 1000;\n return seconds < 10 ? `${seconds.toFixed(1)}s` : `${Math.round(seconds)}s`;\n}\n"],"mappings":"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"}
|
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
|
|
3
|
-
import { a as resolveBaseUrl } from "./base-url-
|
|
3
|
+
import { a as resolveBaseUrl } from "./base-url-DuppOOaB.js";
|
|
4
4
|
import { F as resolveOpenMeldRootDir, U as systemDir } from "./paths-De9xdA2h.js";
|
|
5
|
-
import { n as ensureDaemonRuntimePaths } from "./daemon-device-id-
|
|
6
|
-
import { d as serviceExecutionHostOwnerSchema, r as serveExecutionHost, t as ExecutionHostError, u as serviceExecutionHostMethods } from "./channel-
|
|
7
|
-
import { E as withAdmittedServiceSession, d as getAuthSessionState, o as buildStoredAuthSessionIdentity } from "./auth-session-
|
|
8
|
-
import {
|
|
5
|
+
import { _ as toErrorMessage, n as ensureDaemonRuntimePaths, v as warnDaemonEvent } from "./daemon-device-id-CGV19VtH.js";
|
|
6
|
+
import { d as serviceExecutionHostOwnerSchema, r as serveExecutionHost, t as ExecutionHostError, u as serviceExecutionHostMethods } from "./channel-DFsCrkPT.js";
|
|
7
|
+
import { E as withAdmittedServiceSession, d as getAuthSessionState, o as buildStoredAuthSessionIdentity } from "./auth-session-B2lS_bSW.js";
|
|
8
|
+
import { a as isOpenMeldLockError, c as releaseLock, n as acquireLock, t as MALFORMED_LOCK_RECOVERY_GRACE_MS } from "./lock-B0YzvcUu.js";
|
|
9
9
|
import { i as readProcessStartIdentity, r as isProcessIdentityAlive, t as CURRENT_PROCESS_START_IDENTITY } from "./process-identity-DsKKbftl.js";
|
|
10
|
-
import { n as resolveRuntimeContext } from "./context-
|
|
11
|
-
import { t as createPresenter } from "./presenter-
|
|
12
|
-
import { i as readDaemonServiceContract } from "./daemon-service-contract-
|
|
13
|
-
import { n as parentExecutionHostChannel } from "./process-channel-
|
|
10
|
+
import { n as resolveRuntimeContext } from "./context-C6GiteNY.js";
|
|
11
|
+
import { t as createPresenter } from "./presenter-CfWGbWdq.js";
|
|
12
|
+
import { i as readDaemonServiceContract } from "./daemon-service-contract-D8osKBM6.js";
|
|
13
|
+
import { n as parentExecutionHostChannel } from "./process-channel-AjxeujN8.js";
|
|
14
14
|
import { randomUUID } from "node:crypto";
|
|
15
15
|
import { dirname, join, resolve } from "node:path";
|
|
16
|
-
import { readFile } from "node:fs/promises";
|
|
16
|
+
import { lstat, readFile } from "node:fs/promises";
|
|
17
17
|
import { z } from "zod/v4";
|
|
18
18
|
import { mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
|
|
19
19
|
import { execFile } from "node:child_process";
|
|
@@ -38,6 +38,9 @@ async function validateExecutionHostIdentity(identity) {
|
|
|
38
38
|
const run = promisify(execFile);
|
|
39
39
|
const WINDOWS_BOOT_EVENT = /^\d+:\d+$/;
|
|
40
40
|
const DECIMAL = /^\d+$/;
|
|
41
|
+
function isTaskEvidenceComplete(task) {
|
|
42
|
+
return task.activeInvocations > 0 ? task.unrecordedLaunches === 0 : task.completedInvocation;
|
|
43
|
+
}
|
|
41
44
|
async function readExecutionHostBootIdentity() {
|
|
42
45
|
try {
|
|
43
46
|
return await readBootIdentity();
|
|
@@ -83,23 +86,12 @@ function confirmsNewBoot(previous, current) {
|
|
|
83
86
|
return BigInt(id) > BigInt(priorId) && BigInt(time) > BigInt(priorTime);
|
|
84
87
|
}
|
|
85
88
|
async function acquireExecutionHostOwnership(input) {
|
|
86
|
-
const lock = await
|
|
87
|
-
openMeldProfileId: "service-execution-host",
|
|
88
|
-
key: "process-owner",
|
|
89
|
-
pathResolution: { env: {
|
|
90
|
-
...process.env,
|
|
91
|
-
OPENMELD_HOME: input.stateRoot
|
|
92
|
-
} },
|
|
93
|
-
meta: {
|
|
94
|
-
hostInstanceId: input.hostInstanceId,
|
|
95
|
-
ownerUserId: input.ownerUserId
|
|
96
|
-
}
|
|
97
|
-
});
|
|
89
|
+
const lock = await acquireProcessOwnerLock(input);
|
|
98
90
|
const path = join(systemDir({ env: { OPENMELD_HOME: input.stateRoot } }), "execution-host-owner.json");
|
|
99
91
|
try {
|
|
100
92
|
const previous = readOwner(path);
|
|
101
|
-
if (previous && !previous.localQuiescent && !confirmsNewBoot(previous.bootIdentity, input.bootIdentity)
|
|
102
|
-
let owner =
|
|
93
|
+
if (previous && !previous.localQuiescent && !confirmsNewBoot(previous.bootIdentity, input.bootIdentity)) assertPreviousOwnerReplaceableOnSameBoot(previous);
|
|
94
|
+
let owner = {
|
|
103
95
|
schema: "service-execution-host-owner-v2",
|
|
104
96
|
hostInstanceId: input.hostInstanceId,
|
|
105
97
|
ownerUserId: input.ownerUserId,
|
|
@@ -111,67 +103,109 @@ async function acquireExecutionHostOwnership(input) {
|
|
|
111
103
|
localQuiescent: true,
|
|
112
104
|
processEvidenceComplete: true,
|
|
113
105
|
ownedProcessTrees: []
|
|
114
|
-
}
|
|
106
|
+
};
|
|
107
|
+
serviceExecutionHostOwnerSchema.parse(owner);
|
|
115
108
|
persist(owner);
|
|
116
109
|
function persist(next) {
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
110
|
+
try {
|
|
111
|
+
mkdirSync(dirname(path), {
|
|
112
|
+
recursive: true,
|
|
113
|
+
mode: 448
|
|
114
|
+
});
|
|
115
|
+
const temporary = `${path}.${randomUUID()}.tmp`;
|
|
116
|
+
writeFileSync(temporary, JSON.stringify(next), {
|
|
117
|
+
mode: 384,
|
|
118
|
+
flag: "wx"
|
|
119
|
+
});
|
|
120
|
+
renameSync(temporary, path);
|
|
121
|
+
} catch (error) {
|
|
122
|
+
warnDaemonEvent("[openmeld.execution_host.receipt_write_failed]", {
|
|
123
|
+
event: "cli.execution_host.receipt_write_failed",
|
|
124
|
+
detail: toErrorMessage(error)
|
|
125
|
+
});
|
|
126
|
+
throw new ExecutionHostError("host.execution_record_unavailable", "The local execution host could not write its ownership record.");
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
function update(changes) {
|
|
130
|
+
const merged = {
|
|
131
|
+
...owner,
|
|
132
|
+
...changes
|
|
133
|
+
};
|
|
134
|
+
const next = {
|
|
135
|
+
...merged,
|
|
136
|
+
schema: merged.localQuiescent ? "service-execution-host-owner-v2" : "service-execution-host-owner-v3"
|
|
137
|
+
};
|
|
138
|
+
if (JSON.stringify(next) === JSON.stringify(owner)) return;
|
|
139
|
+
persist(next);
|
|
140
|
+
owner = next;
|
|
127
141
|
}
|
|
142
|
+
const tasks = /* @__PURE__ */ new Map();
|
|
143
|
+
let unattributedWork = false;
|
|
144
|
+
const evidenceComplete = () => !unattributedWork && [...tasks.values()].every(isTaskEvidenceComplete);
|
|
128
145
|
return {
|
|
129
|
-
|
|
130
|
-
if (
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
146
|
+
observeWork(state) {
|
|
147
|
+
if (state.localQuiescent) {
|
|
148
|
+
tasks.clear();
|
|
149
|
+
unattributedWork = false;
|
|
150
|
+
const liveTrees = owner.ownedProcessTrees.filter(isOwnedProcessTreeAlive);
|
|
151
|
+
update({
|
|
152
|
+
localQuiescent: liveTrees.length === 0,
|
|
153
|
+
processEvidenceComplete: true,
|
|
154
|
+
ownedProcessTrees: liveTrees
|
|
155
|
+
});
|
|
156
|
+
return;
|
|
157
|
+
}
|
|
158
|
+
const running = new Set(state.runningTaskIds);
|
|
159
|
+
for (const taskId of tasks.keys()) if (!running.has(taskId)) tasks.delete(taskId);
|
|
160
|
+
for (const taskId of running) if (!tasks.has(taskId)) tasks.set(taskId, {
|
|
161
|
+
activeInvocations: 0,
|
|
162
|
+
unrecordedLaunches: 0,
|
|
163
|
+
completedInvocation: false
|
|
164
|
+
});
|
|
165
|
+
unattributedWork = state.unattributedWork;
|
|
166
|
+
update({
|
|
167
|
+
localQuiescent: false,
|
|
168
|
+
processEvidenceComplete: evidenceComplete()
|
|
169
|
+
});
|
|
170
|
+
},
|
|
171
|
+
observeProviderInvocation(event) {
|
|
172
|
+
const task = tasks.get(event.taskId);
|
|
173
|
+
if (!task) return;
|
|
174
|
+
if (event.phase === "started") {
|
|
175
|
+
task.activeInvocations += 1;
|
|
176
|
+
task.unrecordedLaunches += 1;
|
|
177
|
+
} else {
|
|
178
|
+
task.activeInvocations = Math.max(0, task.activeInvocations - 1);
|
|
179
|
+
if (task.activeInvocations === 0) {
|
|
180
|
+
task.unrecordedLaunches = 0;
|
|
181
|
+
task.completedInvocation = true;
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
update({ processEvidenceComplete: evidenceComplete() });
|
|
141
185
|
},
|
|
142
186
|
observeOwnedProcess(event) {
|
|
143
|
-
|
|
187
|
+
const task = tasks.get(event.taskId);
|
|
144
188
|
if (event.phase === "process_spawned") {
|
|
145
|
-
if (event.processId === null)
|
|
146
|
-
const next = {
|
|
147
|
-
...owner,
|
|
148
|
-
processEvidenceComplete: false
|
|
149
|
-
};
|
|
150
|
-
persist(next);
|
|
151
|
-
owner = next;
|
|
152
|
-
return;
|
|
153
|
-
}
|
|
189
|
+
if (event.processId === null) return;
|
|
154
190
|
const processStartedAt = readProcessStartIdentity(event.processId) ?? `fallback:${event.processId}:unknown`;
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
191
|
+
if (task && task.activeInvocations > 0) task.unrecordedLaunches = Math.max(0, task.unrecordedLaunches - 1);
|
|
192
|
+
update({
|
|
193
|
+
localQuiescent: false,
|
|
194
|
+
processEvidenceComplete: evidenceComplete(),
|
|
158
195
|
ownedProcessTrees: [...owner.ownedProcessTrees.filter((process) => process.pid !== event.processId), {
|
|
159
196
|
pid: event.processId,
|
|
160
197
|
processStartedAt,
|
|
161
198
|
signalTarget: event.signalTarget
|
|
162
199
|
}]
|
|
163
|
-
};
|
|
164
|
-
persist(next);
|
|
165
|
-
owner = next;
|
|
200
|
+
});
|
|
166
201
|
return;
|
|
167
202
|
}
|
|
168
203
|
if (event.processId === null) return;
|
|
169
|
-
|
|
170
|
-
|
|
204
|
+
if (task && task.activeInvocations > 0) task.unrecordedLaunches += 1;
|
|
205
|
+
update({
|
|
206
|
+
processEvidenceComplete: evidenceComplete(),
|
|
171
207
|
ownedProcessTrees: owner.ownedProcessTrees.filter((process) => process.pid !== event.processId || isOwnedProcessTreeAlive(process))
|
|
172
|
-
};
|
|
173
|
-
persist(next);
|
|
174
|
-
owner = next;
|
|
208
|
+
});
|
|
175
209
|
},
|
|
176
210
|
release: () => releaseLock(lock)
|
|
177
211
|
};
|
|
@@ -180,12 +214,41 @@ async function acquireExecutionHostOwnership(input) {
|
|
|
180
214
|
throw error;
|
|
181
215
|
}
|
|
182
216
|
}
|
|
183
|
-
function
|
|
184
|
-
|
|
217
|
+
async function acquireProcessOwnerLock(input) {
|
|
218
|
+
try {
|
|
219
|
+
return await acquireLock({
|
|
220
|
+
openMeldProfileId: "service-execution-host",
|
|
221
|
+
key: "process-owner",
|
|
222
|
+
pathResolution: { env: {
|
|
223
|
+
...process.env,
|
|
224
|
+
OPENMELD_HOME: input.stateRoot
|
|
225
|
+
} },
|
|
226
|
+
meta: {
|
|
227
|
+
hostInstanceId: input.hostInstanceId,
|
|
228
|
+
ownerUserId: input.ownerUserId
|
|
229
|
+
}
|
|
230
|
+
});
|
|
231
|
+
} catch (error) {
|
|
232
|
+
if (!(isOpenMeldLockError(error) && error.contentionState === "active")) throw error;
|
|
233
|
+
if (typeof error.meta?.pid === "number") throw new ExecutionHostError("host.previous_work_running", "Another execution host for this installation is still running. This Host starts after it exits; no task will be restarted automatically.");
|
|
234
|
+
if (await isOwnerLockHandoffPossible(error.lockPath)) throw new ExecutionHostError("host.previous_work_running", "Another execution host for this installation is starting or stopping. This Host checks again shortly; no task will be restarted automatically.");
|
|
235
|
+
throw new ExecutionHostError("host.owner_lock_unverified", "The execution host lock for this installation has no identifiable owner. Preserve it for diagnostics; automatic replacement is refused.");
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
async function isOwnerLockHandoffPossible(lockPath) {
|
|
239
|
+
try {
|
|
240
|
+
const stats = await lstat(lockPath);
|
|
241
|
+
return Date.now() - stats.mtimeMs < MALFORMED_LOCK_RECOVERY_GRACE_MS;
|
|
242
|
+
} catch (error) {
|
|
243
|
+
return isNodeError(error, "ENOENT");
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
function assertPreviousOwnerReplaceableOnSameBoot(previous) {
|
|
247
|
+
if (previous.schema !== "service-execution-host-owner-v3" || !previous.processEvidenceComplete) throw new ExecutionHostError("host.previous_work_unconfirmed", "The previous execution host ended before its local work was confirmed stopped. Restart this Computer, then check its connection. If restart evidence is unavailable, inspect the retained Host diagnostics before recovery. Existing results remain saved; no task will be restarted automatically.");
|
|
248
|
+
if (isProcessIdentityAlive({
|
|
185
249
|
ownerPid: previous.pid,
|
|
186
250
|
ownerProcessStartedAt: previous.processStartedAt
|
|
187
|
-
}))
|
|
188
|
-
return previous.ownedProcessTrees.every((process) => !isOwnedProcessTreeAlive(process));
|
|
251
|
+
}) || previous.ownedProcessTrees.some(isOwnedProcessTreeAlive)) throw new ExecutionHostError("host.previous_work_running", "Local agent work recorded by the previous execution host is still running. This Host starts after that work exits; no task will be restarted automatically.");
|
|
189
252
|
}
|
|
190
253
|
function isOwnedProcessTreeAlive(input) {
|
|
191
254
|
if (input.signalTarget === "process_group" && process.platform !== "win32") try {
|
|
@@ -207,12 +270,14 @@ function readOwner(path) {
|
|
|
207
270
|
try {
|
|
208
271
|
raw = readFileSync(path, "utf8");
|
|
209
272
|
} catch (error) {
|
|
210
|
-
if (error
|
|
211
|
-
throw error;
|
|
273
|
+
if (isNodeError(error, "ENOENT")) return null;
|
|
274
|
+
throw new ExecutionHostError("host.owner_corrupt", `The Host ownership record cannot be read (${error instanceof Error ? error.message : String(error)}). Preserve it for diagnostics; automatic replacement is refused.`);
|
|
212
275
|
}
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
276
|
+
try {
|
|
277
|
+
const parsed = serviceExecutionHostOwnerSchema.safeParse(JSON.parse(raw));
|
|
278
|
+
if (parsed.success) return parsed.data;
|
|
279
|
+
} catch {}
|
|
280
|
+
throw new ExecutionHostError("host.owner_corrupt", "The Host ownership record cannot be verified. Preserve it for diagnostics; automatic replacement is refused.");
|
|
216
281
|
}
|
|
217
282
|
//#endregion
|
|
218
283
|
//#region src/local-service/execution-host/entry.ts
|
|
@@ -249,7 +314,7 @@ function runExecutionHost(hostInstanceId) {
|
|
|
249
314
|
if (acceptedIdentity && JSON.stringify(acceptedIdentity) !== JSON.stringify(identity)) throw new ExecutionHostError("host.identity_mismatch", "This Host is already assigned to a different Service incarnation.");
|
|
250
315
|
if (!initializing) {
|
|
251
316
|
acceptedIdentity = identity;
|
|
252
|
-
|
|
317
|
+
const attempt = (async () => {
|
|
253
318
|
const verified = await validateExecutionHostIdentity(identity);
|
|
254
319
|
if (disconnected) throw new ExecutionHostError("host.disconnected", "The supervising Service left before Host initialization.");
|
|
255
320
|
const verifiedOwnership = await acquireExecutionHostOwnership({
|
|
@@ -260,14 +325,15 @@ function runExecutionHost(hostInstanceId) {
|
|
|
260
325
|
ownership = verifiedOwnership;
|
|
261
326
|
session = verified.session;
|
|
262
327
|
await withAdmittedServiceSession(session, async () => {
|
|
263
|
-
const { createExecutionHostRuntime, createExecutionHostResources } = await import("./runtime-
|
|
328
|
+
const { createExecutionHostRuntime, createExecutionHostResources } = await import("./runtime-DVaIwyJM.js");
|
|
264
329
|
const runtimePaths = await ensureDaemonRuntimePaths();
|
|
265
330
|
const presenter = createPresenter(await resolveRuntimeContext({ view: "agent" }));
|
|
266
331
|
runtime = await createExecutionHostRuntime({
|
|
267
332
|
resources: await createExecutionHostResources({
|
|
268
333
|
runtimePaths,
|
|
269
334
|
presenter,
|
|
270
|
-
observeOwnedProcess: (event) => verifiedOwnership.observeOwnedProcess(event)
|
|
335
|
+
observeOwnedProcess: (event) => verifiedOwnership.observeOwnedProcess(event),
|
|
336
|
+
observeProviderInvocation: (event) => verifiedOwnership.observeProviderInvocation(event)
|
|
271
337
|
}),
|
|
272
338
|
hostInstanceId,
|
|
273
339
|
identity,
|
|
@@ -278,10 +344,14 @@ function runExecutionHost(hostInstanceId) {
|
|
|
278
344
|
emit: (event) => {
|
|
279
345
|
if (!disconnected) server.emit(event);
|
|
280
346
|
},
|
|
281
|
-
onWorkStateChange: (
|
|
347
|
+
onWorkStateChange: (state) => verifiedOwnership.observeWork(state)
|
|
282
348
|
});
|
|
283
349
|
});
|
|
284
350
|
})();
|
|
351
|
+
initializing = attempt;
|
|
352
|
+
attempt.catch((error) => {
|
|
353
|
+
if (initializing === attempt && error instanceof ExecutionHostError && error.code === "host.previous_work_running") initializing = null;
|
|
354
|
+
});
|
|
285
355
|
}
|
|
286
356
|
await initializing;
|
|
287
357
|
if (!runtime || disconnected) throw new ExecutionHostError("host.disconnected", "The execution Host is not available.");
|
|
@@ -315,4 +385,4 @@ function runExecutionHost(hostInstanceId) {
|
|
|
315
385
|
//#endregion
|
|
316
386
|
export { runExecutionHost };
|
|
317
387
|
|
|
318
|
-
//# sourceMappingURL=entry-
|
|
388
|
+
//# sourceMappingURL=entry-hCEOH64N.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"entry-hCEOH64N.js","names":[],"sources":["../src/local-service/execution-host/identity.ts","../src/local-service/execution-host/ownership.ts","../src/local-service/execution-host/entry.ts"],"sourcesContent":["import { resolve } from \"node:path\";\nimport type { ServiceExecutionHostIdentity } from \"@openmeld/schemas\";\nimport {\n buildStoredAuthSessionIdentity,\n getAuthSessionState,\n} from \"../../config/auth-session\";\nimport { resolveBaseUrl } from \"../../config/base-url\";\nimport { readDaemonServiceContract } from \"../../config/daemon-service-contract\";\nimport { resolveOpenMeldRootDir } from \"../../config/paths\";\nimport { readProcessStartIdentity } from \"../../system/process-identity\";\nimport { ExecutionHostError } from \"./channel\";\n\nexport async function validateExecutionHostIdentity(\n identity: ServiceExecutionHostIdentity\n) {\n if (\n process.ppid !== identity.parentPid ||\n (process.platform !== \"win32\" &&\n readProcessStartIdentity(process.ppid) !==\n identity.parentProcessStartedAt) ||\n resolve(resolveOpenMeldRootDir()) !== resolve(identity.stateRoot)\n ) {\n throw new ExecutionHostError(\n \"host.identity_mismatch\",\n \"The Host's parent or installation changed.\"\n );\n }\n const [auth, contract, gateway] = await Promise.all([\n getAuthSessionState(),\n readDaemonServiceContract(),\n resolveBaseUrl(),\n ]);\n const session = auth.session;\n if (\n auth.state !== \"valid\" ||\n !session ||\n !contract ||\n session.user?.id !== identity.ownerUserId ||\n buildStoredAuthSessionIdentity(session) !== identity.sessionIdentity ||\n session.authBaseUrl !== identity.authBaseUrl ||\n gateway !== identity.gatewayBaseUrl ||\n contract.gatewayUrl !== identity.gatewayBaseUrl ||\n contract.ownerUserId !== identity.ownerUserId ||\n contract.deviceId !== identity.deviceId ||\n contract.lane !== identity.lane ||\n contract.generation !== identity.serviceContractGeneration\n ) {\n throw new ExecutionHostError(\n \"host.identity_mismatch\",\n \"The Host's account, device or Service generation changed.\"\n );\n }\n return { session, contract };\n}\n","import { execFile } from \"node:child_process\";\nimport { randomUUID } from \"node:crypto\";\nimport { mkdirSync, readFileSync, renameSync, writeFileSync } from \"node:fs\";\nimport { lstat, readFile } from \"node:fs/promises\";\nimport { dirname, join } from \"node:path\";\nimport { promisify } from \"node:util\";\nimport { serviceExecutionHostOwnerSchema } from \"@openmeld/schemas\";\nimport { z } from \"zod/v4\";\nimport {\n acquireLock,\n isOpenMeldLockError,\n MALFORMED_LOCK_RECOVERY_GRACE_MS,\n releaseLock,\n} from \"../../config/lock\";\nimport { systemDir } from \"../../config/paths\";\nimport {\n CURRENT_PROCESS_START_IDENTITY,\n isProcessIdentityAlive,\n readProcessStartIdentity,\n} from \"../../system/process-identity\";\nimport { toErrorMessage, warnDaemonEvent } from \"../core/logger\";\nimport { ExecutionHostError } from \"./channel\";\n\nconst run = promisify(execFile);\nconst WINDOWS_BOOT_EVENT = /^\\d+:\\d+$/;\nconst DECIMAL = /^\\d+$/;\n\ntype OwnedProcessEvent = {\n phase: \"process_exit\" | \"process_spawned\";\n processId: number | null;\n signalTarget: \"process\" | \"process_group\";\n taskId: string;\n};\n\ntype HostOwnerReceipt = Extract<\n z.infer<typeof serviceExecutionHostOwnerSchema>,\n {\n schema:\n | \"service-execution-host-owner-v2\"\n | \"service-execution-host-owner-v3\";\n }\n>;\n\nexport type ExecutionHostWorkState = {\n localQuiescent: boolean;\n // Controls, adapter maintenance and workspace cleanup launch unrecorded processes.\n unattributedWork: boolean;\n runningTaskIds: readonly string[];\n};\n\nexport type ProviderInvocationEvent = {\n phase: \"ended\" | \"started\";\n taskId: string;\n};\n\ntype TaskEvidence = {\n activeInvocations: number;\n // Points where a running invocation may launch a process it has not yet\n // recorded: its start, and each recorded exit before it ends.\n unrecordedLaunches: number;\n completedInvocation: boolean;\n};\n\n// Preparation before the first invocation can launch work it never records.\n// Workspace cleanup after an invocation is tracked as unattributed work.\nfunction isTaskEvidenceComplete(task: TaskEvidence): boolean {\n return task.activeInvocations > 0\n ? task.unrecordedLaunches === 0\n : task.completedInvocation;\n}\n\nexport async function readExecutionHostBootIdentity(): Promise<string | null> {\n try {\n return await readBootIdentity();\n } catch {\n // Fresh/quiescent starts do not require reboot evidence. Unknown evidence\n // can never clear an unsafe previous owner, and is not another boot.\n console.warn(\n \"[openmeld.execution_host.boot_unknown] Automatic recovery of unconfirmed work requires operating-system restart evidence.\"\n );\n return null;\n }\n}\n\nasync function readBootIdentity(): Promise<string | null> {\n if (process.platform === \"linux\") {\n const id = z\n .uuid()\n .parse(\n (await readFile(\"/proc/sys/kernel/random/boot_id\", \"utf8\")).trim()\n );\n return `linux:${id.toLowerCase()}`;\n }\n let stdout = \"\";\n if (process.platform === \"darwin\") {\n // XNU's immutable boot-session UUID, not its clock-adjustable boot time.\n ({ stdout } = await run(\n \"/usr/sbin/sysctl\",\n [\"-n\", \"kern.bootsessionuuid\"],\n {\n timeout: 5000,\n }\n ));\n return `darwin:${z.uuid().parse(stdout.trim()).toLowerCase()}`;\n }\n if (process.platform === \"win32\") {\n ({ stdout } = await run(\n \"powershell.exe\",\n [\n \"-NoProfile\",\n \"-NonInteractive\",\n \"-Command\",\n \"$ErrorActionPreference='Stop'; $e=Get-WinEvent -FilterHashtable @{LogName='System';ProviderName='Microsoft-Windows-Kernel-General';Id=12} -MaxEvents 1; if($null -eq $e.RecordId -or $null -eq $e.TimeCreated){throw 'Boot event unavailable'}; [Console]::WriteLine(([string]$e.RecordId)+':'+([string]$e.TimeCreated.ToUniversalTime().Ticks))\",\n ],\n { timeout: 5000, windowsHide: true }\n ));\n if (!WINDOWS_BOOT_EVENT.test(stdout.trim())) {\n throw new Error(\"Invalid Windows boot event\");\n }\n return `win32:${stdout.trim()}`;\n }\n return null;\n}\n\nfunction confirmsNewBoot(\n previous: string | null,\n current: string | null\n): boolean {\n if (!(previous && current) || previous === current) {\n return false;\n }\n const [priorSource, priorId, priorTime] = previous.split(\":\");\n const [source, id, time] = current.split(\":\");\n if (source !== priorSource) {\n return false;\n }\n if (source === \"linux\" || source === \"darwin\") {\n return (\n z.uuid().safeParse(id).success && z.uuid().safeParse(priorId).success\n );\n }\n // Kernel-General 12 records OS startup, not EventLog-service restarts or\n // wall-clock corrections. Require a later retained event in both fields;\n // missing/cleared/rotated evidence cannot authorize replacing unknown work.\n if (\n source !== \"win32\" ||\n !id ||\n !time ||\n !priorId ||\n !priorTime ||\n ![id, time, priorId, priorTime].every((value) => DECIMAL.test(value))\n ) {\n return false;\n }\n return BigInt(id) > BigInt(priorId) && BigInt(time) > BigInt(priorTime);\n}\n\nexport async function acquireExecutionHostOwnership(input: {\n hostInstanceId: string;\n ownerUserId: string;\n deviceId: string;\n lane: \"prod\" | \"dev-local\" | \"canary\";\n stateRoot: string;\n bootIdentity: string | null;\n}) {\n const lock = await acquireProcessOwnerLock(input);\n const path = join(\n systemDir({ env: { OPENMELD_HOME: input.stateRoot } }),\n \"execution-host-owner.json\"\n );\n try {\n const previous = readOwner(path);\n if (\n previous &&\n !previous.localQuiescent &&\n !confirmsNewBoot(previous.bootIdentity, input.bootIdentity)\n ) {\n assertPreviousOwnerReplaceableOnSameBoot(previous);\n }\n let owner: HostOwnerReceipt = {\n schema: \"service-execution-host-owner-v2\",\n hostInstanceId: input.hostInstanceId,\n ownerUserId: input.ownerUserId,\n deviceId: input.deviceId,\n lane: input.lane,\n pid: process.pid,\n processStartedAt: CURRENT_PROCESS_START_IDENTITY,\n bootIdentity: input.bootIdentity,\n localQuiescent: true,\n processEvidenceComplete: true,\n ownedProcessTrees: [],\n };\n serviceExecutionHostOwnerSchema.parse(owner);\n persist(owner);\n function persist(next: HostOwnerReceipt) {\n try {\n mkdirSync(dirname(path), { recursive: true, mode: 0o700 });\n const temporary = `${path}.${randomUUID()}.tmp`;\n writeFileSync(temporary, JSON.stringify(next), {\n mode: 0o600,\n flag: \"wx\",\n });\n renameSync(temporary, path);\n } catch (error) {\n warnDaemonEvent(\"[openmeld.execution_host.receipt_write_failed]\", {\n event: \"cli.execution_host.receipt_write_failed\",\n detail: toErrorMessage(error),\n });\n throw new ExecutionHostError(\n \"host.execution_record_unavailable\",\n \"The local execution host could not write its ownership record.\"\n );\n }\n }\n // A failed write throws to the caller, which refuses the operation rather\n // than weakening the fence.\n function update(changes: Partial<Omit<HostOwnerReceipt, \"schema\">>) {\n const merged = { ...owner, ...changes };\n const next: HostOwnerReceipt = {\n ...merged,\n // A quiescent receipt carries no evidence, so it keeps the shape an\n // older Service reads after a verified rollback.\n schema: merged.localQuiescent\n ? \"service-execution-host-owner-v2\"\n : \"service-execution-host-owner-v3\",\n };\n if (JSON.stringify(next) === JSON.stringify(owner)) {\n return;\n }\n persist(next);\n owner = next;\n }\n // Evidence is per running task and per provider invocation. One task's\n // record never vouches for another task, and one invocation's record never\n // vouches for the next invocation of the same task.\n const tasks = new Map<string, TaskEvidence>();\n let unattributedWork = false;\n const evidenceComplete = () =>\n !unattributedWork && [...tasks.values()].every(isTaskEvidenceComplete);\n return {\n observeWork(state: ExecutionHostWorkState) {\n if (state.localQuiescent) {\n tasks.clear();\n unattributedWork = false;\n // Idle slots do not prove a recorded process group has exited; the\n // receipt stays non-quiescent until every recorded tree is gone.\n const liveTrees = owner.ownedProcessTrees.filter(\n isOwnedProcessTreeAlive\n );\n update({\n localQuiescent: liveTrees.length === 0,\n processEvidenceComplete: true,\n ownedProcessTrees: liveTrees,\n });\n return;\n }\n const running = new Set(state.runningTaskIds);\n for (const taskId of tasks.keys()) {\n if (!running.has(taskId)) {\n tasks.delete(taskId);\n }\n }\n for (const taskId of running) {\n if (!tasks.has(taskId)) {\n tasks.set(taskId, {\n activeInvocations: 0,\n unrecordedLaunches: 0,\n completedInvocation: false,\n });\n }\n }\n unattributedWork = state.unattributedWork;\n update({\n localQuiescent: false,\n processEvidenceComplete: evidenceComplete(),\n });\n },\n // Called before a provider invocation can launch anything, so the\n // durable receipt is incomplete first; a failed write refuses it.\n observeProviderInvocation(event: ProviderInvocationEvent) {\n const task = tasks.get(event.taskId);\n if (!task) {\n return;\n }\n if (event.phase === \"started\") {\n task.activeInvocations += 1;\n task.unrecordedLaunches += 1;\n } else {\n task.activeInvocations = Math.max(0, task.activeInvocations - 1);\n if (task.activeInvocations === 0) {\n task.unrecordedLaunches = 0;\n task.completedInvocation = true;\n }\n }\n update({ processEvidenceComplete: evidenceComplete() });\n },\n observeOwnedProcess(event: OwnedProcessEvent) {\n const task = tasks.get(event.taskId);\n if (event.phase === \"process_spawned\") {\n if (event.processId === null) {\n return;\n }\n const processStartedAt =\n readProcessStartIdentity(event.processId) ??\n `fallback:${event.processId}:unknown`;\n if (task && task.activeInvocations > 0) {\n task.unrecordedLaunches = Math.max(0, task.unrecordedLaunches - 1);\n }\n update({\n localQuiescent: false,\n processEvidenceComplete: evidenceComplete(),\n ownedProcessTrees: [\n ...owner.ownedProcessTrees.filter(\n (process) => process.pid !== event.processId\n ),\n {\n pid: event.processId,\n processStartedAt,\n signalTarget: event.signalTarget,\n },\n ],\n });\n return;\n }\n if (event.processId === null) {\n return;\n }\n // A running invocation may launch again after a recorded process\n // exits, such as a context-heal retry.\n if (task && task.activeInvocations > 0) {\n task.unrecordedLaunches += 1;\n }\n update({\n processEvidenceComplete: evidenceComplete(),\n ownedProcessTrees: owner.ownedProcessTrees.filter(\n (process) =>\n process.pid !== event.processId ||\n isOwnedProcessTreeAlive(process)\n ),\n });\n },\n release: () => releaseLock(lock),\n };\n } catch (error) {\n await releaseLock(lock);\n throw error;\n }\n}\n\nasync function acquireProcessOwnerLock(input: {\n hostInstanceId: string;\n ownerUserId: string;\n stateRoot: string;\n}) {\n try {\n return await acquireLock({\n openMeldProfileId: \"service-execution-host\",\n key: \"process-owner\",\n pathResolution: {\n env: { ...process.env, OPENMELD_HOME: input.stateRoot },\n },\n meta: {\n hostInstanceId: input.hostInstanceId,\n ownerUserId: input.ownerUserId,\n },\n });\n } catch (error) {\n if (!(isOpenMeldLockError(error) && error.contentionState === \"active\")) {\n throw error;\n }\n if (typeof error.meta?.pid === \"number\") {\n throw new ExecutionHostError(\n \"host.previous_work_running\",\n \"Another execution host for this installation is still running. This Host starts after it exits; no task will be restarted automatically.\"\n );\n }\n // A lock briefly has no owner entry while it is published or released.\n // Past the lock's own recovery grace, there is no process to wait for.\n if (await isOwnerLockHandoffPossible(error.lockPath)) {\n throw new ExecutionHostError(\n \"host.previous_work_running\",\n \"Another execution host for this installation is starting or stopping. This Host checks again shortly; no task will be restarted automatically.\"\n );\n }\n throw new ExecutionHostError(\n \"host.owner_lock_unverified\",\n \"The execution host lock for this installation has no identifiable owner. Preserve it for diagnostics; automatic replacement is refused.\"\n );\n }\n}\n\nasync function isOwnerLockHandoffPossible(lockPath: string): Promise<boolean> {\n try {\n const stats = await lstat(lockPath);\n return Date.now() - stats.mtimeMs < MALFORMED_LOCK_RECOVERY_GRACE_MS;\n } catch (error) {\n return isNodeError(error, \"ENOENT\");\n }\n}\n\n// Waiting can clear only a fence whose recorded processes are still alive.\n// Incomplete or legacy evidence, including a non-quiescent V2 receipt whose\n// completeness was Host-wide, stays unconfirmed however long it is retried.\nfunction assertPreviousOwnerReplaceableOnSameBoot(\n previous: NonNullable<ReturnType<typeof readOwner>>\n): void {\n if (\n previous.schema !== \"service-execution-host-owner-v3\" ||\n !previous.processEvidenceComplete\n ) {\n throw new ExecutionHostError(\n \"host.previous_work_unconfirmed\",\n \"The previous execution host ended before its local work was confirmed stopped. Restart this Computer, then check its connection. If restart evidence is unavailable, inspect the retained Host diagnostics before recovery. Existing results remain saved; no task will be restarted automatically.\"\n );\n }\n if (\n isProcessIdentityAlive({\n ownerPid: previous.pid,\n ownerProcessStartedAt: previous.processStartedAt,\n }) ||\n previous.ownedProcessTrees.some(isOwnedProcessTreeAlive)\n ) {\n throw new ExecutionHostError(\n \"host.previous_work_running\",\n \"Local agent work recorded by the previous execution host is still running. This Host starts after that work exits; no task will be restarted automatically.\"\n );\n }\n}\n\nfunction isOwnedProcessTreeAlive(input: {\n pid: number;\n processStartedAt: string;\n signalTarget: \"process\" | \"process_group\";\n}): boolean {\n if (input.signalTarget === \"process_group\" && process.platform !== \"win32\") {\n try {\n process.kill(-input.pid, 0);\n return true;\n } catch (error) {\n return !isNodeError(error, \"ESRCH\");\n }\n }\n return isProcessIdentityAlive({\n ownerPid: input.pid,\n ownerProcessStartedAt: input.processStartedAt,\n });\n}\n\nfunction isNodeError(error: unknown, code: string): boolean {\n return (\n error instanceof Error && \"code\" in error && String(error.code) === code\n );\n}\n\nfunction readOwner(path: string) {\n let raw: string;\n try {\n raw = readFileSync(path, \"utf8\");\n } catch (error) {\n if (isNodeError(error, \"ENOENT\")) {\n return null;\n }\n throw new ExecutionHostError(\n \"host.owner_corrupt\",\n `The Host ownership record cannot be read (${error instanceof Error ? error.message : String(error)}). Preserve it for diagnostics; automatic replacement is refused.`\n );\n }\n try {\n const parsed = serviceExecutionHostOwnerSchema.safeParse(JSON.parse(raw));\n if (parsed.success) {\n return parsed.data;\n }\n } catch {\n // Unreadable JSON is as unverifiable as a record with the wrong shape.\n }\n throw new ExecutionHostError(\n \"host.owner_corrupt\",\n \"The Host ownership record cannot be verified. Preserve it for diagnostics; automatic replacement is refused.\"\n );\n}\n","import {\n type ServiceExecutionHostIdentity,\n serviceExecutionHostMethods,\n} from \"@openmeld/schemas\";\nimport {\n type StoredAuthSession,\n withAdmittedServiceSession,\n} from \"../../config/auth-session\";\nimport { resolveRuntimeContext } from \"../../runtime/context\";\nimport { createPresenter } from \"../../runtime/presenter/index\";\nimport { ensureDaemonRuntimePaths } from \"../state/daemon-device-id\";\nimport {\n ExecutionHostError,\n type ExecutionHostHandlers,\n serveExecutionHost,\n} from \"./channel\";\nimport { validateExecutionHostIdentity } from \"./identity\";\nimport {\n acquireExecutionHostOwnership,\n readExecutionHostBootIdentity,\n} from \"./ownership\";\nimport { parentExecutionHostChannel } from \"./process-channel\";\n\n// This entry has no public listener and accepts no executable/path override.\n// The inherited pipe, parent incarnation and current Service account are all\n// required before the provider graph or any local runtime state is opened.\nexport function runExecutionHost(hostInstanceId: string): Promise<void> {\n const channel = parentExecutionHostChannel();\n const done = Promise.withResolvers<void>();\n let runtime: Awaited<\n ReturnType<typeof import(\"./runtime\").createExecutionHostRuntime>\n > | null = null;\n let ownership: Awaited<\n ReturnType<typeof acquireExecutionHostOwnership>\n > | null = null;\n let session: StoredAuthSession | null = null;\n let acceptedIdentity: ServiceExecutionHostIdentity | null = null;\n let initializing: Promise<void> | null = null;\n let closing: Promise<void> | null = null;\n let disconnected = false;\n\n const close = (): Promise<void> => {\n if (!closing) {\n closing = (async () => {\n try {\n await initializing;\n if (runtime && session) {\n const currentRuntime = runtime;\n await withAdmittedServiceSession(session, () =>\n currentRuntime.closeAfterConnectorLoss()\n );\n }\n } finally {\n await ownership?.release();\n server.dispose();\n if (process.connected) {\n process.disconnect();\n }\n }\n })();\n closing.then(\n () => done.resolve(),\n (error) => done.reject(error)\n );\n }\n return closing;\n };\n\n const handlers = {\n initialize: async (identity: ServiceExecutionHostIdentity) => {\n if (\n acceptedIdentity &&\n JSON.stringify(acceptedIdentity) !== JSON.stringify(identity)\n ) {\n throw new ExecutionHostError(\n \"host.identity_mismatch\",\n \"This Host is already assigned to a different Service incarnation.\"\n );\n }\n if (!initializing) {\n acceptedIdentity = identity;\n const attempt = (async () => {\n const verified = await validateExecutionHostIdentity(identity);\n if (disconnected) {\n throw new ExecutionHostError(\n \"host.disconnected\",\n \"The supervising Service left before Host initialization.\"\n );\n }\n const verifiedOwnership = await acquireExecutionHostOwnership({\n ...identity,\n hostInstanceId,\n bootIdentity: await readExecutionHostBootIdentity(),\n });\n ownership = verifiedOwnership;\n session = verified.session;\n await withAdmittedServiceSession(session, async () => {\n const { createExecutionHostRuntime, createExecutionHostResources } =\n await import(\"./runtime\");\n const runtimePaths = await ensureDaemonRuntimePaths();\n const presenter = createPresenter(\n await resolveRuntimeContext({ view: \"agent\" })\n );\n runtime = await createExecutionHostRuntime({\n resources: await createExecutionHostResources({\n runtimePaths,\n presenter,\n observeOwnedProcess: (event) =>\n verifiedOwnership.observeOwnedProcess(event),\n observeProviderInvocation: (event) =>\n verifiedOwnership.observeProviderInvocation(event),\n }),\n hostInstanceId,\n identity,\n runtimePaths,\n serviceBundleId: verified.contract.bundleId,\n profileOwnerName: verified.session.user?.name ?? null,\n presenter,\n emit: (event) => {\n if (!disconnected) {\n server.emit(event);\n }\n },\n onWorkStateChange: (state) =>\n verifiedOwnership.observeWork(state),\n });\n });\n })();\n initializing = attempt;\n attempt.catch((error: unknown) => {\n // Ownership was refused before any runtime state opened. The\n // supervising Service asks again once the recorded work may have exited.\n if (\n initializing === attempt &&\n error instanceof ExecutionHostError &&\n error.code === \"host.previous_work_running\"\n ) {\n initializing = null;\n }\n });\n }\n await initializing;\n if (!runtime || disconnected) {\n throw new ExecutionHostError(\n \"host.disconnected\",\n \"The execution Host is not available.\"\n );\n }\n return runtime.snapshot();\n },\n } as ExecutionHostHandlers;\n\n // Each concrete method is still decoded by the shared method table at both\n // ends; the forwarding bridge cannot select a new account or mutate identity.\n for (const method of Object.keys(serviceExecutionHostMethods) as Array<\n keyof ExecutionHostHandlers\n >) {\n if (method === \"initialize\") {\n continue;\n }\n const target = handlers as unknown as Record<\n string,\n (payload: unknown) => Promise<unknown>\n >;\n target[method] = async (payload) => {\n if (!(runtime && session) || disconnected) {\n throw new ExecutionHostError(\n \"host.not_initialized\",\n \"Initialize this Host through its supervising Service first.\"\n );\n }\n const invoke = runtime.handlers[method] as (value: unknown) => unknown;\n return await withAdmittedServiceSession(\n session,\n async () => await invoke(payload)\n );\n };\n }\n\n const server = serveExecutionHost({\n channel,\n hostInstanceId,\n handlers,\n onFailure: (error) => {\n console.error(\"[openmeld.execution_host.channel_failed]\", error);\n disconnected = true;\n close().catch(() => undefined);\n },\n onDisconnect: () => {\n disconnected = true;\n close().catch(() => undefined);\n },\n });\n return done.promise;\n}\n"],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
|
|
3
|
-
import { T as updateConfiguredSkillsConfig, g as getConfiguredSkillsConfig, y as resolveRuntimeSkillsCustomTargetId } from "./base-url-
|
|
3
|
+
import { T as updateConfiguredSkillsConfig, g as getConfiguredSkillsConfig, y as resolveRuntimeSkillsCustomTargetId } from "./base-url-DuppOOaB.js";
|
|
4
4
|
import { V as skillsDir } from "./paths-De9xdA2h.js";
|
|
5
|
-
import { Ht as detectInstalledSkillsAgents, Ut as resolveSkillsAgentRegistry, Vt as canManageRegistryAgentSkillTargets } from "./prepare-provider-runtime-
|
|
6
|
-
import { n as resolveSkillsInstallStates, r as ensureLocalSkills, t as resolveSkillInstallStateForTarget } from "./state-
|
|
5
|
+
import { Ht as detectInstalledSkillsAgents, Ut as resolveSkillsAgentRegistry, Vt as canManageRegistryAgentSkillTargets } from "./prepare-provider-runtime-D4X1jiYQ.js";
|
|
6
|
+
import { n as resolveSkillsInstallStates, r as ensureLocalSkills, t as resolveSkillInstallStateForTarget } from "./state-LIaPm3LW.js";
|
|
7
7
|
import { stat } from "node:fs/promises";
|
|
8
8
|
//#region src/skills/installation-inventory.ts
|
|
9
9
|
async function collectSkillsReadinessSnapshot() {
|
|
@@ -240,4 +240,4 @@ function normalizeInstallRecordForCompare(input) {
|
|
|
240
240
|
//#endregion
|
|
241
241
|
export { mergeTargetsByDir as a, summarizeSkillState as c, filterTargetsWithInstalledOpenMeldSkills as i, collectSkillsReadinessSnapshot as n, persistDetectedInstallStateFromCheck as o, compareInstallRecords as r, resolveTrackedInstallTargets as s, buildAgentTargets as t };
|
|
242
242
|
|
|
243
|
-
//# sourceMappingURL=installation-inventory-
|
|
243
|
+
//# sourceMappingURL=installation-inventory-CsSfOQgL.js.map
|
package/dist/{installation-inventory-B7Lj2s1Y.js.map → installation-inventory-CsSfOQgL.js.map}
RENAMED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installation-inventory-B7Lj2s1Y.js","names":[],"sources":["../src/skills/installation-inventory.ts"],"sourcesContent":["import { stat } from \"node:fs/promises\";\nimport { skillsDir } from \"../config/paths\";\nimport {\n getConfiguredSkillsConfig,\n type RuntimeSkillsConfig,\n type RuntimeSkillsCustomTarget,\n type RuntimeSkillsInstallRecord,\n resolveRuntimeSkillsCustomTargetId,\n updateConfiguredSkillsConfig,\n} from \"../config/runtime-config\";\nimport {\n canManageRegistryAgentSkillTargets,\n detectInstalledSkillsAgents,\n resolveSkillsAgentRegistry,\n} from \"./agents\";\nimport type { SkillsInstallTarget } from \"./installer\";\nimport {\n resolveSkillInstallStateForTarget,\n resolveSkillsInstallStates,\n type SkillInstallStateResult,\n} from \"./state\";\nimport { ensureLocalSkills, type LocalSkill } from \"./store\";\n\nexport type SkillsReadinessSnapshot = {\n status: \"up_to_date\" | \"action_required\" | \"no_targets\";\n targetCount: number;\n summary: {\n upToDate: number;\n outdated: number;\n missing: number;\n externalConflict: number;\n };\n};\n\nexport async function collectSkillsReadinessSnapshot(): Promise<SkillsReadinessSnapshot> {\n const skillsConfig = await getConfiguredSkillsConfig();\n const registry = resolveSkillsAgentRegistry(skillsConfig);\n const installedAgents = await detectInstalledSkillsAgents(registry);\n const localSkills = await ensureLocalSkills();\n const detectedAgentTargets = buildAgentTargets(installedAgents, registry);\n const trackedTargets = await resolveTrackedInstallTargets({\n skillsConfig,\n registry,\n localSkills,\n onlyOpenMeldInstalledTargets: false,\n });\n const checkTargets = mergeTargetsByDir({\n primary: detectedAgentTargets,\n secondary: trackedTargets,\n });\n const states = await resolveSkillsInstallStates({\n skills: localSkills,\n targets: checkTargets,\n });\n await persistDetectedInstallStateFromCheck({ states });\n const summary = summarizeSkillState(states);\n const hasIssues =\n summary.outdated > 0 || summary.missing > 0 || summary.externalConflict > 0;\n let status: SkillsReadinessSnapshot[\"status\"] = \"up_to_date\";\n if (checkTargets.length === 0) {\n status = \"no_targets\";\n } else if (hasIssues) {\n status = \"action_required\";\n }\n return {\n status,\n targetCount: checkTargets.length,\n summary,\n };\n}\n\nexport function buildAgentTargets(\n agents: string[],\n registry: ReturnType<typeof resolveSkillsAgentRegistry>\n): SkillsInstallTarget[] {\n return agents.flatMap((agentName) => {\n const config = registry[agentName];\n if (!config?.globalSkillsDir || config.skillsInstallable !== true) {\n return [];\n }\n return [\n {\n id: agentName,\n dir: config.globalSkillsDir,\n type: \"agent\" as const,\n },\n ];\n });\n}\n\nfunction isLikelyCustomTargetId(value: string): boolean {\n return value.startsWith(\"custom-\");\n}\n\nexport function resolveTrackedInstallTargets(input: {\n skillsConfig: RuntimeSkillsConfig | null;\n registry: ReturnType<typeof resolveSkillsAgentRegistry>;\n localSkills: LocalSkill[];\n onlyOpenMeldInstalledTargets: boolean;\n}): Promise<SkillsInstallTarget[]> {\n const installs = input.skillsConfig?.installs ?? [];\n const customTargets = input.skillsConfig?.customTargets ?? [];\n const customTargetByDir = buildCustomTargetByDir(customTargets);\n const byTargetDir = new Map<string, SkillsInstallTarget>();\n seedTrackedTargetsFromCustomTargets({\n byTargetDir,\n customTargetByDir,\n });\n seedTrackedTargetsFromInstallRecords({\n byTargetDir,\n installs,\n registry: input.registry,\n customTargetByDir,\n });\n\n const candidates = sortTrackedTargets([...byTargetDir.values()]);\n const allowRegistryDefaults = canManageRegistryAgentSkillTargets();\n const laneSafeCandidates = allowRegistryDefaults\n ? candidates\n : candidates.filter(\n (target) =>\n target.type === \"custom\" ||\n input.registry[target.id]?.globalSkillsDirSource === \"config-override\"\n );\n return filterTrackedTargetsByState({\n candidates: laneSafeCandidates,\n localSkills: input.localSkills,\n onlyOpenMeldInstalledTargets: input.onlyOpenMeldInstalledTargets,\n });\n}\n\nfunction buildCustomTargetByDir(\n customTargets: RuntimeSkillsCustomTarget[]\n): Map<string, RuntimeSkillsCustomTarget> {\n const customTargetByDir = new Map<string, RuntimeSkillsCustomTarget>();\n for (const customTarget of customTargets) {\n const id = resolveRuntimeSkillsCustomTargetId({\n dir: customTarget.dir,\n ...(customTarget.id ? { id: customTarget.id } : {}),\n });\n customTargetByDir.set(customTarget.dir, {\n id,\n name: customTarget.name,\n dir: customTarget.dir,\n });\n }\n return customTargetByDir;\n}\n\nfunction seedTrackedTargetsFromCustomTargets(input: {\n byTargetDir: Map<string, SkillsInstallTarget>;\n customTargetByDir: Map<string, RuntimeSkillsCustomTarget>;\n}): void {\n for (const customTarget of input.customTargetByDir.values()) {\n input.byTargetDir.set(customTarget.dir, {\n id:\n customTarget.id ??\n resolveRuntimeSkillsCustomTargetId({ dir: customTarget.dir }),\n dir: customTarget.dir,\n type: \"custom\",\n });\n }\n}\n\nfunction seedTrackedTargetsFromInstallRecords(input: {\n byTargetDir: Map<string, SkillsInstallTarget>;\n installs: RuntimeSkillsInstallRecord[];\n registry: ReturnType<typeof resolveSkillsAgentRegistry>;\n customTargetByDir: Map<string, RuntimeSkillsCustomTarget>;\n}): void {\n for (const install of input.installs) {\n const trackedTarget = buildTrackedTargetFromInstallRecord({\n install,\n registry: input.registry,\n customTargetByDir: input.customTargetByDir,\n });\n input.byTargetDir.set(install.targetDir, trackedTarget);\n }\n}\n\nfunction buildTrackedTargetFromInstallRecord(input: {\n install: RuntimeSkillsInstallRecord;\n registry: ReturnType<typeof resolveSkillsAgentRegistry>;\n customTargetByDir: Map<string, RuntimeSkillsCustomTarget>;\n}): SkillsInstallTarget {\n const knownAgentDir = input.registry[input.install.targetId]?.globalSkillsDir;\n const targetType: SkillsInstallTarget[\"type\"] =\n knownAgentDir && knownAgentDir === input.install.targetDir\n ? \"agent\"\n : \"custom\";\n if (targetType === \"agent\") {\n return {\n id: input.install.targetId,\n dir: input.install.targetDir,\n type: \"agent\",\n };\n }\n\n const customTarget = input.customTargetByDir.get(input.install.targetDir);\n const fallbackCustomId = isLikelyCustomTargetId(input.install.targetId)\n ? input.install.targetId\n : undefined;\n const resolvedCustomId = customTarget?.id ?? fallbackCustomId;\n return {\n id: resolveRuntimeSkillsCustomTargetId({\n dir: input.install.targetDir,\n ...(resolvedCustomId ? { id: resolvedCustomId } : {}),\n }),\n dir: input.install.targetDir,\n type: \"custom\",\n };\n}\n\nfunction sortTrackedTargets(\n targets: SkillsInstallTarget[]\n): SkillsInstallTarget[] {\n return [...targets].sort((a, b) =>\n `${a.id}:${a.dir}`.localeCompare(`${b.id}:${b.dir}`)\n );\n}\n\nexport function mergeTargetsByDir(input: {\n primary: SkillsInstallTarget[];\n secondary: SkillsInstallTarget[];\n}): SkillsInstallTarget[] {\n const byDir = new Map<string, SkillsInstallTarget>();\n for (const target of input.secondary) {\n byDir.set(target.dir, target);\n }\n for (const target of input.primary) {\n byDir.set(target.dir, target);\n }\n return sortTrackedTargets([...byDir.values()]);\n}\n\nasync function filterInstalledTrackedTargets(input: {\n candidates: SkillsInstallTarget[];\n localSkills: LocalSkill[];\n}): Promise<SkillsInstallTarget[]> {\n const installedOnly: SkillsInstallTarget[] = [];\n for (const candidate of input.candidates) {\n const hasInstalledOpenMeldSkill = await targetHasInstalledOpenMeldSkill({\n target: candidate,\n localSkills: input.localSkills,\n });\n if (!hasInstalledOpenMeldSkill) {\n continue;\n }\n installedOnly.push(candidate);\n }\n return installedOnly;\n}\n\nexport async function filterTargetsWithInstalledOpenMeldSkills(input: {\n targets: SkillsInstallTarget[];\n localSkills: LocalSkill[];\n}): Promise<SkillsInstallTarget[]> {\n const existingTargets = await filterExistingTargetDirs(input.targets);\n return filterInstalledTrackedTargets({\n candidates: existingTargets,\n localSkills: input.localSkills,\n });\n}\n\nasync function filterTrackedTargetsByState(input: {\n candidates: SkillsInstallTarget[];\n localSkills: LocalSkill[];\n onlyOpenMeldInstalledTargets: boolean;\n}): Promise<SkillsInstallTarget[]> {\n const existingTargets = await filterExistingTargetDirs(input.candidates);\n if (!input.onlyOpenMeldInstalledTargets) {\n return existingTargets;\n }\n\n return filterInstalledTrackedTargets({\n candidates: existingTargets,\n localSkills: input.localSkills,\n });\n}\n\nasync function filterExistingTargetDirs(\n candidates: SkillsInstallTarget[]\n): Promise<SkillsInstallTarget[]> {\n const existing: SkillsInstallTarget[] = [];\n for (const candidate of candidates) {\n const targetDirStats = await stat(candidate.dir).catch(() => null);\n if (!targetDirStats?.isDirectory()) {\n continue;\n }\n existing.push(candidate);\n }\n return existing;\n}\n\nexport function summarizeSkillState(states: SkillInstallStateResult[]): {\n upToDate: number;\n outdated: number;\n missing: number;\n externalConflict: number;\n} {\n return {\n upToDate: states.filter((state) => state.state === \"up_to_date\").length,\n outdated: states.filter((state) => state.state === \"outdated\").length,\n missing: states.filter((state) => state.state === \"missing\").length,\n externalConflict: states.filter(\n (state) => state.state === \"external_conflict\"\n ).length,\n };\n}\n\nasync function targetHasInstalledOpenMeldSkill(input: {\n target: SkillsInstallTarget;\n localSkills: LocalSkill[];\n}): Promise<boolean> {\n const targetDirStats = await stat(input.target.dir).catch(() => null);\n if (!targetDirStats?.isDirectory()) {\n return false;\n }\n\n for (const skill of input.localSkills) {\n const state = await resolveSkillInstallStateForTarget({\n skill,\n target: input.target,\n });\n if (state.state === \"up_to_date\" || state.state === \"outdated\") {\n return true;\n }\n }\n\n return false;\n}\n\nexport async function persistDetectedInstallStateFromCheck(input: {\n states: SkillInstallStateResult[];\n}): Promise<void> {\n const discoveredByTargetDir = new Map<string, SkillInstallStateResult[]>();\n for (const state of input.states) {\n if (!(state.state === \"up_to_date\" || state.state === \"outdated\")) {\n continue;\n }\n const list = discoveredByTargetDir.get(state.targetDir) ?? [];\n list.push(state);\n discoveredByTargetDir.set(state.targetDir, list);\n }\n\n if (discoveredByTargetDir.size === 0) {\n return;\n }\n\n await updateConfiguredSkillsConfig((currentSkillsConfig) => {\n const byTargetDir = new Map<string, RuntimeSkillsInstallRecord>();\n for (const record of currentSkillsConfig?.installs ?? []) {\n byTargetDir.set(record.targetDir, record);\n }\n\n const now = new Date().toISOString();\n for (const [targetDir, group] of discoveredByTargetDir) {\n const first = group[0];\n if (!first) {\n continue;\n }\n const mode: RuntimeSkillsInstallRecord[\"mode\"] = group.some(\n (state) => state.targetMode === \"copy\"\n )\n ? \"copy\"\n : \"symlink\";\n const skillIds = Array.from(\n new Set(group.map((state) => state.skillId))\n ).sort((a, b) => a.localeCompare(b));\n\n byTargetDir.set(targetDir, {\n targetId: first.targetId,\n targetDir,\n mode,\n status: \"installed\",\n skillIds,\n updatedAt: now,\n });\n }\n\n const nextInstalls = [...byTargetDir.values()].sort(compareInstallRecords);\n const previousInstalls = [...(currentSkillsConfig?.installs ?? [])]\n .sort(compareInstallRecords)\n .map(normalizeInstallRecordForCompare);\n const nextComparable = nextInstalls.map(normalizeInstallRecordForCompare);\n if (JSON.stringify(previousInstalls) === JSON.stringify(nextComparable)) {\n return currentSkillsConfig;\n }\n\n return {\n storeDir: currentSkillsConfig?.storeDir ?? skillsDir(),\n ...(currentSkillsConfig?.agents\n ? { agents: currentSkillsConfig.agents }\n : {}),\n ...(currentSkillsConfig?.customTargets\n ? { customTargets: currentSkillsConfig.customTargets }\n : {}),\n installs: nextInstalls,\n };\n });\n}\n\nexport function compareInstallRecords(\n left: RuntimeSkillsInstallRecord,\n right: RuntimeSkillsInstallRecord\n): number {\n const byTargetId = left.targetId.localeCompare(right.targetId);\n if (byTargetId !== 0) {\n return byTargetId;\n }\n return left.targetDir.localeCompare(right.targetDir);\n}\n\nfunction normalizeInstallRecordForCompare(\n input: RuntimeSkillsInstallRecord\n): Omit<RuntimeSkillsInstallRecord, \"updatedAt\"> {\n return {\n targetId: input.targetId,\n targetDir: input.targetDir,\n mode: input.mode,\n status: input.status,\n skillIds: [...input.skillIds].sort((a, b) => a.localeCompare(b)),\n ...(input.reason ? { reason: input.reason } : {}),\n };\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"installation-inventory-CsSfOQgL.js","names":[],"sources":["../src/skills/installation-inventory.ts"],"sourcesContent":["import { stat } from \"node:fs/promises\";\nimport { skillsDir } from \"../config/paths\";\nimport {\n getConfiguredSkillsConfig,\n type RuntimeSkillsConfig,\n type RuntimeSkillsCustomTarget,\n type RuntimeSkillsInstallRecord,\n resolveRuntimeSkillsCustomTargetId,\n updateConfiguredSkillsConfig,\n} from \"../config/runtime-config\";\nimport {\n canManageRegistryAgentSkillTargets,\n detectInstalledSkillsAgents,\n resolveSkillsAgentRegistry,\n} from \"./agents\";\nimport type { SkillsInstallTarget } from \"./installer\";\nimport {\n resolveSkillInstallStateForTarget,\n resolveSkillsInstallStates,\n type SkillInstallStateResult,\n} from \"./state\";\nimport { ensureLocalSkills, type LocalSkill } from \"./store\";\n\nexport type SkillsReadinessSnapshot = {\n status: \"up_to_date\" | \"action_required\" | \"no_targets\";\n targetCount: number;\n summary: {\n upToDate: number;\n outdated: number;\n missing: number;\n externalConflict: number;\n };\n};\n\nexport async function collectSkillsReadinessSnapshot(): Promise<SkillsReadinessSnapshot> {\n const skillsConfig = await getConfiguredSkillsConfig();\n const registry = resolveSkillsAgentRegistry(skillsConfig);\n const installedAgents = await detectInstalledSkillsAgents(registry);\n const localSkills = await ensureLocalSkills();\n const detectedAgentTargets = buildAgentTargets(installedAgents, registry);\n const trackedTargets = await resolveTrackedInstallTargets({\n skillsConfig,\n registry,\n localSkills,\n onlyOpenMeldInstalledTargets: false,\n });\n const checkTargets = mergeTargetsByDir({\n primary: detectedAgentTargets,\n secondary: trackedTargets,\n });\n const states = await resolveSkillsInstallStates({\n skills: localSkills,\n targets: checkTargets,\n });\n await persistDetectedInstallStateFromCheck({ states });\n const summary = summarizeSkillState(states);\n const hasIssues =\n summary.outdated > 0 || summary.missing > 0 || summary.externalConflict > 0;\n let status: SkillsReadinessSnapshot[\"status\"] = \"up_to_date\";\n if (checkTargets.length === 0) {\n status = \"no_targets\";\n } else if (hasIssues) {\n status = \"action_required\";\n }\n return {\n status,\n targetCount: checkTargets.length,\n summary,\n };\n}\n\nexport function buildAgentTargets(\n agents: string[],\n registry: ReturnType<typeof resolveSkillsAgentRegistry>\n): SkillsInstallTarget[] {\n return agents.flatMap((agentName) => {\n const config = registry[agentName];\n if (!config?.globalSkillsDir || config.skillsInstallable !== true) {\n return [];\n }\n return [\n {\n id: agentName,\n dir: config.globalSkillsDir,\n type: \"agent\" as const,\n },\n ];\n });\n}\n\nfunction isLikelyCustomTargetId(value: string): boolean {\n return value.startsWith(\"custom-\");\n}\n\nexport function resolveTrackedInstallTargets(input: {\n skillsConfig: RuntimeSkillsConfig | null;\n registry: ReturnType<typeof resolveSkillsAgentRegistry>;\n localSkills: LocalSkill[];\n onlyOpenMeldInstalledTargets: boolean;\n}): Promise<SkillsInstallTarget[]> {\n const installs = input.skillsConfig?.installs ?? [];\n const customTargets = input.skillsConfig?.customTargets ?? [];\n const customTargetByDir = buildCustomTargetByDir(customTargets);\n const byTargetDir = new Map<string, SkillsInstallTarget>();\n seedTrackedTargetsFromCustomTargets({\n byTargetDir,\n customTargetByDir,\n });\n seedTrackedTargetsFromInstallRecords({\n byTargetDir,\n installs,\n registry: input.registry,\n customTargetByDir,\n });\n\n const candidates = sortTrackedTargets([...byTargetDir.values()]);\n const allowRegistryDefaults = canManageRegistryAgentSkillTargets();\n const laneSafeCandidates = allowRegistryDefaults\n ? candidates\n : candidates.filter(\n (target) =>\n target.type === \"custom\" ||\n input.registry[target.id]?.globalSkillsDirSource === \"config-override\"\n );\n return filterTrackedTargetsByState({\n candidates: laneSafeCandidates,\n localSkills: input.localSkills,\n onlyOpenMeldInstalledTargets: input.onlyOpenMeldInstalledTargets,\n });\n}\n\nfunction buildCustomTargetByDir(\n customTargets: RuntimeSkillsCustomTarget[]\n): Map<string, RuntimeSkillsCustomTarget> {\n const customTargetByDir = new Map<string, RuntimeSkillsCustomTarget>();\n for (const customTarget of customTargets) {\n const id = resolveRuntimeSkillsCustomTargetId({\n dir: customTarget.dir,\n ...(customTarget.id ? { id: customTarget.id } : {}),\n });\n customTargetByDir.set(customTarget.dir, {\n id,\n name: customTarget.name,\n dir: customTarget.dir,\n });\n }\n return customTargetByDir;\n}\n\nfunction seedTrackedTargetsFromCustomTargets(input: {\n byTargetDir: Map<string, SkillsInstallTarget>;\n customTargetByDir: Map<string, RuntimeSkillsCustomTarget>;\n}): void {\n for (const customTarget of input.customTargetByDir.values()) {\n input.byTargetDir.set(customTarget.dir, {\n id:\n customTarget.id ??\n resolveRuntimeSkillsCustomTargetId({ dir: customTarget.dir }),\n dir: customTarget.dir,\n type: \"custom\",\n });\n }\n}\n\nfunction seedTrackedTargetsFromInstallRecords(input: {\n byTargetDir: Map<string, SkillsInstallTarget>;\n installs: RuntimeSkillsInstallRecord[];\n registry: ReturnType<typeof resolveSkillsAgentRegistry>;\n customTargetByDir: Map<string, RuntimeSkillsCustomTarget>;\n}): void {\n for (const install of input.installs) {\n const trackedTarget = buildTrackedTargetFromInstallRecord({\n install,\n registry: input.registry,\n customTargetByDir: input.customTargetByDir,\n });\n input.byTargetDir.set(install.targetDir, trackedTarget);\n }\n}\n\nfunction buildTrackedTargetFromInstallRecord(input: {\n install: RuntimeSkillsInstallRecord;\n registry: ReturnType<typeof resolveSkillsAgentRegistry>;\n customTargetByDir: Map<string, RuntimeSkillsCustomTarget>;\n}): SkillsInstallTarget {\n const knownAgentDir = input.registry[input.install.targetId]?.globalSkillsDir;\n const targetType: SkillsInstallTarget[\"type\"] =\n knownAgentDir && knownAgentDir === input.install.targetDir\n ? \"agent\"\n : \"custom\";\n if (targetType === \"agent\") {\n return {\n id: input.install.targetId,\n dir: input.install.targetDir,\n type: \"agent\",\n };\n }\n\n const customTarget = input.customTargetByDir.get(input.install.targetDir);\n const fallbackCustomId = isLikelyCustomTargetId(input.install.targetId)\n ? input.install.targetId\n : undefined;\n const resolvedCustomId = customTarget?.id ?? fallbackCustomId;\n return {\n id: resolveRuntimeSkillsCustomTargetId({\n dir: input.install.targetDir,\n ...(resolvedCustomId ? { id: resolvedCustomId } : {}),\n }),\n dir: input.install.targetDir,\n type: \"custom\",\n };\n}\n\nfunction sortTrackedTargets(\n targets: SkillsInstallTarget[]\n): SkillsInstallTarget[] {\n return [...targets].sort((a, b) =>\n `${a.id}:${a.dir}`.localeCompare(`${b.id}:${b.dir}`)\n );\n}\n\nexport function mergeTargetsByDir(input: {\n primary: SkillsInstallTarget[];\n secondary: SkillsInstallTarget[];\n}): SkillsInstallTarget[] {\n const byDir = new Map<string, SkillsInstallTarget>();\n for (const target of input.secondary) {\n byDir.set(target.dir, target);\n }\n for (const target of input.primary) {\n byDir.set(target.dir, target);\n }\n return sortTrackedTargets([...byDir.values()]);\n}\n\nasync function filterInstalledTrackedTargets(input: {\n candidates: SkillsInstallTarget[];\n localSkills: LocalSkill[];\n}): Promise<SkillsInstallTarget[]> {\n const installedOnly: SkillsInstallTarget[] = [];\n for (const candidate of input.candidates) {\n const hasInstalledOpenMeldSkill = await targetHasInstalledOpenMeldSkill({\n target: candidate,\n localSkills: input.localSkills,\n });\n if (!hasInstalledOpenMeldSkill) {\n continue;\n }\n installedOnly.push(candidate);\n }\n return installedOnly;\n}\n\nexport async function filterTargetsWithInstalledOpenMeldSkills(input: {\n targets: SkillsInstallTarget[];\n localSkills: LocalSkill[];\n}): Promise<SkillsInstallTarget[]> {\n const existingTargets = await filterExistingTargetDirs(input.targets);\n return filterInstalledTrackedTargets({\n candidates: existingTargets,\n localSkills: input.localSkills,\n });\n}\n\nasync function filterTrackedTargetsByState(input: {\n candidates: SkillsInstallTarget[];\n localSkills: LocalSkill[];\n onlyOpenMeldInstalledTargets: boolean;\n}): Promise<SkillsInstallTarget[]> {\n const existingTargets = await filterExistingTargetDirs(input.candidates);\n if (!input.onlyOpenMeldInstalledTargets) {\n return existingTargets;\n }\n\n return filterInstalledTrackedTargets({\n candidates: existingTargets,\n localSkills: input.localSkills,\n });\n}\n\nasync function filterExistingTargetDirs(\n candidates: SkillsInstallTarget[]\n): Promise<SkillsInstallTarget[]> {\n const existing: SkillsInstallTarget[] = [];\n for (const candidate of candidates) {\n const targetDirStats = await stat(candidate.dir).catch(() => null);\n if (!targetDirStats?.isDirectory()) {\n continue;\n }\n existing.push(candidate);\n }\n return existing;\n}\n\nexport function summarizeSkillState(states: SkillInstallStateResult[]): {\n upToDate: number;\n outdated: number;\n missing: number;\n externalConflict: number;\n} {\n return {\n upToDate: states.filter((state) => state.state === \"up_to_date\").length,\n outdated: states.filter((state) => state.state === \"outdated\").length,\n missing: states.filter((state) => state.state === \"missing\").length,\n externalConflict: states.filter(\n (state) => state.state === \"external_conflict\"\n ).length,\n };\n}\n\nasync function targetHasInstalledOpenMeldSkill(input: {\n target: SkillsInstallTarget;\n localSkills: LocalSkill[];\n}): Promise<boolean> {\n const targetDirStats = await stat(input.target.dir).catch(() => null);\n if (!targetDirStats?.isDirectory()) {\n return false;\n }\n\n for (const skill of input.localSkills) {\n const state = await resolveSkillInstallStateForTarget({\n skill,\n target: input.target,\n });\n if (state.state === \"up_to_date\" || state.state === \"outdated\") {\n return true;\n }\n }\n\n return false;\n}\n\nexport async function persistDetectedInstallStateFromCheck(input: {\n states: SkillInstallStateResult[];\n}): Promise<void> {\n const discoveredByTargetDir = new Map<string, SkillInstallStateResult[]>();\n for (const state of input.states) {\n if (!(state.state === \"up_to_date\" || state.state === \"outdated\")) {\n continue;\n }\n const list = discoveredByTargetDir.get(state.targetDir) ?? [];\n list.push(state);\n discoveredByTargetDir.set(state.targetDir, list);\n }\n\n if (discoveredByTargetDir.size === 0) {\n return;\n }\n\n await updateConfiguredSkillsConfig((currentSkillsConfig) => {\n const byTargetDir = new Map<string, RuntimeSkillsInstallRecord>();\n for (const record of currentSkillsConfig?.installs ?? []) {\n byTargetDir.set(record.targetDir, record);\n }\n\n const now = new Date().toISOString();\n for (const [targetDir, group] of discoveredByTargetDir) {\n const first = group[0];\n if (!first) {\n continue;\n }\n const mode: RuntimeSkillsInstallRecord[\"mode\"] = group.some(\n (state) => state.targetMode === \"copy\"\n )\n ? \"copy\"\n : \"symlink\";\n const skillIds = Array.from(\n new Set(group.map((state) => state.skillId))\n ).sort((a, b) => a.localeCompare(b));\n\n byTargetDir.set(targetDir, {\n targetId: first.targetId,\n targetDir,\n mode,\n status: \"installed\",\n skillIds,\n updatedAt: now,\n });\n }\n\n const nextInstalls = [...byTargetDir.values()].sort(compareInstallRecords);\n const previousInstalls = [...(currentSkillsConfig?.installs ?? [])]\n .sort(compareInstallRecords)\n .map(normalizeInstallRecordForCompare);\n const nextComparable = nextInstalls.map(normalizeInstallRecordForCompare);\n if (JSON.stringify(previousInstalls) === JSON.stringify(nextComparable)) {\n return currentSkillsConfig;\n }\n\n return {\n storeDir: currentSkillsConfig?.storeDir ?? skillsDir(),\n ...(currentSkillsConfig?.agents\n ? { agents: currentSkillsConfig.agents }\n : {}),\n ...(currentSkillsConfig?.customTargets\n ? { customTargets: currentSkillsConfig.customTargets }\n : {}),\n installs: nextInstalls,\n };\n });\n}\n\nexport function compareInstallRecords(\n left: RuntimeSkillsInstallRecord,\n right: RuntimeSkillsInstallRecord\n): number {\n const byTargetId = left.targetId.localeCompare(right.targetId);\n if (byTargetId !== 0) {\n return byTargetId;\n }\n return left.targetDir.localeCompare(right.targetDir);\n}\n\nfunction normalizeInstallRecordForCompare(\n input: RuntimeSkillsInstallRecord\n): Omit<RuntimeSkillsInstallRecord, \"updatedAt\"> {\n return {\n targetId: input.targetId,\n targetDir: input.targetDir,\n mode: input.mode,\n status: input.status,\n skillIds: [...input.skillIds].sort((a, b) => a.localeCompare(b)),\n ...(input.reason ? { reason: input.reason } : {}),\n };\n}\n"],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
|
|
3
|
-
import { c as replaceSkillDirectory, f as withSkillsInstallLock, o as writeOpenMeldSkillMarker, s as recoverSkillReplacement, t as resolveSkillInstallStateForTarget } from "./state-
|
|
3
|
+
import { c as replaceSkillDirectory, f as withSkillsInstallLock, o as writeOpenMeldSkillMarker, s as recoverSkillReplacement, t as resolveSkillInstallStateForTarget } from "./state-LIaPm3LW.js";
|
|
4
4
|
import { dirname, isAbsolute, join, relative, resolve } from "node:path";
|
|
5
5
|
import { cp, mkdir, readFile, realpath, symlink } from "node:fs/promises";
|
|
6
6
|
import process from "node:process";
|
|
@@ -122,4 +122,4 @@ async function tryCreateSymlink(input) {
|
|
|
122
122
|
//#endregion
|
|
123
123
|
export { installSkillsToTargets as t };
|
|
124
124
|
|
|
125
|
-
//# sourceMappingURL=installer-
|
|
125
|
+
//# sourceMappingURL=installer-BytXmECH.js.map
|