@sellable/install 0.1.646 → 0.1.647
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/container/Dockerfile +4 -4
- package/container/README.md +1 -1
- package/lib/sellable-agent/abandoned-runtime-scratch.mjs +93 -0
- package/lib/sellable-agent/fly-admin-image/admin-runtime.mjs +14 -0
- package/lib/sellable-agent/fly-customer-image/Dockerfile +1 -1
- package/lib/sellable-agent/fly-customer-image/customer-runtime.mjs +1 -1
- package/lib/sellable-agent/host-bootstrap.mjs +1 -1
- package/lib/sellable-agent/host-worker.mjs +1 -1
- package/lib/sellable-agent/profile-materializer.mjs +1 -1
- package/lib/sellable-agent/provisioning-adapter.mjs +1 -1
- package/package.json +1 -1
package/container/Dockerfile
CHANGED
|
@@ -3,12 +3,12 @@ FROM ${HERMES_IMAGE}
|
|
|
3
3
|
|
|
4
4
|
USER root
|
|
5
5
|
|
|
6
|
-
ARG INSTALLER_PACKAGE=@sellable/install@0.1.
|
|
6
|
+
ARG INSTALLER_PACKAGE=@sellable/install@0.1.647
|
|
7
7
|
ARG MCP_PACKAGE=@sellable/mcp@0.1.880
|
|
8
8
|
ARG INSTALLER_INTEGRITY
|
|
9
9
|
ARG MCP_INTEGRITY=sha512-+Fo8aQlYduLaQMQff+ZA25LeUhWZ7I7UH5DECpND84LQ+rHSjKeKFj4Zs93bVHXwQCIy2OLbr75y4f4+CyT57w==
|
|
10
10
|
|
|
11
|
-
RUN test "${INSTALLER_PACKAGE}" = "@sellable/install@0.1.
|
|
11
|
+
RUN test "${INSTALLER_PACKAGE}" = "@sellable/install@0.1.647" \
|
|
12
12
|
&& test "${MCP_PACKAGE}" = "@sellable/mcp@0.1.880" \
|
|
13
13
|
&& test -n "${INSTALLER_INTEGRITY}" \
|
|
14
14
|
&& test "$(npm view "${INSTALLER_PACKAGE}" dist.integrity)" = "${INSTALLER_INTEGRITY}" \
|
|
@@ -23,9 +23,9 @@ RUN test "${INSTALLER_PACKAGE}" = "@sellable/install@0.1.646" \
|
|
|
23
23
|
&& mkdir -p /opt/sellable-agent/install-root /opt/sellable-agent/mcp-root \
|
|
24
24
|
&& npm install --prefix /opt/sellable-agent/install-root --omit=dev --ignore-scripts --no-audit --no-fund "${INSTALLER_PACKAGE}" \
|
|
25
25
|
&& npm install --prefix /opt/sellable-agent/mcp-root --omit=dev --ignore-scripts --no-audit --no-fund "${MCP_PACKAGE}" \
|
|
26
|
-
&& node --input-type=module -e "import { readFileSync } from 'node:fs'; const install = JSON.parse(readFileSync('/opt/sellable-agent/install-root/node_modules/@sellable/install/package.json')); const mcp = JSON.parse(readFileSync('/opt/sellable-agent/mcp-root/node_modules/@sellable/mcp/package.json')); if (install.name !== '@sellable/install' || install.version !== '0.1.
|
|
26
|
+
&& node --input-type=module -e "import { readFileSync } from 'node:fs'; const install = JSON.parse(readFileSync('/opt/sellable-agent/install-root/node_modules/@sellable/install/package.json')); const mcp = JSON.parse(readFileSync('/opt/sellable-agent/mcp-root/node_modules/@sellable/mcp/package.json')); if (install.name !== '@sellable/install' || install.version !== '0.1.647' || mcp.name !== '@sellable/mcp' || mcp.version !== '0.1.880') throw new Error('package identity rejected');" \
|
|
27
27
|
&& node --input-type=module -e "import { buildExternalRuntimeClosure } from '/opt/sellable-agent/install-root/node_modules/@sellable/install/lib/sellable-agent/external-runtime-builder.mjs'; const built = buildExternalRuntimeClosure({ mcpPackageRoot: '/opt/sellable-agent/mcp-root/node_modules/@sellable/mcp', mcpNodeModulesRoot: '/opt/sellable-agent/mcp-root/node_modules', hermesSourceRoot: '/opt/hermes', ownerUid: 0, ownerGid: 0 }); if (!built.closureDigest) throw new Error('runtime closure rejected');" \
|
|
28
|
-
&& node --input-type=module -e "import { chmodSync, writeFileSync } from 'node:fs'; const release = { installerPackage: '@sellable/install@0.1.
|
|
28
|
+
&& node --input-type=module -e "import { chmodSync, writeFileSync } from 'node:fs'; const release = { installerPackage: '@sellable/install@0.1.647', installerIntegrity: process.argv[1], mcpPackage: '@sellable/mcp@0.1.880', mcpIntegrity: process.argv[2] }; writeFileSync('/opt/sellable-agent/release.json', JSON.stringify(release) + '\\n', { mode: 0o444 }); chmodSync('/opt/sellable-agent/release.json', 0o444);" "${INSTALLER_INTEGRITY}" "${MCP_INTEGRITY}" \
|
|
29
29
|
&& npm cache clean --force
|
|
30
30
|
|
|
31
31
|
COPY entrypoint.sh /usr/local/bin/sellable-agent-container-entrypoint
|
package/container/README.md
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
This image is a dedicated Agent worker/runtime boundary beside an existing Hermes dashboard. It never replaces or reconfigures the dashboard container.
|
|
4
4
|
|
|
5
5
|
Build from this directory after
|
|
6
|
-
`@sellable/install@0.1.
|
|
6
|
+
`@sellable/install@0.1.647` is
|
|
7
7
|
published:
|
|
8
8
|
|
|
9
9
|
```sh
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
import { existsSync, lstatSync, readdirSync, rmSync } from "node:fs";
|
|
2
|
+
import { basename, dirname, isAbsolute, join, resolve } from "node:path";
|
|
3
|
+
|
|
4
|
+
const ABANDONED_BACKUP_PREFIXES = Object.freeze([
|
|
5
|
+
".user-state-",
|
|
6
|
+
".legacy-user-state-",
|
|
7
|
+
]);
|
|
8
|
+
|
|
9
|
+
function canonicalRoot(value, code) {
|
|
10
|
+
if (
|
|
11
|
+
typeof value !== "string" ||
|
|
12
|
+
!isAbsolute(value) ||
|
|
13
|
+
resolve(value) !== value
|
|
14
|
+
) {
|
|
15
|
+
throw new Error(code);
|
|
16
|
+
}
|
|
17
|
+
return value;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
function directoryEntries(root, code) {
|
|
21
|
+
if (!existsSync(root)) return [];
|
|
22
|
+
const stat = lstatSync(root);
|
|
23
|
+
if (stat.isSymbolicLink() || !stat.isDirectory()) {
|
|
24
|
+
throw new Error(code);
|
|
25
|
+
}
|
|
26
|
+
return readdirSync(root);
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
function removeDirectDirectory(root, target, code) {
|
|
30
|
+
if (dirname(target) !== root || basename(target) === "") {
|
|
31
|
+
throw new Error(code);
|
|
32
|
+
}
|
|
33
|
+
if (!existsSync(target)) return false;
|
|
34
|
+
const stat = lstatSync(target);
|
|
35
|
+
if (stat.isSymbolicLink() || !stat.isDirectory()) {
|
|
36
|
+
throw new Error(code);
|
|
37
|
+
}
|
|
38
|
+
rmSync(target, { recursive: true });
|
|
39
|
+
return true;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
/**
|
|
43
|
+
* A process restart proves these staging directories have no live owner.
|
|
44
|
+
* Remove only scratch names created by Sellable's snapshot/profile staging;
|
|
45
|
+
* completed backup archives and the active profile are never candidates.
|
|
46
|
+
*/
|
|
47
|
+
export function pruneAbandonedRuntimeScratch({ hermesRoot, profilesRoot }) {
|
|
48
|
+
const safeHermesRoot = canonicalRoot(
|
|
49
|
+
hermesRoot,
|
|
50
|
+
"runtime_scratch_hermes_root_rejected"
|
|
51
|
+
);
|
|
52
|
+
const safeProfilesRoot = canonicalRoot(
|
|
53
|
+
profilesRoot,
|
|
54
|
+
"runtime_scratch_profiles_root_rejected"
|
|
55
|
+
);
|
|
56
|
+
const backupsRoot = join(safeHermesRoot, "backups");
|
|
57
|
+
const removed = [];
|
|
58
|
+
|
|
59
|
+
for (const name of directoryEntries(
|
|
60
|
+
backupsRoot,
|
|
61
|
+
"runtime_scratch_backups_root_rejected"
|
|
62
|
+
)) {
|
|
63
|
+
if (!ABANDONED_BACKUP_PREFIXES.some((prefix) => name.startsWith(prefix))) {
|
|
64
|
+
continue;
|
|
65
|
+
}
|
|
66
|
+
if (
|
|
67
|
+
removeDirectDirectory(
|
|
68
|
+
backupsRoot,
|
|
69
|
+
join(backupsRoot, name),
|
|
70
|
+
"runtime_scratch_backup_candidate_rejected"
|
|
71
|
+
)
|
|
72
|
+
) {
|
|
73
|
+
removed.push(`backups/${name}`);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
const profileStagingRoot = join(safeProfilesRoot, ".staging");
|
|
78
|
+
if (
|
|
79
|
+
removeDirectDirectory(
|
|
80
|
+
safeProfilesRoot,
|
|
81
|
+
profileStagingRoot,
|
|
82
|
+
"runtime_scratch_profile_staging_rejected"
|
|
83
|
+
)
|
|
84
|
+
) {
|
|
85
|
+
removed.push("profiles/.staging");
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
return {
|
|
89
|
+
ok: true,
|
|
90
|
+
code: "abandoned_runtime_scratch_pruned",
|
|
91
|
+
removed,
|
|
92
|
+
};
|
|
93
|
+
}
|
|
@@ -103,6 +103,7 @@ import {
|
|
|
103
103
|
prepareAdminStateGeneration,
|
|
104
104
|
recoverAdminStateReceiptMismatch,
|
|
105
105
|
} from "./admin-state-generation.mjs";
|
|
106
|
+
import { pruneAbandonedRuntimeScratch } from "../abandoned-runtime-scratch.mjs";
|
|
106
107
|
|
|
107
108
|
export const ADMIN_RUNTIME_SETTINGS_DIRECTORY =
|
|
108
109
|
"/run/sellable-agent/admin-settings";
|
|
@@ -3285,6 +3286,19 @@ async function runAdminProduction() {
|
|
|
3285
3286
|
) {
|
|
3286
3287
|
throw new Error("admin_runtime_configuration_rejected");
|
|
3287
3288
|
}
|
|
3289
|
+
const scratch = pruneAbandonedRuntimeScratch({
|
|
3290
|
+
hermesRoot: DATA_ROOT,
|
|
3291
|
+
profilesRoot: PROFILES_ROOT,
|
|
3292
|
+
});
|
|
3293
|
+
if (scratch.removed.length > 0) {
|
|
3294
|
+
process.stderr.write(
|
|
3295
|
+
`${JSON.stringify({
|
|
3296
|
+
ok: true,
|
|
3297
|
+
code: scratch.code,
|
|
3298
|
+
removed: scratch.removed,
|
|
3299
|
+
})}\n`
|
|
3300
|
+
);
|
|
3301
|
+
}
|
|
3288
3302
|
await sodium.ready;
|
|
3289
3303
|
await proveInstalledPackages();
|
|
3290
3304
|
let oidcToken = await obtainFlyOidcToken({ audience: AUDIENCE });
|
|
@@ -8,7 +8,7 @@ ENV PLAYWRIGHT_BROWSERS_PATH=/opt/hermes/.playwright
|
|
|
8
8
|
|
|
9
9
|
ARG MCP_PACKAGE=@sellable/mcp@0.1.880
|
|
10
10
|
ARG MCP_INTEGRITY=sha512-+Fo8aQlYduLaQMQff+ZA25LeUhWZ7I7UH5DECpND84LQ+rHSjKeKFj4Zs93bVHXwQCIy2OLbr75y4f4+CyT57w==
|
|
11
|
-
ARG INSTALLER_PACKAGE=@sellable/install@0.1.
|
|
11
|
+
ARG INSTALLER_PACKAGE=@sellable/install@0.1.647
|
|
12
12
|
ARG ADMIN_MCP_PACKAGE=@sellable/admin-mcp@0.1.186-wip.phase158.20260802034727
|
|
13
13
|
ARG ADMIN_MCP_INTEGRITY=sha512-qYNew5wd2IfgVcp1UYOG9QvpF/8Mx19YJ5HQtMKzvSfUf3evePjtaKsoXLf2C/GUJ5QlLlHJo84VWOI3V01+9A==
|
|
14
14
|
ARG TUS_JS_CLIENT_VERSION=4.3.1
|
|
@@ -105,7 +105,7 @@ const BOOT_SESSION_ID = randomUUID();
|
|
|
105
105
|
const HERMES_VERSION = process.env.SELLABLE_AGENT_HERMES_VERSION ?? "0.20.0";
|
|
106
106
|
const INSTALLER_PACKAGE =
|
|
107
107
|
process.env.SELLABLE_AGENT_INSTALLER_PACKAGE ??
|
|
108
|
-
"@sellable/install@0.1.
|
|
108
|
+
"@sellable/install@0.1.647";
|
|
109
109
|
const MCP_PACKAGE =
|
|
110
110
|
process.env.SELLABLE_AGENT_MCP_PACKAGE ?? "@sellable/mcp@0.1.880";
|
|
111
111
|
const DEFAULT_PROFILE_BUNDLE_ROOT =
|
|
@@ -38,7 +38,7 @@ import { installAgentHostServices } from "./service-installer.mjs";
|
|
|
38
38
|
const PACKAGE_ROOT = resolve(dirname(fileURLToPath(import.meta.url)), "../..");
|
|
39
39
|
const VERSION = "sellable-agent-host-bootstrap/v1";
|
|
40
40
|
const RECEIPT_VERSION = "sellable-agent-host-registration/v1";
|
|
41
|
-
const INSTALLER_PACKAGE = "@sellable/install@0.1.
|
|
41
|
+
const INSTALLER_PACKAGE = "@sellable/install@0.1.647";
|
|
42
42
|
const MCP_PACKAGE = "@sellable/mcp@0.1.880";
|
|
43
43
|
const HERMES_VERSION = "0.18.0";
|
|
44
44
|
const SHA256 = /^[a-f0-9]{64}$/;
|
|
@@ -1547,7 +1547,7 @@ export function compileClaimToProfileDesired(activeClaim, config) {
|
|
|
1547
1547
|
pinned.hermesCli !== "hermes" ||
|
|
1548
1548
|
pinned.hermesVersion !== "0.18.0" ||
|
|
1549
1549
|
pinned.installerPackage !==
|
|
1550
|
-
"@sellable/install@0.1.
|
|
1550
|
+
"@sellable/install@0.1.647" ||
|
|
1551
1551
|
pinned.mcpPackage !== "@sellable/mcp@0.1.880" ||
|
|
1552
1552
|
!Array.isArray(policy.toolInclude) ||
|
|
1553
1553
|
policy.toolInclude.length === 0 ||
|
|
@@ -283,7 +283,7 @@ function validateDesired(desired) {
|
|
|
283
283
|
desired.hermesCli !== "hermes" ||
|
|
284
284
|
desired.hermesVersion !== "0.18.0" ||
|
|
285
285
|
desired.installerPackage !==
|
|
286
|
-
"@sellable/install@0.1.
|
|
286
|
+
"@sellable/install@0.1.647" ||
|
|
287
287
|
desired.mcpPackage !== "@sellable/mcp@0.1.880" ||
|
|
288
288
|
!Array.isArray(desired.toolInclude) ||
|
|
289
289
|
desired.toolInclude.length === 0 ||
|
|
@@ -26,7 +26,7 @@ import { deriveContainedProfileId } from "./profile-materializer.mjs";
|
|
|
26
26
|
|
|
27
27
|
export const PROVISIONING_ACTION = "PROVISION_HERMES_PROFILE";
|
|
28
28
|
export const PINNED_INSTALL_PACKAGE =
|
|
29
|
-
"@sellable/install@0.1.
|
|
29
|
+
"@sellable/install@0.1.647";
|
|
30
30
|
export const PINNED_MCP_PACKAGE = "@sellable/mcp@0.1.880";
|
|
31
31
|
const PINNED_INSTALL_VERSION = PINNED_INSTALL_PACKAGE.slice(
|
|
32
32
|
PINNED_INSTALL_PACKAGE.lastIndexOf("@") + 1
|