@kilnai/cli 0.23.2 → 1.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +33 -0
- package/dist/application/__tests__/plan-exit-tool.test.d.ts +2 -0
- package/dist/application/__tests__/plan-exit-tool.test.d.ts.map +1 -0
- package/dist/application/__tests__/plan-exit-tool.test.js +12 -0
- package/dist/application/__tests__/plan-exit-tool.test.js.map +1 -0
- package/dist/application/agent-loader.d.ts +12 -0
- package/dist/application/agent-loader.d.ts.map +1 -0
- package/dist/application/agent-loader.js +114 -0
- package/dist/application/agent-loader.js.map +1 -0
- package/dist/application/agent-loader.test.d.ts +2 -0
- package/dist/application/agent-loader.test.d.ts.map +1 -0
- package/dist/application/agent-loader.test.js +151 -0
- package/dist/application/agent-loader.test.js.map +1 -0
- package/dist/application/context-artifact-keys.d.ts +5 -0
- package/dist/application/context-artifact-keys.d.ts.map +1 -0
- package/dist/application/context-artifact-keys.js +14 -0
- package/dist/application/context-artifact-keys.js.map +1 -0
- package/dist/application/context-governance.d.ts +6 -0
- package/dist/application/context-governance.d.ts.map +1 -0
- package/dist/application/context-governance.js +20 -0
- package/dist/application/context-governance.js.map +1 -0
- package/dist/application/context-governor.d.ts +26 -0
- package/dist/application/context-governor.d.ts.map +1 -0
- package/dist/application/context-governor.js +164 -0
- package/dist/application/context-governor.js.map +1 -0
- package/dist/application/context-types.d.ts +20 -0
- package/dist/application/context-types.d.ts.map +1 -0
- package/dist/application/context-types.js +21 -0
- package/dist/application/context-types.js.map +1 -0
- package/dist/application/plan-exit-tool.d.ts +19 -0
- package/dist/application/plan-exit-tool.d.ts.map +1 -0
- package/dist/application/plan-exit-tool.js +13 -0
- package/dist/application/plan-exit-tool.js.map +1 -0
- package/dist/application/repo-summary-cache.d.ts +5 -0
- package/dist/application/repo-summary-cache.d.ts.map +1 -0
- package/dist/application/repo-summary-cache.js +82 -0
- package/dist/application/repo-summary-cache.js.map +1 -0
- package/dist/application/resume-strategy-feedback.d.ts +5 -0
- package/dist/application/resume-strategy-feedback.d.ts.map +1 -0
- package/dist/application/resume-strategy-feedback.js +81 -0
- package/dist/application/resume-strategy-feedback.js.map +1 -0
- package/dist/application/resume-strategy-policy.d.ts +26 -0
- package/dist/application/resume-strategy-policy.d.ts.map +1 -0
- package/dist/application/resume-strategy-policy.js +35 -0
- package/dist/application/resume-strategy-policy.js.map +1 -0
- package/dist/application/run-session.d.ts +39 -0
- package/dist/application/run-session.d.ts.map +1 -0
- package/dist/application/run-session.js +349 -0
- package/dist/application/run-session.js.map +1 -0
- package/dist/application/session-hooks.d.ts +20 -0
- package/dist/application/session-hooks.d.ts.map +1 -0
- package/dist/application/session-hooks.js +55 -0
- package/dist/application/session-hooks.js.map +1 -0
- package/dist/application/session-ledger.d.ts +12 -0
- package/dist/application/session-ledger.d.ts.map +1 -0
- package/dist/application/session-ledger.js +29 -0
- package/dist/application/session-ledger.js.map +1 -0
- package/dist/application/session-report.d.ts +19 -0
- package/dist/application/session-report.d.ts.map +1 -0
- package/dist/application/session-report.js +207 -0
- package/dist/application/session-report.js.map +1 -0
- package/dist/application/session-resume.d.ts +3 -0
- package/dist/application/session-resume.d.ts.map +1 -0
- package/dist/application/session-resume.js +16 -0
- package/dist/application/session-resume.js.map +1 -0
- package/dist/commands/auth.d.ts +2 -0
- package/dist/commands/auth.d.ts.map +1 -0
- package/dist/commands/auth.js +138 -0
- package/dist/commands/auth.js.map +1 -0
- package/dist/commands/config.d.ts +1 -1
- package/dist/commands/config.d.ts.map +1 -1
- package/dist/commands/config.js +141 -27
- package/dist/commands/config.js.map +1 -1
- package/dist/commands/cron.d.ts +3 -0
- package/dist/commands/cron.d.ts.map +1 -0
- package/dist/commands/cron.js +201 -0
- package/dist/commands/cron.js.map +1 -0
- package/dist/commands/dev.js +2 -2
- package/dist/commands/dev.js.map +1 -1
- package/dist/commands/domain.js +17 -17
- package/dist/commands/domain.js.map +1 -1
- package/dist/commands/init.d.ts +2 -11
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +14 -25
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/mcp-config.d.ts +7 -1
- package/dist/commands/mcp-config.d.ts.map +1 -1
- package/dist/commands/mcp-config.js +26 -10
- package/dist/commands/mcp-config.js.map +1 -1
- package/dist/commands/memory.d.ts +1 -1
- package/dist/commands/memory.d.ts.map +1 -1
- package/dist/commands/memory.js +10 -10
- package/dist/commands/memory.js.map +1 -1
- package/dist/commands/run.d.ts +15 -3
- package/dist/commands/run.d.ts.map +1 -1
- package/dist/commands/run.js +464 -85
- package/dist/commands/run.js.map +1 -1
- package/dist/commands/serve.d.ts +1 -1
- package/dist/commands/serve.d.ts.map +1 -1
- package/dist/commands/serve.js +3 -3
- package/dist/commands/serve.js.map +1 -1
- package/dist/commands/skill-capture.d.ts +13 -0
- package/dist/commands/skill-capture.d.ts.map +1 -0
- package/dist/commands/skill-capture.js +212 -0
- package/dist/commands/skill-capture.js.map +1 -0
- package/dist/commands/skill.d.ts.map +1 -1
- package/dist/commands/skill.js +7 -3
- package/dist/commands/skill.js.map +1 -1
- package/dist/commands/status.d.ts +1 -1
- package/dist/commands/status.d.ts.map +1 -1
- package/dist/commands/status.js +15 -16
- package/dist/commands/status.js.map +1 -1
- package/dist/commands/sync.d.ts +11 -0
- package/dist/commands/sync.d.ts.map +1 -0
- package/dist/commands/sync.js +114 -0
- package/dist/commands/sync.js.map +1 -0
- package/dist/commands/tools.d.ts +6 -0
- package/dist/commands/tools.d.ts.map +1 -0
- package/dist/commands/tools.js +28 -0
- package/dist/commands/tools.js.map +1 -0
- package/dist/commands/tui.d.ts +29 -0
- package/dist/commands/tui.d.ts.map +1 -0
- package/dist/commands/tui.js +444 -0
- package/dist/commands/tui.js.map +1 -0
- package/dist/config/config-merger.d.ts +5 -0
- package/dist/config/config-merger.d.ts.map +1 -0
- package/dist/config/config-merger.js +25 -0
- package/dist/config/config-merger.js.map +1 -0
- package/dist/config/config-merger.test.d.ts +2 -0
- package/dist/config/config-merger.test.d.ts.map +1 -0
- package/dist/config/config-merger.test.js +165 -0
- package/dist/config/config-merger.test.js.map +1 -0
- package/dist/config/env-config.d.ts +5 -0
- package/dist/config/env-config.d.ts.map +1 -0
- package/dist/config/env-config.js +24 -0
- package/dist/config/env-config.js.map +1 -0
- package/dist/config/env-config.test.d.ts +2 -0
- package/dist/config/env-config.test.d.ts.map +1 -0
- package/dist/config/env-config.test.js +79 -0
- package/dist/config/env-config.test.js.map +1 -0
- package/dist/config/global-config.d.ts +23 -0
- package/dist/config/global-config.d.ts.map +1 -0
- package/dist/config/global-config.js +48 -0
- package/dist/config/global-config.js.map +1 -0
- package/dist/config/global-config.test.d.ts +2 -0
- package/dist/config/global-config.test.d.ts.map +1 -0
- package/dist/config/global-config.test.js +96 -0
- package/dist/config/global-config.test.js.map +1 -0
- package/dist/config-resolver.d.ts +5 -0
- package/dist/config-resolver.d.ts.map +1 -0
- package/dist/config-resolver.js +19 -0
- package/dist/config-resolver.js.map +1 -0
- package/dist/config.d.ts +8 -7
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +14 -1
- package/dist/config.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +193 -16
- package/dist/index.js.map +1 -1
- package/dist/kiln-yaml-types.d.ts +127 -0
- package/dist/kiln-yaml-types.d.ts.map +1 -0
- package/dist/kiln-yaml-types.js +42 -0
- package/dist/kiln-yaml-types.js.map +1 -0
- package/dist/kiln-yaml.d.ts +10 -0
- package/dist/kiln-yaml.d.ts.map +1 -0
- package/dist/kiln-yaml.js +109 -0
- package/dist/kiln-yaml.js.map +1 -0
- package/dist/mcp/config-generator.d.ts +9 -2
- package/dist/mcp/config-generator.d.ts.map +1 -1
- package/dist/mcp/config-generator.js +132 -2
- package/dist/mcp/config-generator.js.map +1 -1
- package/dist/mcp/index.d.ts.map +1 -1
- package/dist/mcp/index.js +2 -1
- package/dist/mcp/index.js.map +1 -1
- package/dist/mcp/server.d.ts.map +1 -1
- package/dist/mcp/server.js +2 -1
- package/dist/mcp/server.js.map +1 -1
- package/dist/mcp-entry.js +0 -5
- package/dist/mcp-entry.js.map +1 -1
- package/dist/sync/agent-sync.d.ts +13 -0
- package/dist/sync/agent-sync.d.ts.map +1 -0
- package/dist/sync/agent-sync.js +130 -0
- package/dist/sync/agent-sync.js.map +1 -0
- package/dist/sync/agent-sync.test.d.ts +2 -0
- package/dist/sync/agent-sync.test.d.ts.map +1 -0
- package/dist/sync/agent-sync.test.js +130 -0
- package/dist/sync/agent-sync.test.js.map +1 -0
- package/dist/sync/agents-md-sync.d.ts +7 -0
- package/dist/sync/agents-md-sync.d.ts.map +1 -0
- package/dist/sync/agents-md-sync.js +44 -0
- package/dist/sync/agents-md-sync.js.map +1 -0
- package/dist/sync/agents-md-sync.test.d.ts +2 -0
- package/dist/sync/agents-md-sync.test.d.ts.map +1 -0
- package/dist/sync/agents-md-sync.test.js +154 -0
- package/dist/sync/agents-md-sync.test.js.map +1 -0
- package/dist/sync/hook-sync.d.ts +8 -0
- package/dist/sync/hook-sync.d.ts.map +1 -0
- package/dist/sync/hook-sync.js +90 -0
- package/dist/sync/hook-sync.js.map +1 -0
- package/dist/sync/security-sync.d.ts +9 -0
- package/dist/sync/security-sync.d.ts.map +1 -0
- package/dist/sync/security-sync.js +161 -0
- package/dist/sync/security-sync.js.map +1 -0
- package/dist/sync/skill-sync.d.ts +10 -0
- package/dist/sync/skill-sync.d.ts.map +1 -0
- package/dist/sync/skill-sync.js +87 -0
- package/dist/sync/skill-sync.js.map +1 -0
- package/dist/sync/skill-sync.test.d.ts +2 -0
- package/dist/sync/skill-sync.test.d.ts.map +1 -0
- package/dist/sync/skill-sync.test.js +163 -0
- package/dist/sync/skill-sync.test.js.map +1 -0
- package/dist/wrapper/approval-memory-store.d.ts +40 -0
- package/dist/wrapper/approval-memory-store.d.ts.map +1 -0
- package/dist/wrapper/approval-memory-store.js +132 -0
- package/dist/wrapper/approval-memory-store.js.map +1 -0
- package/dist/wrapper/claude-code-process.d.ts +32 -34
- package/dist/wrapper/claude-code-process.d.ts.map +1 -1
- package/dist/wrapper/claude-code-process.js +181 -66
- package/dist/wrapper/claude-code-process.js.map +1 -1
- package/dist/wrapper/cleanup-registry.d.ts +7 -0
- package/dist/wrapper/cleanup-registry.d.ts.map +1 -0
- package/dist/wrapper/cleanup-registry.js +11 -0
- package/dist/wrapper/cleanup-registry.js.map +1 -0
- package/dist/wrapper/codex-session.d.ts +49 -0
- package/dist/wrapper/codex-session.d.ts.map +1 -0
- package/dist/wrapper/codex-session.js +470 -0
- package/dist/wrapper/codex-session.js.map +1 -0
- package/dist/wrapper/debug.d.ts +2 -0
- package/dist/wrapper/debug.d.ts.map +1 -0
- package/dist/wrapper/debug.js +7 -0
- package/dist/wrapper/debug.js.map +1 -0
- package/dist/wrapper/executable-provider-session.d.ts +26 -0
- package/dist/wrapper/executable-provider-session.d.ts.map +1 -0
- package/dist/wrapper/executable-provider-session.js +214 -0
- package/dist/wrapper/executable-provider-session.js.map +1 -0
- package/dist/wrapper/hook-executor.d.ts +21 -0
- package/dist/wrapper/hook-executor.d.ts.map +1 -0
- package/dist/wrapper/hook-executor.js +100 -0
- package/dist/wrapper/hook-executor.js.map +1 -0
- package/dist/wrapper/hook-registry.d.ts +10 -0
- package/dist/wrapper/hook-registry.d.ts.map +1 -0
- package/dist/wrapper/hook-registry.js +57 -0
- package/dist/wrapper/hook-registry.js.map +1 -0
- package/dist/wrapper/index.d.ts +83 -2
- package/dist/wrapper/index.d.ts.map +1 -1
- package/dist/wrapper/index.js +11 -0
- package/dist/wrapper/index.js.map +1 -1
- package/dist/wrapper/mcp-selector.d.ts +2 -0
- package/dist/wrapper/mcp-selector.d.ts.map +1 -0
- package/dist/wrapper/mcp-selector.js +8 -0
- package/dist/wrapper/mcp-selector.js.map +1 -0
- package/dist/wrapper/opencode-session.d.ts +69 -0
- package/dist/wrapper/opencode-session.d.ts.map +1 -0
- package/dist/wrapper/opencode-session.js +568 -0
- package/dist/wrapper/opencode-session.js.map +1 -0
- package/dist/wrapper/permission-evaluator.d.ts +57 -0
- package/dist/wrapper/permission-evaluator.d.ts.map +1 -0
- package/dist/wrapper/permission-evaluator.js +310 -0
- package/dist/wrapper/permission-evaluator.js.map +1 -0
- package/dist/wrapper/permission-normalizer.d.ts +13 -0
- package/dist/wrapper/permission-normalizer.d.ts.map +1 -0
- package/dist/wrapper/permission-normalizer.js +88 -0
- package/dist/wrapper/permission-normalizer.js.map +1 -0
- package/dist/wrapper/permission-policy-authorizer.d.ts +12 -0
- package/dist/wrapper/permission-policy-authorizer.d.ts.map +1 -0
- package/dist/wrapper/permission-policy-authorizer.js +64 -0
- package/dist/wrapper/permission-policy-authorizer.js.map +1 -0
- package/dist/wrapper/preamble-builder.d.ts +7 -0
- package/dist/wrapper/preamble-builder.d.ts.map +1 -0
- package/dist/wrapper/preamble-builder.js +103 -0
- package/dist/wrapper/preamble-builder.js.map +1 -0
- package/dist/wrapper/provider-context.d.ts +20 -0
- package/dist/wrapper/provider-context.d.ts.map +1 -0
- package/dist/wrapper/provider-context.js +58 -0
- package/dist/wrapper/provider-context.js.map +1 -0
- package/dist/wrapper/provider-session.d.ts +27 -0
- package/dist/wrapper/provider-session.d.ts.map +1 -0
- package/dist/wrapper/provider-session.js +208 -0
- package/dist/wrapper/provider-session.js.map +1 -0
- package/dist/wrapper/session-manager.d.ts +21 -4
- package/dist/wrapper/session-manager.d.ts.map +1 -1
- package/dist/wrapper/session-manager.js +173 -14
- package/dist/wrapper/session-manager.js.map +1 -1
- package/dist/wrapper/session-registry.d.ts +136 -0
- package/dist/wrapper/session-registry.d.ts.map +1 -0
- package/dist/wrapper/session-registry.js +977 -0
- package/dist/wrapper/session-registry.js.map +1 -0
- package/dist/wrapper/session-store.d.ts +63 -0
- package/dist/wrapper/session-store.d.ts.map +1 -0
- package/dist/wrapper/session-store.js +215 -0
- package/dist/wrapper/session-store.js.map +1 -0
- package/dist/wrapper/session.d.ts +127 -0
- package/dist/wrapper/session.d.ts.map +1 -0
- package/dist/wrapper/session.js +14 -0
- package/dist/wrapper/session.js.map +1 -0
- package/dist/wrapper/worktree-manager.d.ts +30 -0
- package/dist/wrapper/worktree-manager.d.ts.map +1 -0
- package/dist/wrapper/worktree-manager.js +139 -0
- package/dist/wrapper/worktree-manager.js.map +1 -0
- package/package.json +11 -7
|
@@ -0,0 +1,165 @@
|
|
|
1
|
+
import { describe, expect, it, vi, beforeEach } from "vitest";
|
|
2
|
+
import { join } from "node:path";
|
|
3
|
+
vi.mock("../kiln-yaml.js", () => ({
|
|
4
|
+
readKilnYaml: vi.fn(),
|
|
5
|
+
mergeKilnYaml: vi.fn(),
|
|
6
|
+
}));
|
|
7
|
+
vi.mock("./global-config.js", () => ({
|
|
8
|
+
readGlobalConfig: vi.fn(),
|
|
9
|
+
}));
|
|
10
|
+
import { mergeKilnYaml, readKilnYaml } from "../kiln-yaml.js";
|
|
11
|
+
import { readGlobalConfig } from "./global-config.js";
|
|
12
|
+
import { globalToKilnYaml, loadKilnConfig } from "./config-merger.js";
|
|
13
|
+
const readGlobalConfigMock = readGlobalConfig;
|
|
14
|
+
const readKilnYamlMock = readKilnYaml;
|
|
15
|
+
const mergeKilnYamlMock = mergeKilnYaml;
|
|
16
|
+
describe("config-merger", () => {
|
|
17
|
+
beforeEach(() => {
|
|
18
|
+
vi.clearAllMocks();
|
|
19
|
+
readGlobalConfigMock.mockReset();
|
|
20
|
+
readKilnYamlMock.mockReset();
|
|
21
|
+
mergeKilnYamlMock.mockReset();
|
|
22
|
+
});
|
|
23
|
+
it("returns null when both global and project config are missing", async () => {
|
|
24
|
+
readGlobalConfigMock.mockReturnValue(null);
|
|
25
|
+
readKilnYamlMock.mockReturnValue(null);
|
|
26
|
+
const result = await loadKilnConfig("/repo");
|
|
27
|
+
expect(readKilnYamlMock).toHaveBeenCalledWith(join("/repo", ".kiln"));
|
|
28
|
+
expect(result).toBeNull();
|
|
29
|
+
});
|
|
30
|
+
it("returns global-converted-to-KilnYaml when only global config exists", async () => {
|
|
31
|
+
const globalConfig = {
|
|
32
|
+
version: "1",
|
|
33
|
+
provider: "codex",
|
|
34
|
+
model: "gpt-5.4",
|
|
35
|
+
permissions: { approval: "never", sandbox: "workspace-write" },
|
|
36
|
+
mcp: { servers: { shared: { type: "stdio", command: "srv" } } },
|
|
37
|
+
hooks: {
|
|
38
|
+
SessionStart: [{ hooks: [{ type: "command", command: "echo start" }] }],
|
|
39
|
+
},
|
|
40
|
+
};
|
|
41
|
+
readGlobalConfigMock.mockReturnValue(globalConfig);
|
|
42
|
+
readKilnYamlMock.mockReturnValue(null);
|
|
43
|
+
const result = await loadKilnConfig("/repo");
|
|
44
|
+
expect(result).toEqual({
|
|
45
|
+
version: "1",
|
|
46
|
+
provider: "codex",
|
|
47
|
+
model: { default: "gpt-5.4" },
|
|
48
|
+
permissions: { approval: "never", sandbox: "workspace-write" },
|
|
49
|
+
mcp: { servers: { shared: { type: "stdio", command: "srv" } } },
|
|
50
|
+
hooks: {
|
|
51
|
+
SessionStart: [{ hooks: [{ type: "command", command: "echo start" }] }],
|
|
52
|
+
},
|
|
53
|
+
});
|
|
54
|
+
expect(mergeKilnYamlMock).not.toHaveBeenCalled();
|
|
55
|
+
});
|
|
56
|
+
it("returns project config as-is when only project config exists", async () => {
|
|
57
|
+
const projectConfig = {
|
|
58
|
+
version: "1",
|
|
59
|
+
provider: "claude",
|
|
60
|
+
domain: "cinema",
|
|
61
|
+
model: { default: "sonnet" },
|
|
62
|
+
};
|
|
63
|
+
readGlobalConfigMock.mockReturnValue(null);
|
|
64
|
+
readKilnYamlMock.mockReturnValue(projectConfig);
|
|
65
|
+
const result = await loadKilnConfig("/repo");
|
|
66
|
+
expect(result).toBe(projectConfig);
|
|
67
|
+
expect(mergeKilnYamlMock).not.toHaveBeenCalled();
|
|
68
|
+
});
|
|
69
|
+
it("merges global as base with project as override - project scalar wins", async () => {
|
|
70
|
+
const globalConfig = {
|
|
71
|
+
version: "1",
|
|
72
|
+
provider: "codex",
|
|
73
|
+
model: "gpt-5.4",
|
|
74
|
+
};
|
|
75
|
+
const projectConfig = {
|
|
76
|
+
version: "1",
|
|
77
|
+
provider: "claude",
|
|
78
|
+
domain: "project-domain",
|
|
79
|
+
teamMode: "solo",
|
|
80
|
+
};
|
|
81
|
+
const merged = {
|
|
82
|
+
version: "1",
|
|
83
|
+
provider: "claude",
|
|
84
|
+
domain: "project-domain",
|
|
85
|
+
teamMode: "solo",
|
|
86
|
+
model: { default: "gpt-5.4" },
|
|
87
|
+
};
|
|
88
|
+
readGlobalConfigMock.mockReturnValue(globalConfig);
|
|
89
|
+
readKilnYamlMock.mockReturnValue(projectConfig);
|
|
90
|
+
mergeKilnYamlMock.mockReturnValue(merged);
|
|
91
|
+
const result = await loadKilnConfig("/repo");
|
|
92
|
+
expect(mergeKilnYamlMock).toHaveBeenCalledWith({
|
|
93
|
+
version: "1",
|
|
94
|
+
provider: "codex",
|
|
95
|
+
model: { default: "gpt-5.4" },
|
|
96
|
+
permissions: undefined,
|
|
97
|
+
mcp: undefined,
|
|
98
|
+
hooks: undefined,
|
|
99
|
+
}, projectConfig);
|
|
100
|
+
expect(result).toEqual(merged);
|
|
101
|
+
});
|
|
102
|
+
it("MCP servers are additive - global + project servers both present in result", async () => {
|
|
103
|
+
const globalConfig = {
|
|
104
|
+
version: "1",
|
|
105
|
+
mcp: { servers: { globalSrv: { type: "stdio", command: "global" } } },
|
|
106
|
+
};
|
|
107
|
+
const projectConfig = {
|
|
108
|
+
version: "1",
|
|
109
|
+
mcp: { servers: { projectSrv: { type: "stdio", command: "project" } } },
|
|
110
|
+
};
|
|
111
|
+
const merged = {
|
|
112
|
+
version: "1",
|
|
113
|
+
mcp: {
|
|
114
|
+
servers: {
|
|
115
|
+
globalSrv: { type: "stdio", command: "global" },
|
|
116
|
+
projectSrv: { type: "stdio", command: "project" },
|
|
117
|
+
},
|
|
118
|
+
},
|
|
119
|
+
};
|
|
120
|
+
readGlobalConfigMock.mockReturnValue(globalConfig);
|
|
121
|
+
readKilnYamlMock.mockReturnValue(projectConfig);
|
|
122
|
+
mergeKilnYamlMock.mockReturnValue(merged);
|
|
123
|
+
const result = await loadKilnConfig("/repo");
|
|
124
|
+
expect(mergeKilnYamlMock).toHaveBeenCalledTimes(1);
|
|
125
|
+
expect(result?.mcp?.servers.globalSrv).toEqual({ type: "stdio", command: "global" });
|
|
126
|
+
expect(result?.mcp?.servers.projectSrv).toEqual({ type: "stdio", command: "project" });
|
|
127
|
+
});
|
|
128
|
+
it("globalToKilnYaml() maps provider, model, permissions, mcp, hooks correctly", () => {
|
|
129
|
+
const globalConfig = {
|
|
130
|
+
version: "1",
|
|
131
|
+
provider: "codex",
|
|
132
|
+
model: "gpt-5.4",
|
|
133
|
+
permissions: { approval: "on-request", sandbox: "read-only" },
|
|
134
|
+
mcp: { servers: { one: { type: "stdio", command: "one" } } },
|
|
135
|
+
hooks: {
|
|
136
|
+
SessionEnd: [{ hooks: [{ type: "command", command: "echo done" }] }],
|
|
137
|
+
},
|
|
138
|
+
};
|
|
139
|
+
expect(globalToKilnYaml(globalConfig)).toEqual({
|
|
140
|
+
version: "1",
|
|
141
|
+
provider: "codex",
|
|
142
|
+
model: { default: "gpt-5.4" },
|
|
143
|
+
permissions: { approval: "on-request", sandbox: "read-only" },
|
|
144
|
+
mcp: { servers: { one: { type: "stdio", command: "one" } } },
|
|
145
|
+
hooks: {
|
|
146
|
+
SessionEnd: [{ hooks: [{ type: "command", command: "echo done" }] }],
|
|
147
|
+
},
|
|
148
|
+
});
|
|
149
|
+
});
|
|
150
|
+
it("globalToKilnYaml() maps undefined model to undefined", () => {
|
|
151
|
+
const globalConfig = {
|
|
152
|
+
version: "1",
|
|
153
|
+
provider: "claude",
|
|
154
|
+
};
|
|
155
|
+
expect(globalToKilnYaml(globalConfig)).toEqual({
|
|
156
|
+
version: "1",
|
|
157
|
+
provider: "claude",
|
|
158
|
+
model: undefined,
|
|
159
|
+
permissions: undefined,
|
|
160
|
+
mcp: undefined,
|
|
161
|
+
hooks: undefined,
|
|
162
|
+
});
|
|
163
|
+
});
|
|
164
|
+
});
|
|
165
|
+
//# sourceMappingURL=config-merger.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config-merger.test.js","sourceRoot":"","sources":["../../src/config/config-merger.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
export declare function resolveEnvProvider(): string | undefined;
|
|
2
|
+
export declare function resolveEnvModel(): string | undefined;
|
|
3
|
+
export declare function resolveEffectiveProvider(flagProvider?: string, globalProvider?: string): string | undefined;
|
|
4
|
+
export declare function resolveEffectiveModel(flagModel?: string, globalModel?: string): string | undefined;
|
|
5
|
+
//# sourceMappingURL=env-config.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env-config.d.ts","sourceRoot":"","sources":["../../src/config/env-config.ts"],"names":[],"mappings":"AAQA,wBAAgB,kBAAkB,IAAI,MAAM,GAAG,SAAS,CAEvD;AAED,wBAAgB,eAAe,IAAI,MAAM,GAAG,SAAS,CAEpD;AAED,wBAAgB,wBAAwB,CACtC,YAAY,CAAC,EAAE,MAAM,EACrB,cAAc,CAAC,EAAE,MAAM,GACtB,MAAM,GAAG,SAAS,CAMpB;AAED,wBAAgB,qBAAqB,CACnC,SAAS,CAAC,EAAE,MAAM,EAClB,WAAW,CAAC,EAAE,MAAM,GACnB,MAAM,GAAG,SAAS,CAMpB"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
function normalizeNonEmpty(value) {
|
|
2
|
+
if (typeof value !== "string") {
|
|
3
|
+
return undefined;
|
|
4
|
+
}
|
|
5
|
+
const normalized = value.trim();
|
|
6
|
+
return normalized.length > 0 ? normalized : undefined;
|
|
7
|
+
}
|
|
8
|
+
export function resolveEnvProvider() {
|
|
9
|
+
return normalizeNonEmpty(process.env.KILN_PROVIDER);
|
|
10
|
+
}
|
|
11
|
+
export function resolveEnvModel() {
|
|
12
|
+
return normalizeNonEmpty(process.env.KILN_MODEL);
|
|
13
|
+
}
|
|
14
|
+
export function resolveEffectiveProvider(flagProvider, globalProvider) {
|
|
15
|
+
return (normalizeNonEmpty(flagProvider)
|
|
16
|
+
?? resolveEnvProvider()
|
|
17
|
+
?? normalizeNonEmpty(globalProvider));
|
|
18
|
+
}
|
|
19
|
+
export function resolveEffectiveModel(flagModel, globalModel) {
|
|
20
|
+
return (normalizeNonEmpty(flagModel)
|
|
21
|
+
?? resolveEnvModel()
|
|
22
|
+
?? normalizeNonEmpty(globalModel));
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=env-config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env-config.js","sourceRoot":"","sources":["../../src/config/env-config.ts"],"names":[],"mappings":"AAAA,SAAS,iBAAiB,CAAC,KAAc;IACvC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAChC,OAAO,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,kBAAkB;IAChC,OAAO,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AACtD,CAAC;AAED,MAAM,UAAU,eAAe;IAC7B,OAAO,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,YAAqB,EACrB,cAAuB;IAEvB,OAAO,CACL,iBAAiB,CAAC,YAAY,CAAC;WAC5B,kBAAkB,EAAE;WACpB,iBAAiB,CAAC,cAAc,CAAC,CACrC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,SAAkB,EAClB,WAAoB;IAEpB,OAAO,CACL,iBAAiB,CAAC,SAAS,CAAC;WACzB,eAAe,EAAE;WACjB,iBAAiB,CAAC,WAAW,CAAC,CAClC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env-config.test.d.ts","sourceRoot":"","sources":["../../src/config/env-config.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
import { afterEach, describe, expect, it } from "vitest";
|
|
2
|
+
import { resolveEffectiveModel, resolveEffectiveProvider, resolveEnvModel, resolveEnvProvider, } from "./env-config.js";
|
|
3
|
+
const originalProvider = process.env.KILN_PROVIDER;
|
|
4
|
+
const originalModel = process.env.KILN_MODEL;
|
|
5
|
+
afterEach(() => {
|
|
6
|
+
if (originalProvider === undefined) {
|
|
7
|
+
delete process.env.KILN_PROVIDER;
|
|
8
|
+
}
|
|
9
|
+
else {
|
|
10
|
+
process.env.KILN_PROVIDER = originalProvider;
|
|
11
|
+
}
|
|
12
|
+
if (originalModel === undefined) {
|
|
13
|
+
delete process.env.KILN_MODEL;
|
|
14
|
+
}
|
|
15
|
+
else {
|
|
16
|
+
process.env.KILN_MODEL = originalModel;
|
|
17
|
+
}
|
|
18
|
+
});
|
|
19
|
+
describe("resolveEnvProvider", () => {
|
|
20
|
+
it("returns undefined when KILN_PROVIDER is not set", () => {
|
|
21
|
+
delete process.env.KILN_PROVIDER;
|
|
22
|
+
expect(resolveEnvProvider()).toBeUndefined();
|
|
23
|
+
});
|
|
24
|
+
it("returns value when KILN_PROVIDER is set", () => {
|
|
25
|
+
process.env.KILN_PROVIDER = "openai";
|
|
26
|
+
expect(resolveEnvProvider()).toBe("openai");
|
|
27
|
+
});
|
|
28
|
+
it("returns undefined when KILN_PROVIDER is empty string", () => {
|
|
29
|
+
process.env.KILN_PROVIDER = "";
|
|
30
|
+
expect(resolveEnvProvider()).toBeUndefined();
|
|
31
|
+
});
|
|
32
|
+
});
|
|
33
|
+
describe("resolveEnvModel", () => {
|
|
34
|
+
it("returns undefined when KILN_MODEL is not set", () => {
|
|
35
|
+
delete process.env.KILN_MODEL;
|
|
36
|
+
expect(resolveEnvModel()).toBeUndefined();
|
|
37
|
+
});
|
|
38
|
+
it("returns value when KILN_MODEL is set", () => {
|
|
39
|
+
process.env.KILN_MODEL = "gpt-5.4";
|
|
40
|
+
expect(resolveEnvModel()).toBe("gpt-5.4");
|
|
41
|
+
});
|
|
42
|
+
it("returns undefined when KILN_MODEL is empty string", () => {
|
|
43
|
+
process.env.KILN_MODEL = "";
|
|
44
|
+
expect(resolveEnvModel()).toBeUndefined();
|
|
45
|
+
});
|
|
46
|
+
});
|
|
47
|
+
describe("resolveEffectiveProvider", () => {
|
|
48
|
+
it("flag wins over env over global", () => {
|
|
49
|
+
process.env.KILN_PROVIDER = "openai";
|
|
50
|
+
expect(resolveEffectiveProvider("claude", "ollama")).toBe("claude");
|
|
51
|
+
});
|
|
52
|
+
it("falls back to env when no flag", () => {
|
|
53
|
+
process.env.KILN_PROVIDER = "openrouter";
|
|
54
|
+
expect(resolveEffectiveProvider(undefined, "ollama")).toBe("openrouter");
|
|
55
|
+
});
|
|
56
|
+
it("falls back to global when no flag and no env", () => {
|
|
57
|
+
delete process.env.KILN_PROVIDER;
|
|
58
|
+
expect(resolveEffectiveProvider(undefined, "deepseek")).toBe("deepseek");
|
|
59
|
+
});
|
|
60
|
+
it("returns undefined when all are absent", () => {
|
|
61
|
+
delete process.env.KILN_PROVIDER;
|
|
62
|
+
expect(resolveEffectiveProvider()).toBeUndefined();
|
|
63
|
+
});
|
|
64
|
+
});
|
|
65
|
+
describe("resolveEffectiveModel", () => {
|
|
66
|
+
it("uses flag first", () => {
|
|
67
|
+
process.env.KILN_MODEL = "env-model";
|
|
68
|
+
expect(resolveEffectiveModel("flag-model", "global-model")).toBe("flag-model");
|
|
69
|
+
});
|
|
70
|
+
it("falls back to env when no flag", () => {
|
|
71
|
+
process.env.KILN_MODEL = "env-model";
|
|
72
|
+
expect(resolveEffectiveModel(undefined, "global-model")).toBe("env-model");
|
|
73
|
+
});
|
|
74
|
+
it("falls back to global when no flag and no env", () => {
|
|
75
|
+
delete process.env.KILN_MODEL;
|
|
76
|
+
expect(resolveEffectiveModel(undefined, "global-model")).toBe("global-model");
|
|
77
|
+
});
|
|
78
|
+
});
|
|
79
|
+
//# sourceMappingURL=env-config.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env-config.test.js","sourceRoot":"","sources":["../../src/config/env-config.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import type { KilnHooksConfig, KilnYamlMcp, KilnYamlPermissions } from "../kiln-yaml-types.js";
|
|
2
|
+
export interface KilnGlobalIdentity {
|
|
3
|
+
name?: string;
|
|
4
|
+
timezone?: string;
|
|
5
|
+
}
|
|
6
|
+
export interface KilnGlobalTuiConfig {
|
|
7
|
+
theme?: string;
|
|
8
|
+
}
|
|
9
|
+
export interface KilnGlobalConfig {
|
|
10
|
+
version?: "1";
|
|
11
|
+
provider?: string;
|
|
12
|
+
model?: string;
|
|
13
|
+
permissions?: KilnYamlPermissions;
|
|
14
|
+
mcp?: KilnYamlMcp;
|
|
15
|
+
hooks?: KilnHooksConfig;
|
|
16
|
+
identity?: KilnGlobalIdentity;
|
|
17
|
+
tui?: KilnGlobalTuiConfig;
|
|
18
|
+
}
|
|
19
|
+
export declare function resolveGlobalConfigPath(): string;
|
|
20
|
+
export declare function readGlobalConfig(): KilnGlobalConfig | null;
|
|
21
|
+
export declare function writeGlobalConfig(config: KilnGlobalConfig): void;
|
|
22
|
+
export declare function defaultGlobalConfig(): KilnGlobalConfig;
|
|
23
|
+
//# sourceMappingURL=global-config.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"global-config.d.ts","sourceRoot":"","sources":["../../src/config/global-config.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,eAAe,EACf,WAAW,EACX,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAE/B,MAAM,WAAW,kBAAkB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,mBAAmB,CAAC;IAClC,GAAG,CAAC,EAAE,WAAW,CAAC;IAClB,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,QAAQ,CAAC,EAAE,kBAAkB,CAAC;IAC9B,GAAG,CAAC,EAAE,mBAAmB,CAAC;CAC3B;AAED,wBAAgB,uBAAuB,IAAI,MAAM,CAMhD;AAED,wBAAgB,gBAAgB,IAAI,gBAAgB,GAAG,IAAI,CAoB1D;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAIhE;AAED,wBAAgB,mBAAmB,IAAI,gBAAgB,CAStD"}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
|
|
2
|
+
import { dirname, join } from "node:path";
|
|
3
|
+
import { homedir } from "node:os";
|
|
4
|
+
import { parse, stringify } from "yaml";
|
|
5
|
+
import { KilnYamlError } from "../kiln-yaml.js";
|
|
6
|
+
export function resolveGlobalConfigPath() {
|
|
7
|
+
const xdgConfigHome = process.env.XDG_CONFIG_HOME;
|
|
8
|
+
if (xdgConfigHome) {
|
|
9
|
+
return join(xdgConfigHome, "kiln", "config.yaml");
|
|
10
|
+
}
|
|
11
|
+
return join(homedir(), ".kiln", "config.yaml");
|
|
12
|
+
}
|
|
13
|
+
export function readGlobalConfig() {
|
|
14
|
+
const configPath = resolveGlobalConfigPath();
|
|
15
|
+
if (!existsSync(configPath)) {
|
|
16
|
+
return null;
|
|
17
|
+
}
|
|
18
|
+
const raw = readFileSync(configPath, "utf-8");
|
|
19
|
+
try {
|
|
20
|
+
const parsed = parse(raw);
|
|
21
|
+
if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
|
|
22
|
+
throw new KilnYamlError("Global config must be an object");
|
|
23
|
+
}
|
|
24
|
+
return parsed;
|
|
25
|
+
}
|
|
26
|
+
catch (err) {
|
|
27
|
+
if (err instanceof KilnYamlError) {
|
|
28
|
+
throw err;
|
|
29
|
+
}
|
|
30
|
+
throw new KilnYamlError(`Failed to parse global config: ${err instanceof Error ? err.message : String(err)}`);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
export function writeGlobalConfig(config) {
|
|
34
|
+
const configPath = resolveGlobalConfigPath();
|
|
35
|
+
mkdirSync(dirname(configPath), { recursive: true });
|
|
36
|
+
writeFileSync(configPath, stringify(config), "utf-8");
|
|
37
|
+
}
|
|
38
|
+
export function defaultGlobalConfig() {
|
|
39
|
+
return {
|
|
40
|
+
version: "1",
|
|
41
|
+
provider: "claude",
|
|
42
|
+
permissions: {
|
|
43
|
+
approval: "on-request",
|
|
44
|
+
sandbox: "read-only",
|
|
45
|
+
},
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
//# sourceMappingURL=global-config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"global-config.js","sourceRoot":"","sources":["../../src/config/global-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AA2BhD,MAAM,UAAU,uBAAuB;IACrC,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;IAClD,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;IACpD,CAAC;IACD,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,MAAM,UAAU,GAAG,uBAAuB,EAAE,CAAC;IAC7C,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,GAAG,GAAG,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC9C,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3E,MAAM,IAAI,aAAa,CAAC,iCAAiC,CAAC,CAAC;QAC7D,CAAC;QACD,OAAO,MAA0B,CAAC;IACpC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,YAAY,aAAa,EAAE,CAAC;YACjC,MAAM,GAAG,CAAC;QACZ,CAAC;QACD,MAAM,IAAI,aAAa,CACrB,kCAAkC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CACrF,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,MAAwB;IACxD,MAAM,UAAU,GAAG,uBAAuB,EAAE,CAAC;IAC7C,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACpD,aAAa,CAAC,UAAU,EAAE,SAAS,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,mBAAmB;IACjC,OAAO;QACL,OAAO,EAAE,GAAG;QACZ,QAAQ,EAAE,QAAQ;QAClB,WAAW,EAAE;YACX,QAAQ,EAAE,YAAY;YACtB,OAAO,EAAE,WAAW;SACrB;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"global-config.test.d.ts","sourceRoot":"","sources":["../../src/config/global-config.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
2
|
+
import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
|
|
3
|
+
import { homedir } from "node:os";
|
|
4
|
+
import { join } from "node:path";
|
|
5
|
+
vi.mock("node:fs", () => ({
|
|
6
|
+
existsSync: vi.fn(),
|
|
7
|
+
readFileSync: vi.fn(),
|
|
8
|
+
writeFileSync: vi.fn(),
|
|
9
|
+
mkdirSync: vi.fn(),
|
|
10
|
+
}));
|
|
11
|
+
vi.mock("node:os", () => ({
|
|
12
|
+
homedir: vi.fn(() => "/home/test-user"),
|
|
13
|
+
}));
|
|
14
|
+
import { KilnYamlError } from "../kiln-yaml.js";
|
|
15
|
+
import { defaultGlobalConfig, readGlobalConfig, resolveGlobalConfigPath, writeGlobalConfig, } from "./global-config.js";
|
|
16
|
+
const existsSyncMock = existsSync;
|
|
17
|
+
const readFileSyncMock = readFileSync;
|
|
18
|
+
const writeFileSyncMock = writeFileSync;
|
|
19
|
+
const mkdirSyncMock = mkdirSync;
|
|
20
|
+
const homedirMock = homedir;
|
|
21
|
+
describe("global-config", () => {
|
|
22
|
+
const originalXdgConfigHome = process.env.XDG_CONFIG_HOME;
|
|
23
|
+
beforeEach(() => {
|
|
24
|
+
vi.clearAllMocks();
|
|
25
|
+
existsSyncMock.mockReset();
|
|
26
|
+
readFileSyncMock.mockReset();
|
|
27
|
+
writeFileSyncMock.mockReset();
|
|
28
|
+
mkdirSyncMock.mockReset();
|
|
29
|
+
homedirMock.mockReset();
|
|
30
|
+
homedirMock.mockReturnValue("/home/test-user");
|
|
31
|
+
delete process.env.XDG_CONFIG_HOME;
|
|
32
|
+
});
|
|
33
|
+
afterEach(() => {
|
|
34
|
+
if (originalXdgConfigHome === undefined) {
|
|
35
|
+
delete process.env.XDG_CONFIG_HOME;
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
process.env.XDG_CONFIG_HOME = originalXdgConfigHome;
|
|
39
|
+
}
|
|
40
|
+
vi.restoreAllMocks();
|
|
41
|
+
});
|
|
42
|
+
it("resolveGlobalConfigPath() returns ~/.kiln/config.yaml when XDG_CONFIG_HOME is not set", () => {
|
|
43
|
+
const path = resolveGlobalConfigPath();
|
|
44
|
+
expect(path).toBe(join("/home/test-user", ".kiln", "config.yaml"));
|
|
45
|
+
});
|
|
46
|
+
it("resolveGlobalConfigPath() returns XDG_CONFIG_HOME/kiln/config.yaml when set", () => {
|
|
47
|
+
process.env.XDG_CONFIG_HOME = "/tmp/xdg";
|
|
48
|
+
const path = resolveGlobalConfigPath();
|
|
49
|
+
expect(path).toBe(join("/tmp/xdg", "kiln", "config.yaml"));
|
|
50
|
+
});
|
|
51
|
+
it("readGlobalConfig() returns null when file does not exist", () => {
|
|
52
|
+
existsSyncMock.mockReturnValue(false);
|
|
53
|
+
const config = readGlobalConfig();
|
|
54
|
+
expect(config).toBeNull();
|
|
55
|
+
});
|
|
56
|
+
it("readGlobalConfig() parses and returns valid config", () => {
|
|
57
|
+
existsSyncMock.mockReturnValue(true);
|
|
58
|
+
readFileSyncMock.mockReturnValue(["version: \"1\"", "provider: codex", "model: gpt-5.4"].join("\n"));
|
|
59
|
+
const config = readGlobalConfig();
|
|
60
|
+
expect(config).toEqual({
|
|
61
|
+
version: "1",
|
|
62
|
+
provider: "codex",
|
|
63
|
+
model: "gpt-5.4",
|
|
64
|
+
});
|
|
65
|
+
});
|
|
66
|
+
it("readGlobalConfig() throws KilnYamlError when file is not a YAML object", () => {
|
|
67
|
+
existsSyncMock.mockReturnValue(true);
|
|
68
|
+
readFileSyncMock.mockReturnValue("- not\n- an\n- object\n");
|
|
69
|
+
expect(() => readGlobalConfig()).toThrow(KilnYamlError);
|
|
70
|
+
expect(() => readGlobalConfig()).toThrow("Global config must be an object");
|
|
71
|
+
});
|
|
72
|
+
it("writeGlobalConfig() creates parent directories and writes stringified YAML", () => {
|
|
73
|
+
writeGlobalConfig({
|
|
74
|
+
version: "1",
|
|
75
|
+
provider: "codex",
|
|
76
|
+
model: "gpt-5.4",
|
|
77
|
+
});
|
|
78
|
+
expect(mkdirSyncMock).toHaveBeenCalledWith(join("/home/test-user", ".kiln"), {
|
|
79
|
+
recursive: true,
|
|
80
|
+
});
|
|
81
|
+
expect(writeFileSyncMock).toHaveBeenCalledTimes(1);
|
|
82
|
+
expect(writeFileSyncMock).toHaveBeenCalledWith(join("/home/test-user", ".kiln", "config.yaml"), expect.any(String), "utf-8");
|
|
83
|
+
expect(String(writeFileSyncMock.mock.calls[0]?.[1])).toContain("provider: codex");
|
|
84
|
+
});
|
|
85
|
+
it("defaultGlobalConfig() returns expected shape", () => {
|
|
86
|
+
expect(defaultGlobalConfig()).toEqual({
|
|
87
|
+
version: "1",
|
|
88
|
+
provider: "claude",
|
|
89
|
+
permissions: {
|
|
90
|
+
approval: "on-request",
|
|
91
|
+
sandbox: "read-only",
|
|
92
|
+
},
|
|
93
|
+
});
|
|
94
|
+
});
|
|
95
|
+
});
|
|
96
|
+
//# sourceMappingURL=global-config.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"global-config.test.js","sourceRoot":"","sources":["../../src/config/global-config.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
export declare function getKilnDir(projectPath: string, dirName: string): string;
|
|
2
|
+
export declare function getKilnYamlPath(kilnDir: string): string;
|
|
3
|
+
export declare function getAppYamlPath(kilnDir: string): string;
|
|
4
|
+
export declare function getGatewayYamlPath(kilnDir: string): string;
|
|
5
|
+
//# sourceMappingURL=config-resolver.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config-resolver.d.ts","sourceRoot":"","sources":["../src/config-resolver.ts"],"names":[],"mappings":"AAGA,wBAAgB,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAMvE;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE1D"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { existsSync, mkdirSync } from "node:fs";
|
|
2
|
+
import { join } from "node:path";
|
|
3
|
+
export function getKilnDir(projectPath, dirName) {
|
|
4
|
+
const kilnDir = join(projectPath, dirName);
|
|
5
|
+
if (!existsSync(kilnDir)) {
|
|
6
|
+
mkdirSync(kilnDir, { recursive: true });
|
|
7
|
+
}
|
|
8
|
+
return kilnDir;
|
|
9
|
+
}
|
|
10
|
+
export function getKilnYamlPath(kilnDir) {
|
|
11
|
+
return join(kilnDir, "kiln.yaml");
|
|
12
|
+
}
|
|
13
|
+
export function getAppYamlPath(kilnDir) {
|
|
14
|
+
return join(kilnDir, "app.yaml");
|
|
15
|
+
}
|
|
16
|
+
export function getGatewayYamlPath(kilnDir) {
|
|
17
|
+
return join(kilnDir, "gateway.yaml");
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=config-resolver.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config-resolver.js","sourceRoot":"","sources":["../src/config-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,UAAU,UAAU,CAAC,WAAmB,EAAE,OAAe;IAC7D,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC3C,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QACzB,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,OAAe;IAC7C,OAAO,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAe;IAC5C,OAAO,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,OAAe;IAChD,OAAO,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;AACvC,CAAC"}
|
package/dist/config.d.ts
CHANGED
|
@@ -1,20 +1,21 @@
|
|
|
1
1
|
import type { DomainConfig, DomainRegistry } from "@kilnai/core";
|
|
2
|
+
import type { KilnYaml, KilnHooksConfig } from "./kiln-yaml.js";
|
|
3
|
+
import type { ProjectedContext } from "./application/context-types.js";
|
|
2
4
|
/** Options passed to the system prompt builder */
|
|
3
5
|
export interface SystemPromptOptions {
|
|
4
6
|
readonly task: string;
|
|
5
7
|
readonly domain: DomainConfig;
|
|
6
|
-
readonly
|
|
8
|
+
readonly projectedContext: ProjectedContext;
|
|
7
9
|
readonly projectPath: string;
|
|
8
10
|
}
|
|
11
|
+
declare function defaultBuildSystemPrompt(opts: SystemPromptOptions): string;
|
|
9
12
|
/** Configuration for a Kiln-based CLI app */
|
|
10
13
|
export interface KilnAppConfig {
|
|
11
|
-
readonly appName: string;
|
|
12
|
-
readonly dirName: string;
|
|
13
|
-
readonly version: string;
|
|
14
|
-
readonly description: string;
|
|
15
14
|
readonly createRegistry: () => DomainRegistry;
|
|
16
|
-
readonly buildSystemPrompt
|
|
17
|
-
readonly mcpServerName: string;
|
|
15
|
+
readonly buildSystemPrompt?: (opts: SystemPromptOptions) => string;
|
|
18
16
|
readonly studioDistPath?: string;
|
|
17
|
+
readonly kilnYaml?: KilnYaml;
|
|
18
|
+
readonly hooks?: KilnHooksConfig;
|
|
19
19
|
}
|
|
20
|
+
export { defaultBuildSystemPrompt };
|
|
20
21
|
//# sourceMappingURL=config.d.ts.map
|
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAEvE,kDAAkD;AAClD,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC5C,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B;AAID,iBAAS,wBAAwB,CAAC,IAAI,EAAE,mBAAmB,GAAG,MAAM,CAenE;AAED,6CAA6C;AAC7C,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,cAAc,EAAE,MAAM,cAAc,CAAC;IAC9C,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,mBAAmB,KAAK,MAAM,CAAC;IACnE,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAC7B,QAAQ,CAAC,KAAK,CAAC,EAAE,eAAe,CAAC;CAClC;AAED,OAAO,EAAE,wBAAwB,EAAE,CAAC"}
|
package/dist/config.js
CHANGED
|
@@ -1,2 +1,15 @@
|
|
|
1
|
-
|
|
1
|
+
const DEFAULT_POLICY = { approval: "on-request", sandbox: "read-only" };
|
|
2
|
+
function defaultBuildSystemPrompt(opts) {
|
|
3
|
+
const { buildPreamble } = require("./wrapper/preamble-builder.js");
|
|
4
|
+
return buildPreamble({
|
|
5
|
+
mode: "api-key",
|
|
6
|
+
domain: opts.domain,
|
|
7
|
+
systemPrompt: "",
|
|
8
|
+
projectedContext: opts.projectedContext,
|
|
9
|
+
mcpServerEntryPath: "",
|
|
10
|
+
workingDirectory: opts.projectPath,
|
|
11
|
+
task: opts.task,
|
|
12
|
+
}, DEFAULT_POLICY, undefined);
|
|
13
|
+
}
|
|
14
|
+
export { defaultBuildSystemPrompt };
|
|
2
15
|
//# sourceMappingURL=config.js.map
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAYA,MAAM,cAAc,GAAG,EAAE,QAAQ,EAAE,YAAqB,EAAE,OAAO,EAAE,WAAoB,EAAE,CAAC;AAE1F,SAAS,wBAAwB,CAAC,IAAyB;IACzD,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC;IACnE,OAAO,aAAa,CAClB;QACE,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,YAAY,EAAE,EAAE;QAChB,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;QACvC,kBAAkB,EAAE,EAAE;QACtB,gBAAgB,EAAE,IAAI,CAAC,WAAW;QAClC,IAAI,EAAE,IAAI,CAAC,IAAI;KAChB,EACD,cAAc,EACd,SAAS,CACV,CAAC;AACJ,CAAC;AAWD,OAAO,EAAE,wBAAwB,EAAE,CAAC"}
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGjD,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,YAAY,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACpG,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC3D,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE9D,wBAAsB,SAAS,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CA2NpE"}
|