@delfos-ai/cli 1.0.4 → 1.0.7
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 +4 -5
- package/dist/api/__tests__/delfos-api.client.test.d.ts +2 -0
- package/dist/api/__tests__/delfos-api.client.test.d.ts.map +1 -0
- package/dist/api/__tests__/delfos-api.client.test.js +64 -0
- package/dist/api/__tests__/delfos-api.client.test.js.map +1 -0
- package/dist/api/delfos-api.client.d.ts +4 -1
- package/dist/api/delfos-api.client.d.ts.map +1 -1
- package/dist/api/delfos-api.client.js +44 -1
- package/dist/api/delfos-api.client.js.map +1 -1
- package/dist/commands/login.command.d.ts.map +1 -1
- package/dist/commands/login.command.js +16 -7
- package/dist/commands/login.command.js.map +1 -1
- package/dist/commands/logout.command.d.ts.map +1 -1
- package/dist/commands/logout.command.js +5 -1
- package/dist/commands/logout.command.js.map +1 -1
- package/dist/commands/memory/memory-init.command.d.ts +6 -0
- package/dist/commands/memory/memory-init.command.d.ts.map +1 -1
- package/dist/commands/memory/memory-init.command.js +40 -8
- package/dist/commands/memory/memory-init.command.js.map +1 -1
- package/dist/config/__tests__/cli-config.test.d.ts +2 -0
- package/dist/config/__tests__/cli-config.test.d.ts.map +1 -0
- package/dist/config/__tests__/cli-config.test.js +44 -0
- package/dist/config/__tests__/cli-config.test.js.map +1 -0
- package/dist/config/cli-config.d.ts +1 -1
- package/dist/config/cli-config.d.ts.map +1 -1
- package/dist/config/cli-config.js +41 -5
- package/dist/config/cli-config.js.map +1 -1
- package/dist/config/memory.config.d.ts +5 -5
- package/dist/config/memory.config.js +1 -1
- package/dist/config/memory.config.js.map +1 -1
- package/dist/features/memory-index/memory-index.schema.d.ts +4 -4
- package/dist/features/memory-init/index.d.ts +3 -0
- package/dist/features/memory-init/index.d.ts.map +1 -0
- package/dist/features/memory-init/index.js +2 -0
- package/dist/features/memory-init/index.js.map +1 -0
- package/dist/features/memory-read/memory-read.schema.d.ts +10 -10
- package/dist/features/memory-read/rag-reader.js +2 -2
- package/dist/features/memory-read/rag-reader.js.map +1 -1
- package/dist/features/memory-server/memory-server.d.ts.map +1 -1
- package/dist/features/memory-server/memory-server.js +22 -0
- package/dist/features/memory-server/memory-server.js.map +1 -1
- package/dist/features/memory-server/memory-server.schema.d.ts +17 -20
- package/dist/features/memory-server/memory-server.schema.d.ts.map +1 -1
- package/dist/features/memory-server/memory-server.schema.js +0 -1
- package/dist/features/memory-server/memory-server.schema.js.map +1 -1
- package/dist/features/memory-server/tools/memory-read.handler.js +1 -1
- package/dist/features/memory-server/tools/memory-read.handler.js.map +1 -1
- package/dist/features/memory-shared/__tests__/chunker.test.d.ts +2 -0
- package/dist/features/memory-shared/__tests__/chunker.test.d.ts.map +1 -0
- package/dist/features/memory-shared/__tests__/chunker.test.js +24 -0
- package/dist/features/memory-shared/__tests__/chunker.test.js.map +1 -0
- package/dist/features/memory-shared/__tests__/vault-slug.test.d.ts +2 -0
- package/dist/features/memory-shared/__tests__/vault-slug.test.d.ts.map +1 -0
- package/dist/features/memory-shared/__tests__/vault-slug.test.js +13 -0
- package/dist/features/memory-shared/__tests__/vault-slug.test.js.map +1 -0
- package/dist/features/memory-write/memory-write.schema.d.ts +2 -2
- package/dist/features/memory-write/vault-writer.d.ts.map +1 -1
- package/dist/features/memory-write/vault-writer.js +3 -0
- package/dist/features/memory-write/vault-writer.js.map +1 -1
- package/dist/infrastructure/crypto/crypto.d.ts +11 -0
- package/dist/infrastructure/crypto/crypto.d.ts.map +1 -0
- package/dist/infrastructure/crypto/crypto.js +57 -0
- package/dist/infrastructure/crypto/crypto.js.map +1 -0
- package/dist/infrastructure/embeddings/__tests__/local-embedding.provider.test.d.ts +2 -0
- package/dist/infrastructure/embeddings/__tests__/local-embedding.provider.test.d.ts.map +1 -0
- package/dist/infrastructure/embeddings/__tests__/local-embedding.provider.test.js +62 -0
- package/dist/infrastructure/embeddings/__tests__/local-embedding.provider.test.js.map +1 -0
- package/dist/infrastructure/embeddings/local-embedding.provider.d.ts +0 -3
- package/dist/infrastructure/embeddings/local-embedding.provider.d.ts.map +1 -1
- package/dist/infrastructure/embeddings/local-embedding.provider.js +7 -4
- package/dist/infrastructure/embeddings/local-embedding.provider.js.map +1 -1
- package/dist/infrastructure/logger/__tests__/logger.test.d.ts +2 -0
- package/dist/infrastructure/logger/__tests__/logger.test.d.ts.map +1 -0
- package/dist/infrastructure/logger/__tests__/logger.test.js +65 -0
- package/dist/infrastructure/logger/__tests__/logger.test.js.map +1 -0
- package/dist/infrastructure/vector-db/__tests__/chroma.adapter.test.d.ts +2 -0
- package/dist/infrastructure/vector-db/__tests__/chroma.adapter.test.d.ts.map +1 -0
- package/dist/infrastructure/vector-db/__tests__/chroma.adapter.test.js +153 -0
- package/dist/infrastructure/vector-db/__tests__/chroma.adapter.test.js.map +1 -0
- package/dist/infrastructure/vector-db/chroma.adapter.d.ts +3 -8
- package/dist/infrastructure/vector-db/chroma.adapter.d.ts.map +1 -1
- package/dist/infrastructure/vector-db/chroma.adapter.js +56 -60
- package/dist/infrastructure/vector-db/chroma.adapter.js.map +1 -1
- package/dist/utils/config.d.ts +2 -2
- package/dist/utils/config.d.ts.map +1 -1
- package/dist/utils/config.js +6 -2
- package/dist/utils/config.js.map +1 -1
- package/package.json +6 -2
package/README.md
CHANGED
|
@@ -70,10 +70,9 @@ Config armazenada em `~/.delfos/config.json`:
|
|
|
70
70
|
|
|
71
71
|
```json
|
|
72
72
|
{
|
|
73
|
-
"apiBaseUrl": "https://api.delfos.
|
|
73
|
+
"apiBaseUrl": "https://api-hml-ai.delfos.dev",
|
|
74
74
|
"token": "eyJhbGciOiJIUzI1NiIs...",
|
|
75
|
-
"userId": "uuid"
|
|
76
|
-
"email": "user@example.com"
|
|
75
|
+
"userId": "uuid"
|
|
77
76
|
}
|
|
78
77
|
```
|
|
79
78
|
|
|
@@ -84,8 +83,8 @@ Config armazenada em `~/.delfos/config.json`:
|
|
|
84
83
|
|
|
85
84
|
## Documentação
|
|
86
85
|
|
|
87
|
-
- [Documentação completa](https://docs.delfos.
|
|
88
|
-
- [Backend API](https://api.delfos.
|
|
86
|
+
- [Documentação completa](https://docs.delfos.dev/cli)
|
|
87
|
+
- [Backend API](https://api-hml-ai.delfos.dev/docs)
|
|
89
88
|
- [Repositório](https://github.com/delfos-io/delfos-cli)
|
|
90
89
|
|
|
91
90
|
## Licença
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"delfos-api.client.test.d.ts","sourceRoot":"","sources":["../../../src/api/__tests__/delfos-api.client.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import { DelfosApiClient } from '../delfos-api.client.js';
|
|
2
|
+
const mockFetch = jest.fn();
|
|
3
|
+
global.fetch = mockFetch;
|
|
4
|
+
function mockApiResponse(data, status = 200) {
|
|
5
|
+
return {
|
|
6
|
+
ok: status >= 200 && status < 300,
|
|
7
|
+
status,
|
|
8
|
+
json: jest.fn().mockResolvedValue(data),
|
|
9
|
+
text: jest.fn().mockResolvedValue(''),
|
|
10
|
+
};
|
|
11
|
+
}
|
|
12
|
+
const config = {
|
|
13
|
+
apiBaseUrl: 'https://api.delfos.ai',
|
|
14
|
+
directusUrl: 'https://directus.delfos.ai',
|
|
15
|
+
token: 'test-token',
|
|
16
|
+
};
|
|
17
|
+
describe('DelfosApiClient', () => {
|
|
18
|
+
let client;
|
|
19
|
+
beforeEach(() => {
|
|
20
|
+
mockFetch.mockReset();
|
|
21
|
+
client = new DelfosApiClient(config);
|
|
22
|
+
});
|
|
23
|
+
it('login() sends POST to directusUrl/auth/login and returns access_token', async () => {
|
|
24
|
+
mockFetch.mockResolvedValue(mockApiResponse({ data: { access_token: 'tok', refresh_token: 'ref' } }));
|
|
25
|
+
const result = await client.login('u@test.com', 'pass');
|
|
26
|
+
expect(result.access_token).toBe('tok');
|
|
27
|
+
expect(mockFetch).toHaveBeenCalledWith('https://directus.delfos.ai/auth/login', expect.objectContaining({ method: 'POST' }));
|
|
28
|
+
});
|
|
29
|
+
it('login() throws on 401 response', async () => {
|
|
30
|
+
mockFetch.mockResolvedValue(mockApiResponse({}, 401));
|
|
31
|
+
await expect(client.login('bad@test.com', 'wrong')).rejects.toThrow('[401]');
|
|
32
|
+
});
|
|
33
|
+
it('createObsidianConnection() sends Bearer token in Authorization header', async () => {
|
|
34
|
+
mockFetch.mockResolvedValue(mockApiResponse({ data: { id: 'c1', vault_name: 'test' } }));
|
|
35
|
+
await client.createObsidianConnection({
|
|
36
|
+
vault_name: 'test',
|
|
37
|
+
vault_path: '/tmp/vault',
|
|
38
|
+
connection_type: 'cli',
|
|
39
|
+
sync_status: 'connected',
|
|
40
|
+
});
|
|
41
|
+
expect(mockFetch).toHaveBeenCalledWith(expect.stringContaining('/api/v1/cli/obsidian-connections'), expect.objectContaining({
|
|
42
|
+
headers: expect.objectContaining({
|
|
43
|
+
Authorization: 'Bearer test-token',
|
|
44
|
+
}),
|
|
45
|
+
}));
|
|
46
|
+
});
|
|
47
|
+
it('listObsidianConnections() returns array of connections', async () => {
|
|
48
|
+
mockFetch.mockResolvedValue(mockApiResponse({ data: [{ id: 'c1' }, { id: 'c2' }] }));
|
|
49
|
+
const result = await client.listObsidianConnections();
|
|
50
|
+
expect(Array.isArray(result)).toBe(true);
|
|
51
|
+
expect(result).toHaveLength(2);
|
|
52
|
+
});
|
|
53
|
+
it('deleteObsidianConnection(id) sends DELETE to URL containing the id', async () => {
|
|
54
|
+
mockFetch.mockResolvedValue({
|
|
55
|
+
ok: true,
|
|
56
|
+
status: 204,
|
|
57
|
+
json: jest.fn(),
|
|
58
|
+
text: jest.fn(),
|
|
59
|
+
});
|
|
60
|
+
await client.deleteObsidianConnection('abc-123');
|
|
61
|
+
expect(mockFetch).toHaveBeenCalledWith(expect.stringContaining('abc-123'), expect.objectContaining({ method: 'DELETE' }));
|
|
62
|
+
});
|
|
63
|
+
});
|
|
64
|
+
//# sourceMappingURL=delfos-api.client.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"delfos-api.client.test.js","sourceRoot":"","sources":["../../../src/api/__tests__/delfos-api.client.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type CliConfig } from '../config/cli-config.js';
|
|
2
2
|
export interface LoginResponse {
|
|
3
3
|
access_token: string;
|
|
4
4
|
refresh_token: string;
|
|
@@ -22,11 +22,14 @@ export interface UpsertConnectionData {
|
|
|
22
22
|
}
|
|
23
23
|
export declare class DelfosApiClient {
|
|
24
24
|
private readonly config;
|
|
25
|
+
private refreshPromise;
|
|
25
26
|
constructor(config: CliConfig);
|
|
26
27
|
login(email: string, password: string): Promise<LoginResponse>;
|
|
27
28
|
createObsidianConnection(data: UpsertConnectionData): Promise<ObsidianConnection>;
|
|
28
29
|
listObsidianConnections(): Promise<ObsidianConnection[]>;
|
|
29
30
|
deleteObsidianConnection(id: string): Promise<void>;
|
|
31
|
+
private refreshDirectusToken;
|
|
32
|
+
private doRefresh;
|
|
30
33
|
private apiFetch;
|
|
31
34
|
}
|
|
32
35
|
//# sourceMappingURL=delfos-api.client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delfos-api.client.d.ts","sourceRoot":"","sources":["../../src/api/delfos-api.client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"delfos-api.client.d.ts","sourceRoot":"","sources":["../../src/api/delfos-api.client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EAGf,MAAM,yBAAyB,CAAC;AAKjC,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,KAAK,GAAG,KAAK,CAAC;IAC/B,WAAW,EAAE,WAAW,GAAG,QAAQ,GAAG,cAAc,GAAG,OAAO,CAAC;IAC/D,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,KAAK,GAAG,KAAK,CAAC;IAC/B,WAAW,EAAE,WAAW,GAAG,cAAc,GAAG,OAAO,CAAC;IACpD,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,eAAe;IAGd,OAAO,CAAC,QAAQ,CAAC,MAAM;IAFnC,OAAO,CAAC,cAAc,CAAgC;gBAEzB,MAAM,EAAE,SAAS;IAExC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAU9D,wBAAwB,CAC5B,IAAI,EAAE,oBAAoB,GACzB,OAAO,CAAC,kBAAkB,CAAC;IAUxB,uBAAuB,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAUxD,wBAAwB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAS3C,oBAAoB;YAapB,SAAS;YA4BT,QAAQ;CA2BvB"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
import { readConfig, writeConfig, } from '../config/cli-config.js';
|
|
1
2
|
import { createSliceLogger } from '../infrastructure/logger/index.js';
|
|
2
3
|
const logger = createSliceLogger('delfos-api-client');
|
|
3
4
|
export class DelfosApiClient {
|
|
4
5
|
config;
|
|
6
|
+
refreshPromise = null;
|
|
5
7
|
constructor(config) {
|
|
6
8
|
this.config = config;
|
|
7
9
|
}
|
|
@@ -21,7 +23,44 @@ export class DelfosApiClient {
|
|
|
21
23
|
async deleteObsidianConnection(id) {
|
|
22
24
|
await this.apiFetch(this.config.apiBaseUrl, `/api/v1/cli/obsidian-connections/${id}`, { method: 'DELETE' }, this.config.token);
|
|
23
25
|
}
|
|
24
|
-
async
|
|
26
|
+
async refreshDirectusToken() {
|
|
27
|
+
if (this.refreshPromise) {
|
|
28
|
+
return this.refreshPromise;
|
|
29
|
+
}
|
|
30
|
+
this.refreshPromise = this.doRefresh();
|
|
31
|
+
try {
|
|
32
|
+
return await this.refreshPromise;
|
|
33
|
+
}
|
|
34
|
+
finally {
|
|
35
|
+
this.refreshPromise = null;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
async doRefresh() {
|
|
39
|
+
const config = readConfig();
|
|
40
|
+
if (!config.refreshToken) {
|
|
41
|
+
throw new Error('Session expired. Run `delfos login` to authenticate.');
|
|
42
|
+
}
|
|
43
|
+
const res = await fetch(`${this.config.directusUrl}/auth/refresh`, {
|
|
44
|
+
method: 'POST',
|
|
45
|
+
headers: { 'Content-Type': 'application/json' },
|
|
46
|
+
body: JSON.stringify({
|
|
47
|
+
refresh_token: config.refreshToken,
|
|
48
|
+
mode: 'json',
|
|
49
|
+
}),
|
|
50
|
+
});
|
|
51
|
+
if (!res.ok) {
|
|
52
|
+
writeConfig({ token: undefined, refreshToken: undefined });
|
|
53
|
+
throw new Error('Session expired. Run `delfos login` to authenticate.');
|
|
54
|
+
}
|
|
55
|
+
const { data } = (await res.json());
|
|
56
|
+
if (!data?.access_token || !data?.refresh_token) {
|
|
57
|
+
writeConfig({ token: undefined, refreshToken: undefined });
|
|
58
|
+
throw new Error('Session expired. Run `delfos login` to authenticate.');
|
|
59
|
+
}
|
|
60
|
+
writeConfig({ token: data.access_token, refreshToken: data.refresh_token });
|
|
61
|
+
return data.access_token;
|
|
62
|
+
}
|
|
63
|
+
async apiFetch(baseUrl, path, init, bearerToken, isRetry = false) {
|
|
25
64
|
const url = `${baseUrl}${path}`;
|
|
26
65
|
const res = await fetch(url, {
|
|
27
66
|
...init,
|
|
@@ -32,6 +71,10 @@ export class DelfosApiClient {
|
|
|
32
71
|
},
|
|
33
72
|
});
|
|
34
73
|
if (!res.ok) {
|
|
74
|
+
if (res.status === 401 && !isRetry && bearerToken) {
|
|
75
|
+
const newToken = await this.refreshDirectusToken();
|
|
76
|
+
return this.apiFetch(baseUrl, path, init, newToken, true);
|
|
77
|
+
}
|
|
35
78
|
const body = await res.text().catch(() => '');
|
|
36
79
|
throw new Error(`DelfosApiClient: [${res.status}] ${path}: ${body}`);
|
|
37
80
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delfos-api.client.js","sourceRoot":"","sources":["../../src/api/delfos-api.client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"delfos-api.client.js","sourceRoot":"","sources":["../../src/api/delfos-api.client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.command.d.ts","sourceRoot":"","sources":["../../src/commands/login.command.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAgBpC,MAAM,WAAW,YAAY;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,YAAY,SAYN,CAAC;AAEpB,wBAAsB,QAAQ,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"login.command.d.ts","sourceRoot":"","sources":["../../src/commands/login.command.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAgBpC,MAAM,WAAW,YAAY;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,YAAY,SAYN,CAAC;AAEpB,wBAAsB,QAAQ,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAqEnE"}
|
|
@@ -53,7 +53,7 @@ export async function runLogin(options) {
|
|
|
53
53
|
}
|
|
54
54
|
const config = readConfig();
|
|
55
55
|
const client = new DelfosApiClient(config);
|
|
56
|
-
const { access_token } = await client.login(email, password);
|
|
56
|
+
const { access_token, refresh_token } = await client.login(email, password);
|
|
57
57
|
// Fetch user identity from Directus
|
|
58
58
|
const meRes = await fetch(`${config.directusUrl}/users/me`, {
|
|
59
59
|
headers: { Authorization: `Bearer ${access_token}` },
|
|
@@ -62,7 +62,11 @@ export async function runLogin(options) {
|
|
|
62
62
|
throw new Error(`Failed to fetch user info: ${meRes.status}`);
|
|
63
63
|
}
|
|
64
64
|
const { data: user } = (await meRes.json());
|
|
65
|
-
writeConfig({
|
|
65
|
+
writeConfig({
|
|
66
|
+
token: access_token,
|
|
67
|
+
refreshToken: refresh_token,
|
|
68
|
+
userId: user.id,
|
|
69
|
+
});
|
|
66
70
|
// eslint-disable-next-line no-console
|
|
67
71
|
console.log(chalk.green('✓ Logged in successfully'));
|
|
68
72
|
}
|
|
@@ -112,15 +116,15 @@ async function loginWithBrowser(timeoutSeconds) {
|
|
|
112
116
|
return;
|
|
113
117
|
}
|
|
114
118
|
try {
|
|
115
|
-
const { token, userId,
|
|
116
|
-
storeToken({ token, userId,
|
|
119
|
+
const { token, userId, refreshToken } = await exchangeCodeForToken(code, verifier);
|
|
120
|
+
storeToken({ token, userId, refreshToken });
|
|
117
121
|
res.writeHead(302, {
|
|
118
122
|
Location: `${appUrl}/cli-auth/callback?success=true`,
|
|
119
123
|
});
|
|
120
124
|
res.end();
|
|
121
125
|
server.close(() => {
|
|
122
126
|
clearTimeout(timer);
|
|
123
|
-
logger.info(chalk.green(`✓ Authenticated
|
|
127
|
+
logger.info(chalk.green(`✓ Authenticated. Token stored at ${CONFIG_PATH}`));
|
|
124
128
|
resolve();
|
|
125
129
|
});
|
|
126
130
|
}
|
|
@@ -149,7 +153,7 @@ async function loginWithBrowser(timeoutSeconds) {
|
|
|
149
153
|
}
|
|
150
154
|
async function exchangeCodeForToken(code, verifier) {
|
|
151
155
|
const config = readConfig();
|
|
152
|
-
const apiBaseUrl = config.apiBaseUrl ?? 'https://api.delfos.
|
|
156
|
+
const apiBaseUrl = config.apiBaseUrl ?? 'https://api-hml-ai.delfos.dev';
|
|
153
157
|
const res = await fetch(`${apiBaseUrl}/api/v1/cli/auth/exchange`, {
|
|
154
158
|
method: 'POST',
|
|
155
159
|
headers: { 'Content-Type': 'application/json' },
|
|
@@ -159,6 +163,11 @@ async function exchangeCodeForToken(code, verifier) {
|
|
|
159
163
|
const body = await res.text();
|
|
160
164
|
throw new Error(`Exchange failed [${res.status}]: ${body}`);
|
|
161
165
|
}
|
|
162
|
-
|
|
166
|
+
const data = await res.json();
|
|
167
|
+
logger.debug({ data }, 'API response from token exchange');
|
|
168
|
+
if (!data.refreshToken) {
|
|
169
|
+
logger.warn('refreshToken not returned by API - token refresh will not work');
|
|
170
|
+
}
|
|
171
|
+
return data;
|
|
163
172
|
}
|
|
164
173
|
//# sourceMappingURL=login.command.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.command.js","sourceRoot":"","sources":["../../src/commands/login.command.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EACL,oBAAoB,EACpB,qBAAqB,EACrB,aAAa,GACd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAE7D,MAAM,MAAM,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;AAU9C,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC;KAC7C,WAAW,CAAC,uCAAuC,CAAC;KACpD,MAAM,CAAC,iBAAiB,EAAE,eAAe,CAAC;KAC1C,MAAM,CAAC,uBAAuB,EAAE,UAAU,CAAC;KAC3C,MAAM,CAAC,iBAAiB,EAAE,uCAAuC,CAAC;KAClE,MAAM,CAAC,WAAW,EAAE,8BAA8B,CAAC;KACnD,MAAM,CACL,qBAAqB,EACrB,iCAAiC,EACjC,QAAQ,EACR,GAAG,CACJ;KACA,MAAM,CAAC,QAAQ,CAAC,CAAC;AAEpB,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,OAAqB;IAClD,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,MAAM,gBAAgB,CAAC,OAAO,CAAC,OAAO,IAAI,GAAG,CAAC,CAAC;QAC/C,OAAO;IACT,CAAC;IACD,IAAI,CAAC;QACH,qDAAqD;QACrD,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,WAAW,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;YACvC,sCAAsC;YACtC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC,CAAC;YAC1D,OAAO;QACT,CAAC;QAED,4DAA4D;QAC5D,IAAI,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC1B,IAAI,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QAEhC,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ,EAAE,CAAC;YACxB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;YACvD,MAAM,OAAO,GAAsD,EAAE,CAAC;YACtE,IAAI,CAAC,KAAK;gBACR,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;YACpE,IAAI,CAAC,QAAQ;gBACX,OAAO,CAAC,IAAI,CAAC;oBACX,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE,UAAU;oBAChB,OAAO,EAAE,WAAW;iBACrB,CAAC,CAAC;YACL,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC/C,KAAK,GAAG,KAAK,IAAK,OAAO,CAAC,KAAgB,CAAC;YAC3C,QAAQ,GAAG,QAAQ,IAAK,OAAO,CAAC,QAAmB,CAAC;QACtD,CAAC;QAED,MAAM,MAAM,GAAG,UAAU,EAAE,CAAC;QAC5B,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,MAAM,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"login.command.js","sourceRoot":"","sources":["../../src/commands/login.command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.command.d.ts","sourceRoot":"","sources":["../../src/commands/logout.command.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOpC,eAAO,MAAM,aAAa,SAEN,CAAC;AAErB,wBAAsB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"logout.command.d.ts","sourceRoot":"","sources":["../../src/commands/logout.command.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOpC,eAAO,MAAM,aAAa,SAEN,CAAC;AAErB,wBAAsB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CA2C/C"}
|
|
@@ -32,7 +32,11 @@ export async function runLogout() {
|
|
|
32
32
|
console.log(chalk.gray('Logout cancelled'));
|
|
33
33
|
return;
|
|
34
34
|
}
|
|
35
|
-
writeConfig({
|
|
35
|
+
writeConfig({
|
|
36
|
+
token: undefined,
|
|
37
|
+
refreshToken: undefined,
|
|
38
|
+
userId: undefined,
|
|
39
|
+
});
|
|
36
40
|
// eslint-disable-next-line no-console
|
|
37
41
|
console.log(chalk.green('✓ Logged out successfully'));
|
|
38
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.command.js","sourceRoot":"","sources":["../../src/commands/logout.command.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAEtE,MAAM,MAAM,GAAG,iBAAiB,CAAC,YAAY,CAAC,CAAC;AAE/C,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC;KAC/C,WAAW,CAAC,kCAAkC,CAAC;KAC/C,MAAM,CAAC,SAAS,CAAC,CAAC;AAErB,MAAM,CAAC,KAAK,UAAU,SAAS;IAC7B,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,UAAU,EAAE,CAAC;QAE5B,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAClB,sCAAsC;YACtC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,iCAAiC,CAAC,CAAC,CAAC;YAC7D,OAAO;QACT,CAAC;QAED,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;QACvD,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;YAC1C;gBACE,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,mCAAmC;gBAC5C,OAAO,EAAE,IAAI;aACd;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,sCAAsC;YACtC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;YAC5C,OAAO;QACT,CAAC;QAED,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"logout.command.js","sourceRoot":"","sources":["../../src/commands/logout.command.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAEtE,MAAM,MAAM,GAAG,iBAAiB,CAAC,YAAY,CAAC,CAAC;AAE/C,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC;KAC/C,WAAW,CAAC,kCAAkC,CAAC;KAC/C,MAAM,CAAC,SAAS,CAAC,CAAC;AAErB,MAAM,CAAC,KAAK,UAAU,SAAS;IAC7B,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,UAAU,EAAE,CAAC;QAE5B,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAClB,sCAAsC;YACtC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,iCAAiC,CAAC,CAAC,CAAC;YAC7D,OAAO;QACT,CAAC;QAED,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;QACvD,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;YAC1C;gBACE,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,mCAAmC;gBAC5C,OAAO,EAAE,IAAI;aACd;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,sCAAsC;YACtC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;YAC5C,OAAO;QACT,CAAC;QAED,WAAW,CAAC;YACV,KAAK,EAAE,SAAS;YAChB,YAAY,EAAE,SAAS;YACvB,MAAM,EAAE,SAAS;SAClB,CAAC,CAAC;QAEH,sCAAsC;QACtC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC,CAAC;IACxD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,eAAe,CAAC,CAAC;QACvC,sCAAsC;QACtC,OAAO,CAAC,KAAK,CACX,KAAK,CAAC,GAAG,CAAC,kBAAkB,CAAC,EAC7B,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CACjD,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC"}
|
|
@@ -1,3 +1,9 @@
|
|
|
1
1
|
import { Command } from 'commander';
|
|
2
|
+
export interface MemoryInitOptions {
|
|
3
|
+
vaultPath?: string;
|
|
4
|
+
index?: boolean;
|
|
5
|
+
register?: boolean;
|
|
6
|
+
}
|
|
7
|
+
export declare function runMemoryInit(options: MemoryInitOptions): Promise<void>;
|
|
2
8
|
export declare const memoryInitCommand: Command;
|
|
3
9
|
//# sourceMappingURL=memory-init.command.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory-init.command.d.ts","sourceRoot":"","sources":["../../../src/commands/memory/memory-init.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"memory-init.command.d.ts","sourceRoot":"","sources":["../../../src/commands/memory/memory-init.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAcpC,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqH7E;AAED,eAAO,MAAM,iBAAiB,SAKN,CAAC"}
|
|
@@ -7,17 +7,21 @@ import { indexVault } from '../../features/memory-index/vault-indexer.js';
|
|
|
7
7
|
import { chromaDBAdapter } from '../../infrastructure/vector-db/chroma.adapter.js';
|
|
8
8
|
import { localEmbeddingProvider } from '../../infrastructure/embeddings/local-embedding.provider.js';
|
|
9
9
|
import { createSliceLogger } from '../../infrastructure/logger/index.js';
|
|
10
|
+
import { readConfig } from '../../config/cli-config.js';
|
|
11
|
+
import { DelfosApiClient } from '../../api/delfos-api.client.js';
|
|
10
12
|
const logger = createSliceLogger('memory-init-command');
|
|
11
|
-
export
|
|
12
|
-
.description('Initialize Delfos memory structure in an Obsidian vault')
|
|
13
|
-
.option('--vault-path <path>', 'Path to the Obsidian vault')
|
|
14
|
-
.option('--index', 'Run indexing after initialization')
|
|
15
|
-
.option('--register', 'Register vault with Delfos backend (requires login)')
|
|
16
|
-
.action(async (options) => {
|
|
13
|
+
export async function runMemoryInit(options) {
|
|
17
14
|
const vaultPath = options.vaultPath ?? process.cwd();
|
|
18
15
|
const shouldIndex = options.index ?? false;
|
|
19
16
|
const resolvedVaultPath = path.resolve(vaultPath);
|
|
20
17
|
const templateDir = fileURLToPath(new URL('../../../templates/obsidian-vault', import.meta.url));
|
|
18
|
+
if (options.register) {
|
|
19
|
+
const config = readConfig();
|
|
20
|
+
if (!config.token) {
|
|
21
|
+
console.error('Error: --register requires authentication. Run `delfos login` first.');
|
|
22
|
+
process.exit(1);
|
|
23
|
+
}
|
|
24
|
+
}
|
|
21
25
|
console.log(`Initializing Delfos memory structure in: ${resolvedVaultPath}`);
|
|
22
26
|
console.log('');
|
|
23
27
|
try {
|
|
@@ -35,7 +39,29 @@ export const memoryInitCommand = new Command('init')
|
|
|
35
39
|
}
|
|
36
40
|
console.log('');
|
|
37
41
|
if (options.register) {
|
|
38
|
-
|
|
42
|
+
const config = readConfig();
|
|
43
|
+
try {
|
|
44
|
+
const client = new DelfosApiClient(config);
|
|
45
|
+
const vaultName = path.basename(resolvedVaultPath);
|
|
46
|
+
await client.createObsidianConnection({
|
|
47
|
+
vault_name: vaultName,
|
|
48
|
+
vault_path: resolvedVaultPath,
|
|
49
|
+
connection_type: 'cli',
|
|
50
|
+
sync_status: 'connected',
|
|
51
|
+
});
|
|
52
|
+
console.log(`✓ Vault registered with Delfos backend as "${vaultName}"`);
|
|
53
|
+
}
|
|
54
|
+
catch (err) {
|
|
55
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
56
|
+
const isAuthError = message.includes('Session expired') || message.includes('401');
|
|
57
|
+
console.error(`Warning: Failed to register vault: ${message}`);
|
|
58
|
+
if (isAuthError) {
|
|
59
|
+
console.warn("Your session has expired. Run 'delfos login' and then re-run with --register.");
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
console.warn("You can retry registration later with 'delfos memory init --register'.");
|
|
63
|
+
}
|
|
64
|
+
}
|
|
39
65
|
}
|
|
40
66
|
console.log('Next steps:');
|
|
41
67
|
console.log(" Run 'delfos memory index' to index your vault");
|
|
@@ -68,5 +94,11 @@ export const memoryInitCommand = new Command('init')
|
|
|
68
94
|
console.warn("Run 'delfos memory index' to index manually.");
|
|
69
95
|
}
|
|
70
96
|
}
|
|
71
|
-
}
|
|
97
|
+
}
|
|
98
|
+
export const memoryInitCommand = new Command('init')
|
|
99
|
+
.description('Initialize Delfos memory structure in an Obsidian vault')
|
|
100
|
+
.option('--vault-path <path>', 'Path to the Obsidian vault')
|
|
101
|
+
.option('--index', 'Run indexing after initialization')
|
|
102
|
+
.option('--register', 'Register vault with Delfos backend (requires login)')
|
|
103
|
+
.action(runMemoryInit);
|
|
72
104
|
//# sourceMappingURL=memory-init.command.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory-init.command.js","sourceRoot":"","sources":["../../../src/commands/memory/memory-init.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,gDAAgD,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,+CAA+C,CAAC;AACjF,OAAO,EAAE,UAAU,EAAE,MAAM,8CAA8C,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,kDAAkD,CAAC;AACnF,OAAO,EAAE,sBAAsB,EAAE,MAAM,6DAA6D,CAAC;AACrG,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"memory-init.command.js","sourceRoot":"","sources":["../../../src/commands/memory/memory-init.command.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cli-config.test.d.ts","sourceRoot":"","sources":["../../../src/config/__tests__/cli-config.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { readConfig, writeConfig, getDefaultConfig } from '../cli-config.js';
|
|
2
|
+
const mockReadFileSync = jest.fn();
|
|
3
|
+
const mockWriteFileSync = jest.fn();
|
|
4
|
+
const mockMkdirSync = jest.fn();
|
|
5
|
+
jest.mock('node:fs', () => ({
|
|
6
|
+
readFileSync: (...args) => mockReadFileSync(...args),
|
|
7
|
+
writeFileSync: (...args) => mockWriteFileSync(...args),
|
|
8
|
+
mkdirSync: (...args) => mockMkdirSync(...args),
|
|
9
|
+
}));
|
|
10
|
+
describe('cli-config', () => {
|
|
11
|
+
beforeEach(() => {
|
|
12
|
+
mockReadFileSync.mockReset();
|
|
13
|
+
mockWriteFileSync.mockReset();
|
|
14
|
+
mockMkdirSync.mockReset();
|
|
15
|
+
});
|
|
16
|
+
it('reads existing config.json and merges over defaults', () => {
|
|
17
|
+
mockReadFileSync.mockReturnValue(JSON.stringify({ token: 'abc', email: 'u@test.com' }));
|
|
18
|
+
const config = readConfig();
|
|
19
|
+
expect(config.token).toBe('abc');
|
|
20
|
+
expect(config.email).toBe('u@test.com');
|
|
21
|
+
expect(config.apiBaseUrl).toBe('https://api.delfos.ai');
|
|
22
|
+
});
|
|
23
|
+
it('writes new config with merged values', () => {
|
|
24
|
+
mockReadFileSync.mockReturnValue(JSON.stringify({}));
|
|
25
|
+
writeConfig({ token: 'tok' });
|
|
26
|
+
expect(mockWriteFileSync).toHaveBeenCalledWith(expect.stringContaining('config.json'), expect.stringContaining('"token": "tok"'), 'utf-8');
|
|
27
|
+
});
|
|
28
|
+
it('returns defaults when config.json is absent', () => {
|
|
29
|
+
mockReadFileSync.mockImplementation(() => {
|
|
30
|
+
const err = new Error('ENOENT');
|
|
31
|
+
err.code = 'ENOENT';
|
|
32
|
+
throw err;
|
|
33
|
+
});
|
|
34
|
+
expect(readConfig()).toEqual(getDefaultConfig());
|
|
35
|
+
});
|
|
36
|
+
it('merges partial update without overwriting existing fields', () => {
|
|
37
|
+
mockReadFileSync.mockReturnValue(JSON.stringify({ email: 'old@x.com', token: 'old-tok' }));
|
|
38
|
+
writeConfig({ token: 'new-tok' });
|
|
39
|
+
const written = JSON.parse(mockWriteFileSync.mock.calls[0][1]);
|
|
40
|
+
expect(written['email']).toBe('old@x.com');
|
|
41
|
+
expect(written['token']).toBe('new-tok');
|
|
42
|
+
});
|
|
43
|
+
});
|
|
44
|
+
//# sourceMappingURL=cli-config.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cli-config.test.js","sourceRoot":"","sources":["../../../src/config/__tests__/cli-config.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-config.d.ts","sourceRoot":"","sources":["../../src/config/cli-config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cli-config.d.ts","sourceRoot":"","sources":["../../src/config/cli-config.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,SAAS;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAeD,wBAAgB,gBAAgB,IAAI,SAAS,CAM5C;AAED,wBAAgB,UAAU,IAAI,SAAS,CA0BtC;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,IAAI,CA6B7D"}
|
|
@@ -1,21 +1,38 @@
|
|
|
1
1
|
import * as fs from 'node:fs';
|
|
2
2
|
import * as path from 'node:path';
|
|
3
3
|
import * as os from 'node:os';
|
|
4
|
+
import { encrypt, decrypt } from '../infrastructure/crypto/crypto.js';
|
|
5
|
+
import { createSliceLogger } from '../infrastructure/logger/index.js';
|
|
6
|
+
const logger = createSliceLogger('cli-config');
|
|
4
7
|
const CONFIG_DIR = path.join(os.homedir(), '.delfos');
|
|
5
8
|
const CONFIG_PATH = path.join(CONFIG_DIR, 'config.json');
|
|
6
9
|
export function getDefaultConfig() {
|
|
7
10
|
return {
|
|
8
|
-
apiBaseUrl: 'https://api.delfos.ai',
|
|
9
|
-
directusUrl: 'https://directus.delfos.ai',
|
|
10
11
|
appUrl: 'https://hml-ai.delfos.dev',
|
|
12
|
+
apiBaseUrl: 'https://api-hml-ai.delfos.dev',
|
|
13
|
+
directusUrl: 'https://cms-hml-ai.delfos.dev',
|
|
11
14
|
};
|
|
12
15
|
}
|
|
13
16
|
export function readConfig() {
|
|
14
17
|
try {
|
|
15
18
|
const raw = fs.readFileSync(CONFIG_PATH, 'utf-8');
|
|
19
|
+
const encrypted = JSON.parse(raw);
|
|
20
|
+
const defaults = getDefaultConfig();
|
|
16
21
|
return {
|
|
17
|
-
...
|
|
18
|
-
|
|
22
|
+
...defaults,
|
|
23
|
+
appUrl: encrypted.appUrl,
|
|
24
|
+
apiBaseUrl: encrypted.apiBaseUrl
|
|
25
|
+
? decrypt(encrypted.apiBaseUrl)
|
|
26
|
+
: defaults.apiBaseUrl,
|
|
27
|
+
directusUrl: encrypted.directusUrl
|
|
28
|
+
? decrypt(encrypted.directusUrl)
|
|
29
|
+
: defaults.directusUrl,
|
|
30
|
+
token: encrypted.token ? decrypt(encrypted.token) : undefined,
|
|
31
|
+
refreshToken: encrypted.refreshToken
|
|
32
|
+
? decrypt(encrypted.refreshToken)
|
|
33
|
+
: undefined,
|
|
34
|
+
userId: encrypted.userId ? decrypt(encrypted.userId) : undefined,
|
|
35
|
+
chromaPersistDir: encrypted.chromaPersistDir,
|
|
19
36
|
};
|
|
20
37
|
}
|
|
21
38
|
catch {
|
|
@@ -25,7 +42,26 @@ export function readConfig() {
|
|
|
25
42
|
export function writeConfig(partial) {
|
|
26
43
|
const current = readConfig();
|
|
27
44
|
const merged = { ...current, ...partial };
|
|
45
|
+
const encrypted = {
|
|
46
|
+
apiBaseUrl: merged.apiBaseUrl ? encrypt(merged.apiBaseUrl) : undefined,
|
|
47
|
+
directusUrl: merged.directusUrl ? encrypt(merged.directusUrl) : undefined,
|
|
48
|
+
appUrl: merged.appUrl,
|
|
49
|
+
token: merged.token ? encrypt(merged.token) : undefined,
|
|
50
|
+
refreshToken: merged.refreshToken
|
|
51
|
+
? encrypt(merged.refreshToken)
|
|
52
|
+
: undefined,
|
|
53
|
+
userId: merged.userId ? encrypt(merged.userId) : undefined,
|
|
54
|
+
chromaPersistDir: merged.chromaPersistDir,
|
|
55
|
+
};
|
|
28
56
|
fs.mkdirSync(CONFIG_DIR, { recursive: true });
|
|
29
|
-
fs.writeFileSync(CONFIG_PATH, JSON.stringify(
|
|
57
|
+
fs.writeFileSync(CONFIG_PATH, JSON.stringify(encrypted, null, 2), 'utf-8');
|
|
58
|
+
// Set file permissions to 600 (read/write for owner only)
|
|
59
|
+
try {
|
|
60
|
+
fs.chmodSync(CONFIG_PATH, 0o600);
|
|
61
|
+
}
|
|
62
|
+
catch (error) {
|
|
63
|
+
// Log warning but don't fail if chmod fails (e.g., on Windows)
|
|
64
|
+
logger.warn({ error }, `Could not set secure permissions on ${CONFIG_PATH}`);
|
|
65
|
+
}
|
|
30
66
|
}
|
|
31
67
|
//# sourceMappingURL=cli-config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-config.js","sourceRoot":"","sources":["../../src/config/cli-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"cli-config.js","sourceRoot":"","sources":["../../src/config/cli-config.ts"],"names":[],"mappings":"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"}
|