@cat-factory/local-server 0.64.18 → 0.64.20
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/config.d.ts.map +1 -1
- package/dist/config.js +8 -28
- package/dist/config.js.map +1 -1
- package/dist/runtimes/containerRuntime.d.ts +11 -1
- package/dist/runtimes/containerRuntime.d.ts.map +1 -1
- package/dist/runtimes/containerRuntime.js +16 -2
- package/dist/runtimes/containerRuntime.js.map +1 -1
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +17 -2
- package/dist/server.js.map +1 -1
- package/package.json +10 -10
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAanE;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,EAAE,aAKnC,CAAA;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,aAAa,EAAE,CAGhF;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAanE;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,EAAE,aAKnC,CAAA;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,aAAa,EAAE,CAGhF;AAiFD;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAEzE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CA8E5E;AAED,qEAAqE;AACrE,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,SAAS,CAEjE"}
|
package/dist/config.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { loadNodeConfig } from '@cat-factory/node-server';
|
|
2
|
-
import { ENV_HELP,
|
|
2
|
+
import { ENV_HELP, configProblem, requireEncryptionKey, requireEnv } from '@cat-factory/server';
|
|
3
3
|
import { isOffValue } from './envFlags.js';
|
|
4
4
|
import { resolveHostAlias } from './runtimes/index.js';
|
|
5
5
|
// The one-shot fix we advertise whenever local mode can't boot for a missing/invalid mandatory
|
|
@@ -38,8 +38,6 @@ export function withLocalEnvCliAdvice(problems) {
|
|
|
38
38
|
// mode must enforce it on the raw secret too. 32 chars matches MIN_SESSION_SECRET_LENGTH
|
|
39
39
|
// in the Node loader.
|
|
40
40
|
const MIN_SESSION_SECRET_LENGTH = 32;
|
|
41
|
-
/** The system encryption key must decode to at least this many bytes (AES-256). */
|
|
42
|
-
const MIN_ENCRYPTION_KEY_BYTES = 32;
|
|
43
41
|
// The harness inbound-auth secret gates every call between this service and its agent
|
|
44
42
|
// containers, and local mode may be reachable on a LAN — so reject a trivially-guessable value.
|
|
45
43
|
const MIN_HARNESS_SECRET_LENGTH = 16;
|
|
@@ -74,10 +72,16 @@ const DEFAULT_LOCAL_SEARXNG_URL = 'http://localhost:8080';
|
|
|
74
72
|
* three in the right format.
|
|
75
73
|
*/
|
|
76
74
|
function requireStableSecret(env, name) {
|
|
75
|
+
// The encryption key's presence + base64 + AES-256-length validation is the shared, facade-wide
|
|
76
|
+
// invariant, so delegate it verbatim (identical message on Node, local, and the Worker) rather
|
|
77
|
+
// than re-implementing it here. The two length-only secrets below are local-mode-specific.
|
|
78
|
+
if (name === 'ENCRYPTION_KEY') {
|
|
79
|
+
return requireEncryptionKey(env.ENCRYPTION_KEY);
|
|
80
|
+
}
|
|
77
81
|
// Presence + trim + the ENV_HELP meaning/remedy come from the shared `requireEnv` (both these
|
|
78
82
|
// vars have an ENV_HELP entry whose remedy already points at `pnpm secrets` in deploy/local), so
|
|
79
83
|
// a missing/blank secret reports identically across the Node, local, and Worker facades. Local
|
|
80
|
-
// mode then layers its
|
|
84
|
+
// mode then layers its extra length invariant below.
|
|
81
85
|
const value = requireEnv(env, name);
|
|
82
86
|
// Local mode leaves the auth gate open by default, so a short session secret is a real
|
|
83
87
|
// token-forgery risk if the box is reachable on a LAN — reject it up front rather than
|
|
@@ -90,30 +94,6 @@ function requireStableSecret(env, name) {
|
|
|
90
94
|
docsUrl: ENV_HELP.AUTH_SESSION_SECRET.docsUrl,
|
|
91
95
|
});
|
|
92
96
|
}
|
|
93
|
-
// Validate the encryption key decodes to a full AES-256 key at config load, so a too-short
|
|
94
|
-
// key fails with a clear message here rather than deep inside the first cipher build.
|
|
95
|
-
if (name === 'ENCRYPTION_KEY') {
|
|
96
|
-
let bytes;
|
|
97
|
-
try {
|
|
98
|
-
bytes = base64urlToBytes(value);
|
|
99
|
-
}
|
|
100
|
-
catch {
|
|
101
|
-
throw configProblem({
|
|
102
|
-
key: 'ENCRYPTION_KEY',
|
|
103
|
-
summary: ENV_HELP.ENCRYPTION_KEY.summary,
|
|
104
|
-
remedy: 'It must be a valid base64-encoded key. Generate one with `pnpm secrets` in deploy/local.',
|
|
105
|
-
docsUrl: ENV_HELP.ENCRYPTION_KEY.docsUrl,
|
|
106
|
-
});
|
|
107
|
-
}
|
|
108
|
-
if (bytes.length < MIN_ENCRYPTION_KEY_BYTES) {
|
|
109
|
-
throw configProblem({
|
|
110
|
-
key: 'ENCRYPTION_KEY',
|
|
111
|
-
summary: ENV_HELP.ENCRYPTION_KEY.summary,
|
|
112
|
-
remedy: `Must decode to at least ${MIN_ENCRYPTION_KEY_BYTES} bytes (got ${bytes.length}). Generate one with \`pnpm secrets\` in deploy/local.`,
|
|
113
|
-
docsUrl: ENV_HELP.ENCRYPTION_KEY.docsUrl,
|
|
114
|
-
});
|
|
115
|
-
}
|
|
116
|
-
}
|
|
117
97
|
// Reject a too-short harness secret: local mode may be reachable on a LAN and this value is
|
|
118
98
|
// the only auth between the service and its agent containers.
|
|
119
99
|
if (name === 'HARNESS_SHARED_SECRET' && value.length < MIN_HARNESS_SECRET_LENGTH) {
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAEzD,OAAO,EAAE,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -161,14 +161,24 @@ export interface RuntimeProfile {
|
|
|
161
161
|
/** Which adapter implementation backs this runtime. */
|
|
162
162
|
family: 'docker' | 'apple';
|
|
163
163
|
}
|
|
164
|
+
/** The accepted `LOCAL_CONTAINER_RUNTIME` ids, in declaration order (for messages). */
|
|
165
|
+
export declare const RUNTIME_IDS: RuntimeId[];
|
|
164
166
|
/** Resolve the runtime profile for an id (defaults to docker for an unknown value). */
|
|
165
167
|
export declare function runtimeProfile(id: RuntimeId): RuntimeProfile;
|
|
166
168
|
/**
|
|
167
169
|
* The runtime selected by `LOCAL_CONTAINER_RUNTIME` (docker | podman | orbstack |
|
|
168
170
|
* colima | apple). Defaults to `docker`; an unrecognised value also falls back to
|
|
169
|
-
* docker (logged by the preflight). Explicit
|
|
171
|
+
* docker (logged by the preflight, see {@link unrecognizedRuntimeId}). Explicit
|
|
172
|
+
* selection is the supported path.
|
|
170
173
|
*/
|
|
171
174
|
export declare function resolveRuntimeId(env: NodeJS.ProcessEnv): RuntimeId;
|
|
175
|
+
/**
|
|
176
|
+
* The raw `LOCAL_CONTAINER_RUNTIME` value when it is SET but not one of the accepted
|
|
177
|
+
* runtime ids — i.e. the typo `resolveRuntimeId` silently fell back to `docker` for.
|
|
178
|
+
* Undefined when the var is unset or valid. The preflight logs this so an unrecognised
|
|
179
|
+
* value is visible at boot instead of silently running docker (error-message coverage A9).
|
|
180
|
+
*/
|
|
181
|
+
export declare function unrecognizedRuntimeId(env: NodeJS.ProcessEnv): string | undefined;
|
|
172
182
|
/**
|
|
173
183
|
* The effective host alias for the chosen runtime: an explicit `LOCAL_HARNESS_HOST_ALIAS`
|
|
174
184
|
* wins, else the runtime profile's default. Used to derive the PUBLIC_URL default so a
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"containerRuntime.d.ts","sourceRoot":"","sources":["../../src/runtimes/containerRuntime.ts"],"names":[],"mappings":"AAWA,6DAA6D;AAC7D,eAAO,MAAM,YAAY,OAAO,CAAA;AAEhC,8EAA8E;AAC9E,MAAM,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAA;AAE3F;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAM9F;AAED,gEAAgE;AAChE,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;CACb;AAED,8EAA8E;AAC9E,MAAM,WAAW,mBAAmB;IAClC;;;;;OAKG;IACH,SAAS,EAAE,OAAO,CAAA;IAClB;;;;;;;OAOG;IACH,OAAO,EAAE,OAAO,CAAA;CACjB;AAED,oFAAoF;AACpF,MAAM,WAAW,gBAAgB;IAC/B;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,YAAY,EAAE,MAAM,CAAA;IACpB,yFAAyF;IACzF,UAAU,EAAE,OAAO,CAAA;IACnB,iDAAiD;IACjD,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,0DAA0D;IAC1D,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC3B,8EAA8E;IAC9E,YAAY,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;IAC/C;;;;OAIG;IACH,IAAI,CAAC,EAAE,OAAO,CAAA;IACd;;;;;;;;;OASG;IACH,YAAY,CAAC,EAAE,KAAK,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAC3D;AAED;;;;;GAKG;AACH,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAA;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAAA;IAC1C,4FAA4F;IAC5F,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B;;;;;;;;;OASG;IACH,QAAQ,CAAC,oBAAoB,EAAE,OAAO,CAAA;IAEtC,6EAA6E;IAC7E,GAAG,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IACjE,2DAA2D;IAC3D,IAAI,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IACrE;;;;OAIG;IACH,QAAQ,CACN,IAAI,EAAE,aAAa,EACnB,WAAW,EAAE,MAAM,EACnB,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAAA;IACzC,kDAAkD;IAClD,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IACrE;;;;;OAKG;IACH,IAAI,CAAC,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAC/D,oDAAoD;IACpD,MAAM,CAAC,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC/D,2DAA2D;IAC3D,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC5D,qFAAqF;IACrF,UAAU,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAChD;;;;OAIG;IACH,eAAe,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;IACvD;;;;;OAKG;IACH,iBAAiB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,CAAA;CAC/F;AAED,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,UAAU,GAAG,QAAQ,GAAG,OAAO,CAAA;AAE7E,8FAA8F;AAC9F,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,SAAS,CAAA;IACb,gEAAgE;IAChE,MAAM,EAAE,MAAM,CAAA;IACd,6EAA6E;IAC7E,SAAS,EAAE,MAAM,CAAA;IACjB,gFAAgF;IAChF,cAAc,EAAE,OAAO,CAAA;IACvB,iFAAiF;IACjF,SAAS,EAAE,OAAO,CAAA;IAClB,oEAAoE;IACpE,OAAO,EAAE,OAAO,CAAA;IAChB,uDAAuD;IACvD,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAA;CAC3B;
|
|
1
|
+
{"version":3,"file":"containerRuntime.d.ts","sourceRoot":"","sources":["../../src/runtimes/containerRuntime.ts"],"names":[],"mappings":"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"}
|
|
@@ -87,7 +87,8 @@ const PROFILES = {
|
|
|
87
87
|
family: 'apple',
|
|
88
88
|
},
|
|
89
89
|
};
|
|
90
|
-
|
|
90
|
+
/** The accepted `LOCAL_CONTAINER_RUNTIME` ids, in declaration order (for messages). */
|
|
91
|
+
export const RUNTIME_IDS = Object.keys(PROFILES);
|
|
91
92
|
/** Resolve the runtime profile for an id (defaults to docker for an unknown value). */
|
|
92
93
|
export function runtimeProfile(id) {
|
|
93
94
|
return PROFILES[id] ?? PROFILES.docker;
|
|
@@ -95,7 +96,8 @@ export function runtimeProfile(id) {
|
|
|
95
96
|
/**
|
|
96
97
|
* The runtime selected by `LOCAL_CONTAINER_RUNTIME` (docker | podman | orbstack |
|
|
97
98
|
* colima | apple). Defaults to `docker`; an unrecognised value also falls back to
|
|
98
|
-
* docker (logged by the preflight). Explicit
|
|
99
|
+
* docker (logged by the preflight, see {@link unrecognizedRuntimeId}). Explicit
|
|
100
|
+
* selection is the supported path.
|
|
99
101
|
*/
|
|
100
102
|
export function resolveRuntimeId(env) {
|
|
101
103
|
const raw = env.LOCAL_CONTAINER_RUNTIME?.trim().toLowerCase();
|
|
@@ -103,6 +105,18 @@ export function resolveRuntimeId(env) {
|
|
|
103
105
|
return raw;
|
|
104
106
|
return 'docker';
|
|
105
107
|
}
|
|
108
|
+
/**
|
|
109
|
+
* The raw `LOCAL_CONTAINER_RUNTIME` value when it is SET but not one of the accepted
|
|
110
|
+
* runtime ids — i.e. the typo `resolveRuntimeId` silently fell back to `docker` for.
|
|
111
|
+
* Undefined when the var is unset or valid. The preflight logs this so an unrecognised
|
|
112
|
+
* value is visible at boot instead of silently running docker (error-message coverage A9).
|
|
113
|
+
*/
|
|
114
|
+
export function unrecognizedRuntimeId(env) {
|
|
115
|
+
const raw = env.LOCAL_CONTAINER_RUNTIME?.trim();
|
|
116
|
+
if (!raw)
|
|
117
|
+
return undefined;
|
|
118
|
+
return RUNTIME_IDS.includes(raw.toLowerCase()) ? undefined : raw;
|
|
119
|
+
}
|
|
106
120
|
/**
|
|
107
121
|
* The effective host alias for the chosen runtime: an explicit `LOCAL_HARNESS_HOST_ALIAS`
|
|
108
122
|
* wins, else the runtime profile's default. Used to derive the PUBLIC_URL default so a
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"containerRuntime.js","sourceRoot":"","sources":["../../src/runtimes/containerRuntime.ts"],"names":[],"mappings":"AAAA,sFAAsF;AACtF,oFAAoF;AACpF,gFAAgF;AAChF,sFAAsF;AACtF,wFAAwF;AACxF,uFAAuF;AACvF,EAAE;AACF,kFAAkF;AAClF,+EAA+E;AAC/E,6DAA6D;AAE7D,6DAA6D;AAC7D,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAA;AAKhC;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAAC,MAAc,EAAE,MAAc,EAAE,SAAkB;IACpF,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;SACzB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACpB,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,IAAI,CAAC,CAAA;IACb,OAAO,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;AACvE,CAAC;AAyJD,MAAM,QAAQ,GAAsC;IAClD,gFAAgF;IAChF,gFAAgF;IAChF,MAAM,EAAE;QACN,EAAE,EAAE,QAAQ;QACZ,MAAM,EAAE,QAAQ;QAChB,SAAS,EAAE,sBAAsB;QACjC,cAAc,EAAE,IAAI;QACpB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,QAAQ;KACjB;IACD,uFAAuF;IACvF,8FAA8F;IAC9F,0EAA0E;IAC1E,MAAM,EAAE;QACN,EAAE,EAAE,QAAQ;QACZ,MAAM,EAAE,QAAQ;QAChB,SAAS,EAAE,sBAAsB;QACjC,cAAc,EAAE,IAAI;QACpB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,QAAQ;KACjB;IACD,oFAAoF;IACpF,2EAA2E;IAC3E,QAAQ,EAAE;QACR,EAAE,EAAE,UAAU;QACd,MAAM,EAAE,QAAQ;QAChB,SAAS,EAAE,sBAAsB;QACjC,cAAc,EAAE,IAAI;QACpB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,QAAQ;KACjB;IACD,4EAA4E;IAC5E,mFAAmF;IACnF,sFAAsF;IACtF,iFAAiF;IACjF,4EAA4E;IAC5E,MAAM,EAAE;QACN,EAAE,EAAE,QAAQ;QACZ,MAAM,EAAE,QAAQ;QAChB,SAAS,EAAE,oBAAoB;QAC/B,cAAc,EAAE,KAAK;QACrB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,QAAQ;KACjB;IACD,qFAAqF;IACrF,oFAAoF;IACpF,wFAAwF;IACxF,uFAAuF;IACvF,oEAAoE;IACpE,KAAK,EAAE;QACL,EAAE,EAAE,OAAO;QACX,MAAM,EAAE,WAAW;QACnB,SAAS,EAAE,cAAc;QACzB,cAAc,EAAE,KAAK;QACrB,SAAS,EAAE,KAAK;QAChB,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,OAAO;KAChB;CACF,CAAA;AAED,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"containerRuntime.js","sourceRoot":"","sources":["../../src/runtimes/containerRuntime.ts"],"names":[],"mappings":"AAAA,sFAAsF;AACtF,oFAAoF;AACpF,gFAAgF;AAChF,sFAAsF;AACtF,wFAAwF;AACxF,uFAAuF;AACvF,EAAE;AACF,kFAAkF;AAClF,+EAA+E;AAC/E,6DAA6D;AAE7D,6DAA6D;AAC7D,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAA;AAKhC;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAAC,MAAc,EAAE,MAAc,EAAE,SAAkB;IACpF,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;SACzB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACpB,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,IAAI,CAAC,CAAA;IACb,OAAO,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;AACvE,CAAC;AAyJD,MAAM,QAAQ,GAAsC;IAClD,gFAAgF;IAChF,gFAAgF;IAChF,MAAM,EAAE;QACN,EAAE,EAAE,QAAQ;QACZ,MAAM,EAAE,QAAQ;QAChB,SAAS,EAAE,sBAAsB;QACjC,cAAc,EAAE,IAAI;QACpB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,QAAQ;KACjB;IACD,uFAAuF;IACvF,8FAA8F;IAC9F,0EAA0E;IAC1E,MAAM,EAAE;QACN,EAAE,EAAE,QAAQ;QACZ,MAAM,EAAE,QAAQ;QAChB,SAAS,EAAE,sBAAsB;QACjC,cAAc,EAAE,IAAI;QACpB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,QAAQ;KACjB;IACD,oFAAoF;IACpF,2EAA2E;IAC3E,QAAQ,EAAE;QACR,EAAE,EAAE,UAAU;QACd,MAAM,EAAE,QAAQ;QAChB,SAAS,EAAE,sBAAsB;QACjC,cAAc,EAAE,IAAI;QACpB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,QAAQ;KACjB;IACD,4EAA4E;IAC5E,mFAAmF;IACnF,sFAAsF;IACtF,iFAAiF;IACjF,4EAA4E;IAC5E,MAAM,EAAE;QACN,EAAE,EAAE,QAAQ;QACZ,MAAM,EAAE,QAAQ;QAChB,SAAS,EAAE,oBAAoB;QAC/B,cAAc,EAAE,KAAK;QACrB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,QAAQ;KACjB;IACD,qFAAqF;IACrF,oFAAoF;IACpF,wFAAwF;IACxF,uFAAuF;IACvF,oEAAoE;IACpE,KAAK,EAAE;QACL,EAAE,EAAE,OAAO;QACX,MAAM,EAAE,WAAW;QACnB,SAAS,EAAE,cAAc;QACzB,cAAc,EAAE,KAAK;QACrB,SAAS,EAAE,KAAK;QAChB,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,OAAO;KAChB;CACF,CAAA;AAED,uFAAuF;AACvF,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAgB,CAAA;AAE/D,uFAAuF;AACvF,MAAM,UAAU,cAAc,CAAC,EAAa;IAC1C,OAAO,QAAQ,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAA;AACxC,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAAC,GAAsB;IACrD,MAAM,GAAG,GAAG,GAAG,CAAC,uBAAuB,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;IAC7D,IAAI,GAAG,IAAK,WAAwB,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,GAAgB,CAAA;IAC3E,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAC,GAAsB;IAC1D,MAAM,GAAG,GAAG,GAAG,CAAC,uBAAuB,EAAE,IAAI,EAAE,CAAA;IAC/C,IAAI,CAAC,GAAG;QAAE,OAAO,SAAS,CAAA;IAC1B,OAAQ,WAAwB,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAA;AAChF,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,GAAsB;IACrD,MAAM,QAAQ,GAAG,GAAG,CAAC,wBAAwB,EAAE,IAAI,EAAE,CAAA;IACrD,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAA;IAC7B,OAAO,cAAc,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAA;AACxD,CAAC"}
|
package/dist/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,wBAAwB,EAM7B,KAAK,EACN,MAAM,0BAA0B,CAAA;AAGjC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,wBAAwB,EAM7B,KAAK,EACN,MAAM,0BAA0B,CAAA;AAGjC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAoClE,wBAAsB,UAAU,CAC9B,OAAO,GAAE;IACP,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;IACvB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;IACrC;;;;;OAKG;IACH,wBAAwB,CAAC,EAAE,wBAAwB,CAAA;IACnD;;;;;;;;;;;;OAYG;IACH,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;IACrC;;;;;;;OAOG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAA;CACzB,GACL,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAkB5C"}
|
package/dist/server.js
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { execFile } from 'node:child_process';
|
|
2
2
|
import { promisify } from 'node:util';
|
|
3
3
|
import { DEFAULT_APP_CACHES_PROFILE, NodeRealtimeHub, createApp, serveAppWithRealtime, serveMisconfigured, start, } from '@cat-factory/node-server';
|
|
4
|
-
import { isConfigValidationError, logger } from '@cat-factory/server';
|
|
4
|
+
import { DOCS, ENV_VARS_ANCHORS, isConfigValidationError, logger } from '@cat-factory/server';
|
|
5
5
|
import { validateRegistrationsOnce } from '@cat-factory/orchestration';
|
|
6
6
|
import { applyLocalDefaults, withLocalEnvCliAdvice } from './config.js';
|
|
7
7
|
import { buildLocalContainer } from './container.js';
|
|
8
8
|
import { githubPatCreationUrl } from './github.js';
|
|
9
9
|
import { RECOMMENDED_HARNESS_IMAGE, refreshHarnessImage, resolveHarnessImage, resolveRefreshMode, } from './harnessImage.js';
|
|
10
10
|
import { isMothershipMode } from './mothership.js';
|
|
11
|
-
import { createRuntimeAdapter, resolveRuntimeId } from './runtimes/index.js';
|
|
11
|
+
import { RUNTIME_IDS, createRuntimeAdapter, resolveRuntimeId, unrecognizedRuntimeId, } from './runtimes/index.js';
|
|
12
12
|
const execFileAsync = promisify(execFile);
|
|
13
13
|
// Boot the local-mode service. It reuses the Node facade's `start()` — Postgres +
|
|
14
14
|
// pg-boss + the execution worker + sweepers, served over @hono/node-server — passing
|
|
@@ -191,6 +191,21 @@ async function startLocalMothership(env, host, agentKindRegistry, initiativePres
|
|
|
191
191
|
* container-backed agent kinds then fail), mirroring how a missing image is handled.
|
|
192
192
|
*/
|
|
193
193
|
async function preflightRuntime(localized) {
|
|
194
|
+
// Name a typo'd LOCAL_CONTAINER_RUNTIME at boot: `resolveRuntimeId` silently falls back to
|
|
195
|
+
// docker for any unrecognised value, so without this a `LOCAL_CONTAINER_RUNTIME=pod man` runs
|
|
196
|
+
// docker with no signal. Greppable single line: the rejected value, the accepted set, the
|
|
197
|
+
// fallback taken (error-message coverage A9).
|
|
198
|
+
const rejectedRuntime = unrecognizedRuntimeId(localized);
|
|
199
|
+
if (rejectedRuntime !== undefined) {
|
|
200
|
+
logger.warn({
|
|
201
|
+
rejected: rejectedRuntime,
|
|
202
|
+
accepted: RUNTIME_IDS,
|
|
203
|
+
fallback: 'docker',
|
|
204
|
+
docsUrl: DOCS.envVars(ENV_VARS_ANCHORS.localMode),
|
|
205
|
+
}, `local mode: LOCAL_CONTAINER_RUNTIME='${rejectedRuntime}' is not a recognised runtime ` +
|
|
206
|
+
`(accepted: ${RUNTIME_IDS.join(', ')}) — falling back to 'docker'. See ` +
|
|
207
|
+
`${DOCS.envVars(ENV_VARS_ANCHORS.localMode)}.`);
|
|
208
|
+
}
|
|
194
209
|
const adapter = createRuntimeAdapter(localized);
|
|
195
210
|
logger.info({
|
|
196
211
|
runtime: resolveRuntimeId(localized),
|
package/dist/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAErC,OAAO,EAGL,0BAA0B,EAC1B,eAAe,EACf,SAAS,EACT,oBAAoB,EACpB,kBAAkB,EAClB,KAAK,GACN,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAE,uBAAuB,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cat-factory/local-server",
|
|
3
|
-
"version": "0.64.
|
|
3
|
+
"version": "0.64.20",
|
|
4
4
|
"description": "Local-mode runtime facade for the Agent Architecture Board: the @cat-factory/node-server stack with agent jobs run as local Docker/Podman containers and GitHub accessed via a personal access token — a developer can run the whole product on their own machine.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -26,22 +26,22 @@
|
|
|
26
26
|
"dependencies": {
|
|
27
27
|
"@hono/node-server": "^2.0.8",
|
|
28
28
|
"drizzle-orm": "1.0.0-rc.4",
|
|
29
|
-
"@cat-factory/agents": "0.53.
|
|
29
|
+
"@cat-factory/agents": "0.53.2",
|
|
30
30
|
"@cat-factory/contracts": "0.126.0",
|
|
31
31
|
"@cat-factory/executor-harness": "1.43.0",
|
|
32
|
-
"@cat-factory/gitlab": "0.7.
|
|
33
|
-
"@cat-factory/integrations": "0.81.
|
|
34
|
-
"@cat-factory/
|
|
35
|
-
"@cat-factory/
|
|
36
|
-
"@cat-factory/orchestration": "0.105.
|
|
37
|
-
"@cat-factory/server": "0.
|
|
32
|
+
"@cat-factory/gitlab": "0.7.54",
|
|
33
|
+
"@cat-factory/integrations": "0.81.2",
|
|
34
|
+
"@cat-factory/node-server": "0.92.3",
|
|
35
|
+
"@cat-factory/kernel": "0.119.0",
|
|
36
|
+
"@cat-factory/orchestration": "0.105.2",
|
|
37
|
+
"@cat-factory/server": "0.110.1"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
40
|
"@types/node": "^26.1.0",
|
|
41
41
|
"typescript": "7.0.1-rc",
|
|
42
42
|
"vitest": "^4.1.9",
|
|
43
|
-
"@cat-factory/conformance": "0.10.
|
|
44
|
-
"@cat-factory/gates": "0.5.
|
|
43
|
+
"@cat-factory/conformance": "0.10.93",
|
|
44
|
+
"@cat-factory/gates": "0.5.16"
|
|
45
45
|
},
|
|
46
46
|
"scripts": {
|
|
47
47
|
"build": "tsc -b tsconfig.build.json",
|