@itphx/synth-shared 0.7.2 → 0.8.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/config/defaults.d.ts.map +1 -1
- package/dist/config/defaults.js +44 -0
- package/dist/config/defaults.js.map +1 -1
- package/dist/config/defaults.test.js +33 -0
- package/dist/config/defaults.test.js.map +1 -1
- package/dist/config/loader.d.ts +2 -0
- package/dist/config/loader.d.ts.map +1 -1
- package/dist/config/loader.js +10 -5
- package/dist/config/loader.js.map +1 -1
- package/dist/config/resolve.d.ts +35 -6
- package/dist/config/resolve.d.ts.map +1 -1
- package/dist/config/resolve.js +98 -18
- package/dist/config/resolve.js.map +1 -1
- package/dist/config/resolve.test.js +244 -1
- package/dist/config/resolve.test.js.map +1 -1
- package/dist/config/types.d.ts +711 -78
- package/dist/config/types.d.ts.map +1 -1
- package/dist/config/types.js +138 -1
- package/dist/config/types.js.map +1 -1
- package/dist/config/types.test.js +78 -1
- package/dist/config/types.test.js.map +1 -1
- package/dist/i18n/index.d.ts +1 -1
- package/dist/i18n/index.d.ts.map +1 -1
- package/dist/i18n/index.js +116 -0
- package/dist/i18n/index.js.map +1 -1
- package/dist/index.d.ts +3 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -2
- package/dist/index.js.map +1 -1
- package/dist/schemas/index.d.ts +558 -24
- package/dist/schemas/index.d.ts.map +1 -1
- package/dist/schemas/index.js +244 -7
- package/dist/schemas/index.js.map +1 -1
- package/dist/schemas/index.test.d.ts +2 -0
- package/dist/schemas/index.test.d.ts.map +1 -0
- package/dist/schemas/index.test.js +154 -0
- package/dist/schemas/index.test.js.map +1 -0
- package/dist/skills/frontmatter.d.ts +21 -0
- package/dist/skills/frontmatter.d.ts.map +1 -0
- package/dist/skills/frontmatter.js +70 -0
- package/dist/skills/frontmatter.js.map +1 -0
- package/dist/skills/frontmatter.test.d.ts +2 -0
- package/dist/skills/frontmatter.test.d.ts.map +1 -0
- package/dist/skills/frontmatter.test.js +65 -0
- package/dist/skills/frontmatter.test.js.map +1 -0
- package/dist/types/commands.d.ts +128 -0
- package/dist/types/commands.d.ts.map +1 -0
- package/dist/types/commands.js +11 -0
- package/dist/types/commands.js.map +1 -0
- package/dist/types/index.d.ts +137 -12
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/index.js +68 -5
- package/dist/types/index.js.map +1 -1
- package/dist/types/permission.d.ts +5 -4
- package/dist/types/permission.d.ts.map +1 -1
- package/dist/types/skills.d.ts +136 -0
- package/dist/types/skills.d.ts.map +1 -0
- package/dist/types/skills.js +18 -0
- package/dist/types/skills.js.map +1 -0
- package/dist/utils/index.d.ts +1 -0
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +2 -0
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/workspace.d.ts +14 -0
- package/dist/utils/workspace.d.ts.map +1 -0
- package/dist/utils/workspace.js +35 -0
- package/dist/utils/workspace.js.map +1 -0
- package/dist/utils/workspace.test.d.ts +2 -0
- package/dist/utils/workspace.test.d.ts.map +1 -0
- package/dist/utils/workspace.test.js +40 -0
- package/dist/utils/workspace.test.js.map +1 -0
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../src/config/defaults.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAG9C,eAAO,MAAM,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../src/config/defaults.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAG9C,eAAO,MAAM,aAAa,EAAE,WAuN3B,CAAC"}
|
package/dist/config/defaults.js
CHANGED
|
@@ -10,6 +10,7 @@ export const defaultConfig = {
|
|
|
10
10
|
dataDir: '/var/synth/data',
|
|
11
11
|
workspacesRoot: '',
|
|
12
12
|
defaultWorkspace: '',
|
|
13
|
+
workspaceOutsideRoot: '',
|
|
13
14
|
},
|
|
14
15
|
auth: {
|
|
15
16
|
debugMode: false,
|
|
@@ -92,6 +93,47 @@ export const defaultConfig = {
|
|
|
92
93
|
tools: [],
|
|
93
94
|
},
|
|
94
95
|
},
|
|
96
|
+
skills: {
|
|
97
|
+
paths: [],
|
|
98
|
+
urls: [],
|
|
99
|
+
trustedProjectDirs: [],
|
|
100
|
+
inlineShell: false,
|
|
101
|
+
toolsets: {},
|
|
102
|
+
},
|
|
103
|
+
commands: {
|
|
104
|
+
paths: [],
|
|
105
|
+
bundlesPath: 'skill-bundles',
|
|
106
|
+
conflict: {
|
|
107
|
+
mode: 'bundle-wins',
|
|
108
|
+
namespacePrefix: false,
|
|
109
|
+
},
|
|
110
|
+
maxArgumentsLength: 10_000,
|
|
111
|
+
maxRenderedBytes: 200_000,
|
|
112
|
+
},
|
|
113
|
+
instructions: {
|
|
114
|
+
enabled: true,
|
|
115
|
+
claudeCompat: true,
|
|
116
|
+
contextCompat: false,
|
|
117
|
+
headRatio: 0.7,
|
|
118
|
+
tailRatio: 0.2,
|
|
119
|
+
windowRatio: 0.06,
|
|
120
|
+
minChars: 20_000,
|
|
121
|
+
maxCharsCeiling: 500_000,
|
|
122
|
+
lazy: {
|
|
123
|
+
enabled: true,
|
|
124
|
+
maxAncestors: 5,
|
|
125
|
+
maxChars: 8_000,
|
|
126
|
+
excludeDirs: ['node_modules', '.git', 'vendor', 'dist', 'build', '.next', 'coverage', 'tmp', '.cache'],
|
|
127
|
+
},
|
|
128
|
+
fetch: {
|
|
129
|
+
timeoutMs: 5_000,
|
|
130
|
+
cacheTtlSec: 3_600,
|
|
131
|
+
maxBytes: 262_144,
|
|
132
|
+
},
|
|
133
|
+
sources: [],
|
|
134
|
+
excludeProjects: [],
|
|
135
|
+
allowInstallTreeFallback: false,
|
|
136
|
+
},
|
|
95
137
|
router: {
|
|
96
138
|
enabled: true,
|
|
97
139
|
strategy: 'auto',
|
|
@@ -169,6 +211,8 @@ export const defaultConfig = {
|
|
|
169
211
|
protectedPaths: {
|
|
170
212
|
enabled: true,
|
|
171
213
|
},
|
|
214
|
+
// Пусто — core использует файл {dataDir}/secrets/master.key (AD-076).
|
|
215
|
+
secretKey: '',
|
|
172
216
|
},
|
|
173
217
|
};
|
|
174
218
|
//# sourceMappingURL=defaults.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../src/config/defaults.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAE9D,MAAM,CAAC,MAAM,aAAa,GAAgB;IACxC,MAAM,EAAE;QACN,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,IAAI;QACV,UAAU,EAAE,uBAAuB;QACnC,cAAc,EAAE,EAAE;KACnB;IACD,OAAO,EAAE;QACP,OAAO,EAAE,iBAAiB;QAC1B,cAAc,EAAE,EAAE;QAClB,gBAAgB,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../src/config/defaults.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,36 @@ describe('defaultConfig', () => {
|
|
|
31
31
|
it('tools.disabled по умолчанию пусто (AD-071 §2.6)', () => {
|
|
32
32
|
expect(defaultConfig.tools.disabled).toEqual({ capabilities: [], tools: [] });
|
|
33
33
|
});
|
|
34
|
+
it('skills по умолчанию пусты (paths/urls), inlineShell выключен (AD-046)', () => {
|
|
35
|
+
expect(defaultConfig.skills).toEqual({
|
|
36
|
+
paths: [], urls: [], trustedProjectDirs: [], inlineShell: false, toolsets: {},
|
|
37
|
+
});
|
|
38
|
+
});
|
|
39
|
+
it('commands по умолчанию: bundle-wins, лимиты, пустые paths (AD-046 §7)', () => {
|
|
40
|
+
expect(defaultConfig.commands).toEqual({
|
|
41
|
+
paths: [],
|
|
42
|
+
bundlesPath: 'skill-bundles',
|
|
43
|
+
conflict: { mode: 'bundle-wins', namespacePrefix: false },
|
|
44
|
+
maxArgumentsLength: 10_000,
|
|
45
|
+
maxRenderedBytes: 200_000,
|
|
46
|
+
});
|
|
47
|
+
});
|
|
48
|
+
it('instructions: enabled, claudeCompat, кап от окна, пустые sources (AD-069)', () => {
|
|
49
|
+
expect(defaultConfig.instructions.enabled).toBe(true);
|
|
50
|
+
expect(defaultConfig.instructions.claudeCompat).toBe(true);
|
|
51
|
+
expect(defaultConfig.instructions.contextCompat).toBe(false);
|
|
52
|
+
expect(defaultConfig.instructions.maxChars).toBeUndefined();
|
|
53
|
+
expect(defaultConfig.instructions.windowRatio).toBe(0.06);
|
|
54
|
+
expect(defaultConfig.instructions.minChars).toBe(20_000);
|
|
55
|
+
expect(defaultConfig.instructions.maxCharsCeiling).toBe(500_000);
|
|
56
|
+
expect(defaultConfig.instructions.sources).toEqual([]);
|
|
57
|
+
expect(defaultConfig.instructions.excludeProjects).toEqual([]);
|
|
58
|
+
expect(defaultConfig.instructions.allowInstallTreeFallback).toBe(false);
|
|
59
|
+
expect(defaultConfig.instructions.lazy.enabled).toBe(true);
|
|
60
|
+
expect(defaultConfig.instructions.lazy.maxAncestors).toBe(5);
|
|
61
|
+
expect(defaultConfig.instructions.lazy.maxChars).toBe(8_000);
|
|
62
|
+
expect(defaultConfig.instructions.fetch).toEqual({ timeoutMs: 5_000, cacheTtlSec: 3_600, maxBytes: 262_144 });
|
|
63
|
+
});
|
|
34
64
|
it('core.port == 4300', () => {
|
|
35
65
|
expect(defaultConfig.core.port).toBe(4300);
|
|
36
66
|
});
|
|
@@ -62,5 +92,8 @@ describe('defaultConfig', () => {
|
|
|
62
92
|
it('summarization.promptFile == SUMMARIZER', () => {
|
|
63
93
|
expect(defaultConfig.summarization.promptFile).toBe('SUMMARIZER');
|
|
64
94
|
});
|
|
95
|
+
it('security.secretKey по умолчанию пуст (AD-076: файл master.key)', () => {
|
|
96
|
+
expect(defaultConfig.security.secretKey).toBe('');
|
|
97
|
+
});
|
|
65
98
|
});
|
|
66
99
|
//# sourceMappingURL=defaults.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaults.test.js","sourceRoot":"","sources":["../../src/config/defaults.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"defaults.test.js","sourceRoot":"","sources":["../../src/config/defaults.test.ts"],"names":[],"mappings":"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"}
|
package/dist/config/loader.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { type SynthConfig } from './types.js';
|
|
2
2
|
export interface LoadConfigOptions {
|
|
3
3
|
configPath?: string;
|
|
4
|
+
/** AD-079: home-каталог — конфиг резолвится как `<home>/config.yaml`, если path не задан. */
|
|
5
|
+
home?: string;
|
|
4
6
|
overrides?: Partial<SynthConfig>;
|
|
5
7
|
}
|
|
6
8
|
export declare function loadConfig(options?: LoadConfigOptions): Promise<SynthConfig>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../src/config/loader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../src/config/loader.ts"],"names":[],"mappings":"AAGA,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,YAAY,CAAC;AAIjE,MAAM,WAAW,iBAAiB;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,6FAA6F;IAC7F,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;CAClC;AA2CD,wBAAsB,UAAU,CAAC,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,WAAW,CAAC,CA2BtF"}
|
package/dist/config/loader.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { readFile } from 'node:fs/promises';
|
|
2
|
+
import { join } from 'node:path';
|
|
2
3
|
import { load as parseYaml } from 'js-yaml';
|
|
3
4
|
import { synthConfigSchema } from './types.js';
|
|
4
5
|
import { defaultConfig } from './defaults.js';
|
|
@@ -9,18 +10,22 @@ const CONFIG_SEARCH_PATHS = [
|
|
|
9
10
|
];
|
|
10
11
|
const USER_CONFIG_DIR = '.config/synth';
|
|
11
12
|
const SYSTEM_CONFIG_PATH = '/etc/synth/config.yaml';
|
|
12
|
-
function searchPaths(explicitPath) {
|
|
13
|
+
function searchPaths(explicitPath, home) {
|
|
13
14
|
if (explicitPath)
|
|
14
15
|
return [explicitPath];
|
|
16
|
+
// AD-079: при заданном home конфиг ищется строго в <home>/config.yaml
|
|
17
|
+
// (home приоритетнее cwd/XDG-цепочки).
|
|
18
|
+
if (home)
|
|
19
|
+
return [join(home, 'config.yaml')];
|
|
15
20
|
const paths = [];
|
|
16
|
-
const
|
|
21
|
+
const homeDir = process.env.HOME || process.env.USERPROFILE || '';
|
|
17
22
|
// CWD
|
|
18
23
|
for (const name of CONFIG_SEARCH_PATHS) {
|
|
19
24
|
paths.push(name);
|
|
20
25
|
}
|
|
21
26
|
// ~/.config/synth/config.yaml
|
|
22
|
-
if (
|
|
23
|
-
paths.push(`${
|
|
27
|
+
if (homeDir) {
|
|
28
|
+
paths.push(`${homeDir}/${USER_CONFIG_DIR}/config.yaml`);
|
|
24
29
|
}
|
|
25
30
|
// /etc/synth/config.yaml
|
|
26
31
|
paths.push(SYSTEM_CONFIG_PATH);
|
|
@@ -40,7 +45,7 @@ export async function loadConfig(options = {}) {
|
|
|
40
45
|
// findConfigPath). Без этого dev-запуск backend с cwd=synth/ не читал
|
|
41
46
|
// packages/backend/config.yaml (mcp.servers) и seed реестра был пустым.
|
|
42
47
|
const explicitPath = options.configPath ?? process.env.SYNTH_CONFIG;
|
|
43
|
-
const paths = searchPaths(explicitPath);
|
|
48
|
+
const paths = searchPaths(explicitPath, options.home);
|
|
44
49
|
let fileConfig = {};
|
|
45
50
|
for (const path of paths) {
|
|
46
51
|
const parsed = await tryReadYaml(path);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/config/loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAoB,MAAM,YAAY,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/config/loader.ts"],"names":[],"mappings":"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"}
|
package/dist/config/resolve.d.ts
CHANGED
|
@@ -1,18 +1,47 @@
|
|
|
1
1
|
import type { SynthConfig } from './types.js';
|
|
2
|
+
import type { WorkspaceOutsideRootPolicy } from '../types/index.js';
|
|
2
3
|
export type DeployMode = 'user' | 'docker' | 'server' | 'dev';
|
|
3
4
|
export declare function resolveDeployMode(): DeployMode;
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
/**
|
|
6
|
+
* AD-079: базовый home-каталог локального инстанса. Приоритет: явный флаг
|
|
7
|
+
* (`explicitHome`) > env `SYNTH_HOME` > null (XDG-дефолты). Возвращает
|
|
8
|
+
* абсолютный путь либо null.
|
|
9
|
+
*/
|
|
10
|
+
export declare function resolveHome(explicitHome?: string | null, env?: NodeJS.ProcessEnv): string | null;
|
|
11
|
+
export declare function resolveDataDir(config: SynthConfig, env?: NodeJS.ProcessEnv, home?: string | null): string;
|
|
12
|
+
export declare function findConfigPath(home?: string | null): string | null;
|
|
13
|
+
export declare function defaultConfigPath(mode?: DeployMode, home?: string | null): string;
|
|
7
14
|
export declare function ensureConfigFile(targetPath: string): Promise<void>;
|
|
8
|
-
export declare function ensureFirstRun(dataDirOverride?: string, configPathOverride?: string): Promise<{
|
|
15
|
+
export declare function ensureFirstRun(dataDirOverride?: string, configPathOverride?: string, home?: string | null): Promise<{
|
|
9
16
|
dataDir: string;
|
|
10
17
|
configPath: string | null;
|
|
11
18
|
mode: DeployMode;
|
|
12
19
|
}>;
|
|
13
20
|
export declare function resolvePort(config: SynthConfig, envKey: string, configFallback: number, env?: NodeJS.ProcessEnv): number;
|
|
14
|
-
export declare function resolveWorkspacesRoot(config: SynthConfig, env?: NodeJS.ProcessEnv): string;
|
|
15
|
-
export declare function resolveDefaultWorkspace(config: SynthConfig, env?: NodeJS.ProcessEnv): string;
|
|
21
|
+
export declare function resolveWorkspacesRoot(config: SynthConfig, env?: NodeJS.ProcessEnv, home?: string | null): string;
|
|
22
|
+
export declare function resolveDefaultWorkspace(config: SynthConfig, env?: NodeJS.ProcessEnv, home?: string | null): string;
|
|
23
|
+
/**
|
|
24
|
+
* AD-079: путь к реестру профилей серверов. При заданном home — плоская
|
|
25
|
+
* раскладка `<home>/profiles.json`, иначе XDG-дефолт `~/.config/synth/profiles.json`.
|
|
26
|
+
*/
|
|
27
|
+
export declare function resolveProfilesPath(home?: string | null): string;
|
|
28
|
+
/**
|
|
29
|
+
* AD-079: путь к файлу credentials. При заданном home — плоская раскладка
|
|
30
|
+
* `<home>/credentials.json`, иначе XDG-дефолт `~/.config/synth/credentials.json`.
|
|
31
|
+
*/
|
|
32
|
+
export declare function resolveCredentialsPath(home?: string | null): string;
|
|
33
|
+
/**
|
|
34
|
+
* AD-075: эффективная политика для абсолютного workspace вне `workspacesRoot`
|
|
35
|
+
* (приоритет: env `SYNTH_WORKSPACE_OUTSIDE_ROOT` > `config.storage.workspaceOutsideRoot` > `''`).
|
|
36
|
+
* `''` — политика не задана; потребитель подставляет `confirm`.
|
|
37
|
+
*/
|
|
38
|
+
export declare function resolveWorkspaceOutsideRootPolicy(config: SynthConfig, env?: NodeJS.ProcessEnv): WorkspaceOutsideRootPolicy | '';
|
|
39
|
+
/**
|
|
40
|
+
* AD-076: мастер-ключ шифрования секретов at-rest (SSH-ключи, AES-256-GCM).
|
|
41
|
+
* Приоритет: env `SYNTH_SECRET_KEY` > `config.security.secretKey` > `''`
|
|
42
|
+
* (пусто — core использует файл `{dataDir}/secrets/master.key`).
|
|
43
|
+
*/
|
|
44
|
+
export declare function resolveSecretKey(config: SynthConfig, env?: NodeJS.ProcessEnv): string;
|
|
16
45
|
export declare function ensureDataDir(dataDir: string): Promise<void>;
|
|
17
46
|
export declare function createDefaultConfig(targetPath: string): Promise<void>;
|
|
18
47
|
//# sourceMappingURL=resolve.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/config/resolve.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/config/resolve.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AAGpE,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,KAAK,CAAC;AAwB9D,wBAAgB,iBAAiB,IAAI,UAAU,CAe9C;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CACzB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,EAC5B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,GACtB,MAAM,GAAG,IAAI,CAIf;AAED,wBAAgB,cAAc,CAC5B,MAAM,EAAE,WAAW,EACnB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,EACvB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GACnB,MAAM,CAqBR;AAED,wBAAgB,cAAc,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAmClE;AAED,wBAAgB,iBAAiB,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAWjF;AAED,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAUxE;AAED,wBAAsB,cAAc,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC,CA6B3L;AAED,wBAAgB,WAAW,CACzB,MAAM,EAAE,WAAW,EACnB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,EACtB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,GACtB,MAAM,CAOR;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAMhH;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAMlH;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAIhE;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAInE;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,WAAW,EACnB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,GACtB,0BAA0B,GAAG,EAAE,CAMjC;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAKrF;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKlE;AAED,wBAAsB,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ3E"}
|
package/dist/config/resolve.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { existsSync } from 'node:fs';
|
|
2
2
|
import { mkdir, writeFile } from 'node:fs/promises';
|
|
3
|
-
import { join } from 'node:path';
|
|
3
|
+
import { join, resolve } from 'node:path';
|
|
4
4
|
import { dump as dumpYaml } from 'js-yaml';
|
|
5
5
|
import { defaultConfig } from './defaults.js';
|
|
6
6
|
const DATA_SUBDIRS = [
|
|
@@ -38,13 +38,31 @@ export function resolveDeployMode() {
|
|
|
38
38
|
return 'dev';
|
|
39
39
|
return 'user';
|
|
40
40
|
}
|
|
41
|
-
|
|
41
|
+
/**
|
|
42
|
+
* AD-079: базовый home-каталог локального инстанса. Приоритет: явный флаг
|
|
43
|
+
* (`explicitHome`) > env `SYNTH_HOME` > null (XDG-дефолты). Возвращает
|
|
44
|
+
* абсолютный путь либо null.
|
|
45
|
+
*/
|
|
46
|
+
export function resolveHome(explicitHome, env) {
|
|
47
|
+
const raw = explicitHome ?? (env ?? process.env).SYNTH_HOME;
|
|
48
|
+
if (!raw)
|
|
49
|
+
return null;
|
|
50
|
+
return resolve(raw);
|
|
51
|
+
}
|
|
52
|
+
export function resolveDataDir(config, env, home) {
|
|
53
|
+
// AD-075: нормализуем к абсолютному пути — относительный dataDir ломает
|
|
54
|
+
// containment-проверки FS (root остаётся относительным, target — абсолютным).
|
|
42
55
|
const envVar = (env ?? process.env).SYNTH_DATA_DIR;
|
|
43
56
|
if (envVar)
|
|
44
|
-
return envVar;
|
|
57
|
+
return resolve(envVar);
|
|
45
58
|
if (config.storage.dataDir && config.storage.dataDir !== defaultConfig.storage.dataDir) {
|
|
46
|
-
return config.storage.dataDir;
|
|
59
|
+
return resolve(config.storage.dataDir);
|
|
47
60
|
}
|
|
61
|
+
// AD-079: home-каталог задаёт плоскую раскладку (<home>/data) и приоритетнее
|
|
62
|
+
// mode-дефолтов, но ниже явных SYNTH_DATA_DIR/config.storage.dataDir.
|
|
63
|
+
const h = resolveHome(home, env);
|
|
64
|
+
if (h)
|
|
65
|
+
return join(h, 'data');
|
|
48
66
|
const mode = resolveDeployMode();
|
|
49
67
|
switch (mode) {
|
|
50
68
|
case 'user': return join(homeDir(), '.local', 'share', 'synth');
|
|
@@ -52,10 +70,17 @@ export function resolveDataDir(config, env) {
|
|
|
52
70
|
default: return '/var/synth/data';
|
|
53
71
|
}
|
|
54
72
|
}
|
|
55
|
-
export function findConfigPath() {
|
|
73
|
+
export function findConfigPath(home) {
|
|
56
74
|
const explicit = process.env.SYNTH_CONFIG;
|
|
57
75
|
if (explicit)
|
|
58
76
|
return explicit;
|
|
77
|
+
// AD-079: при заданном home конфиг — строго <home>/config.yaml (приоритетнее
|
|
78
|
+
// cwd/XDG); отсутствие файла не откатывается к дефолтам.
|
|
79
|
+
const h = resolveHome(home);
|
|
80
|
+
if (h) {
|
|
81
|
+
const homePath = join(h, 'config.yaml');
|
|
82
|
+
return existsSync(homePath) ? homePath : null;
|
|
83
|
+
}
|
|
59
84
|
const cwd = process.cwd();
|
|
60
85
|
const localNames = ['synth.config.yaml', 'config.yaml'];
|
|
61
86
|
for (const name of localNames) {
|
|
@@ -81,7 +106,11 @@ export function findConfigPath() {
|
|
|
81
106
|
}
|
|
82
107
|
}
|
|
83
108
|
}
|
|
84
|
-
export function defaultConfigPath(mode) {
|
|
109
|
+
export function defaultConfigPath(mode, home) {
|
|
110
|
+
// AD-079: home задаёт плоскую раскладку (<home>/config.yaml) независимо от mode.
|
|
111
|
+
const h = resolveHome(home);
|
|
112
|
+
if (h)
|
|
113
|
+
return join(h, 'config.yaml');
|
|
85
114
|
const m = mode ?? resolveDeployMode();
|
|
86
115
|
switch (m) {
|
|
87
116
|
case 'user': return join(homeDir(), '.config', 'synth', 'config.yaml');
|
|
@@ -101,10 +130,14 @@ export async function ensureConfigFile(targetPath) {
|
|
|
101
130
|
});
|
|
102
131
|
await writeFile(targetPath, yaml, 'utf-8');
|
|
103
132
|
}
|
|
104
|
-
export async function ensureFirstRun(dataDirOverride, configPathOverride) {
|
|
133
|
+
export async function ensureFirstRun(dataDirOverride, configPathOverride, home) {
|
|
105
134
|
const mode = resolveDeployMode();
|
|
106
|
-
|
|
107
|
-
const
|
|
135
|
+
// AD-079: home задаёт плоскую раскладку (<home>/config.yaml, <home>/data).
|
|
136
|
+
const h = resolveHome(home);
|
|
137
|
+
// AD-075: относительный --data-dir абсолютизируем на CLI-границе (иначе
|
|
138
|
+
// containment-проверки FS получают относительный root и абсолютный target).
|
|
139
|
+
const dataDir = resolve(dataDirOverride ?? resolveDataDir(defaultConfig, undefined, h));
|
|
140
|
+
const configPath = configPathOverride ?? defaultConfigPath(mode, h);
|
|
108
141
|
if (mode !== 'docker') {
|
|
109
142
|
await ensureDataDir(dataDir);
|
|
110
143
|
}
|
|
@@ -113,7 +146,7 @@ export async function ensureFirstRun(dataDirOverride, configPathOverride) {
|
|
|
113
146
|
await ensureConfigFile(configPath);
|
|
114
147
|
}
|
|
115
148
|
}
|
|
116
|
-
const foundPath = findConfigPath();
|
|
149
|
+
const foundPath = findConfigPath(h);
|
|
117
150
|
if (mode === 'user' || mode === 'dev') {
|
|
118
151
|
console.log(` режим: ${mode}`);
|
|
119
152
|
console.log(` данные: ${dataDir}`);
|
|
@@ -130,24 +163,71 @@ export function resolvePort(config, envKey, configFallback, env) {
|
|
|
130
163
|
}
|
|
131
164
|
return configFallback;
|
|
132
165
|
}
|
|
133
|
-
export function resolveWorkspacesRoot(config, env) {
|
|
166
|
+
export function resolveWorkspacesRoot(config, env, home) {
|
|
134
167
|
const envVal = (env ?? process.env).SYNTH_WORKSPACES_ROOT;
|
|
135
168
|
if (envVal)
|
|
136
|
-
return envVal;
|
|
169
|
+
return resolve(envVal);
|
|
137
170
|
if (config.storage.workspacesRoot)
|
|
138
|
-
return config.storage.workspacesRoot;
|
|
139
|
-
const dataDir = resolveDataDir(config, env);
|
|
171
|
+
return resolve(config.storage.workspacesRoot);
|
|
172
|
+
const dataDir = resolveDataDir(config, env, home);
|
|
140
173
|
return `${dataDir}/workspaces`;
|
|
141
174
|
}
|
|
142
|
-
export function resolveDefaultWorkspace(config, env) {
|
|
175
|
+
export function resolveDefaultWorkspace(config, env, home) {
|
|
143
176
|
const envVal = (env ?? process.env).SYNTH_DEFAULT_WORKSPACE;
|
|
144
177
|
if (envVal)
|
|
145
|
-
return envVal;
|
|
178
|
+
return resolve(envVal);
|
|
146
179
|
if (config.storage.defaultWorkspace)
|
|
147
|
-
return config.storage.defaultWorkspace;
|
|
148
|
-
const dataDir = resolveDataDir(config, env);
|
|
180
|
+
return resolve(config.storage.defaultWorkspace);
|
|
181
|
+
const dataDir = resolveDataDir(config, env, home);
|
|
149
182
|
return join(dataDir, 'workspaces', 'default');
|
|
150
183
|
}
|
|
184
|
+
/**
|
|
185
|
+
* AD-079: путь к реестру профилей серверов. При заданном home — плоская
|
|
186
|
+
* раскладка `<home>/profiles.json`, иначе XDG-дефолт `~/.config/synth/profiles.json`.
|
|
187
|
+
*/
|
|
188
|
+
export function resolveProfilesPath(home) {
|
|
189
|
+
const h = resolveHome(home);
|
|
190
|
+
if (h)
|
|
191
|
+
return join(h, 'profiles.json');
|
|
192
|
+
return join(homeDir(), '.config', 'synth', 'profiles.json');
|
|
193
|
+
}
|
|
194
|
+
/**
|
|
195
|
+
* AD-079: путь к файлу credentials. При заданном home — плоская раскладка
|
|
196
|
+
* `<home>/credentials.json`, иначе XDG-дефолт `~/.config/synth/credentials.json`.
|
|
197
|
+
*/
|
|
198
|
+
export function resolveCredentialsPath(home) {
|
|
199
|
+
const h = resolveHome(home);
|
|
200
|
+
if (h)
|
|
201
|
+
return join(h, 'credentials.json');
|
|
202
|
+
return join(homeDir(), '.config', 'synth', 'credentials.json');
|
|
203
|
+
}
|
|
204
|
+
/**
|
|
205
|
+
* AD-075: эффективная политика для абсолютного workspace вне `workspacesRoot`
|
|
206
|
+
* (приоритет: env `SYNTH_WORKSPACE_OUTSIDE_ROOT` > `config.storage.workspaceOutsideRoot` > `''`).
|
|
207
|
+
* `''` — политика не задана; потребитель подставляет `confirm`.
|
|
208
|
+
*/
|
|
209
|
+
export function resolveWorkspaceOutsideRootPolicy(config, env) {
|
|
210
|
+
const envVal = (env ?? process.env).SYNTH_WORKSPACE_OUTSIDE_ROOT;
|
|
211
|
+
if (envVal === 'confirm' || envVal === 'deny')
|
|
212
|
+
return envVal;
|
|
213
|
+
const cfgVal = config.storage.workspaceOutsideRoot;
|
|
214
|
+
if (cfgVal === 'confirm' || cfgVal === 'deny')
|
|
215
|
+
return cfgVal;
|
|
216
|
+
return '';
|
|
217
|
+
}
|
|
218
|
+
/**
|
|
219
|
+
* AD-076: мастер-ключ шифрования секретов at-rest (SSH-ключи, AES-256-GCM).
|
|
220
|
+
* Приоритет: env `SYNTH_SECRET_KEY` > `config.security.secretKey` > `''`
|
|
221
|
+
* (пусто — core использует файл `{dataDir}/secrets/master.key`).
|
|
222
|
+
*/
|
|
223
|
+
export function resolveSecretKey(config, env) {
|
|
224
|
+
const envVal = (env ?? process.env).SYNTH_SECRET_KEY;
|
|
225
|
+
if (envVal)
|
|
226
|
+
return envVal;
|
|
227
|
+
if (config.security.secretKey)
|
|
228
|
+
return config.security.secretKey;
|
|
229
|
+
return '';
|
|
230
|
+
}
|
|
151
231
|
export async function ensureDataDir(dataDir) {
|
|
152
232
|
await mkdir(dataDir, { recursive: true });
|
|
153
233
|
for (const subdir of DATA_SUBDIRS) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/config/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/config/resolve.ts"],"names":[],"mappings":"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"}
|