@didim365/agent-cli-core 0.1.2 → 0.1.3

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.
Files changed (6) hide show
  1. package/dist/src/core/apiKeyCredentialStorage.d.ts +23 -3
  2. package/dist/src/core/apiKeyCredentialStorage.js +56 -16
  3. package/dist/src/core/apiKeyCredentialStorage.js.map +1 -1
  4. package/dist/src/generated/git-commit.d.ts +1 -1
  5. package/dist/src/generated/git-commit.js +1 -1
  6. package/package.json +1 -1
package/dist/src/core/apiKeyCredentialStorage.d.ts CHANGED
@@ -4,14 +4,34 @@
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
6
  /**
7
- * Load cached API key
7
+ * Mapping from provider name to keychain entry name.
8
+ * 'gemini' maps to 'default-api-key' for backward compatibility.
9
+ */
10
+ export declare const PROVIDER_KEYCHAIN_ENTRIES: Record<string, string>;
11
+ /**
12
+ * Load API key for a specific provider from the keychain.
13
+ */
14
+ export declare function loadProviderApiKey(provider: string): Promise<string | null>;
15
+ /**
16
+ * Save API key for a specific provider to the keychain.
17
+ */
18
+ export declare function saveProviderApiKey(provider: string, apiKey: string | null | undefined): Promise<void>;
19
+ /**
20
+ * Clear API key for a specific provider from the keychain.
21
+ */
22
+ export declare function clearProviderApiKey(provider: string): Promise<void>;
23
+ /**
24
+ * Load cached API key (Gemini)
25
+ * @deprecated Use loadProviderApiKey('gemini') instead
8
26
  */
9
27
  export declare function loadApiKey(): Promise<string | null>;
10
28
  /**
11
- * Save API key
29
+ * Save API key (Gemini)
30
+ * @deprecated Use saveProviderApiKey('gemini', apiKey) instead
12
31
  */
13
32
  export declare function saveApiKey(apiKey: string | null | undefined): Promise<void>;
14
33
  /**
15
- * Clear cached API key
34
+ * Clear cached API key (Gemini)
35
+ * @deprecated Use clearProviderApiKey('gemini') instead
16
36
  */
17
37
  export declare function clearApiKey(): Promise<void>;
package/dist/src/core/apiKeyCredentialStorage.js CHANGED
@@ -7,41 +7,58 @@ import { HybridTokenStorage } from '../mcp/token-storage/hybrid-token-storage.js
7
7
  import { debugLogger } from '../utils/debugLogger.js';
8
8
  const KEYCHAIN_SERVICE_NAME = 'gemini-cli-api-key';
9
9
  const DEFAULT_API_KEY_ENTRY = 'default-api-key';
10
+ /**
11
+ * Mapping from provider name to keychain entry name.
12
+ * 'gemini' maps to 'default-api-key' for backward compatibility.
13
+ */
14
+ export const PROVIDER_KEYCHAIN_ENTRIES = {
15
+ gemini: DEFAULT_API_KEY_ENTRY,
16
+ claude: 'claude-api-key',
17
+ openai: 'openai-api-key',
18
+ 'openai-compatible': 'slm-api-key',
19
+ didim: 'didim-api-key',
20
+ };
10
21
  const storage = new HybridTokenStorage(KEYCHAIN_SERVICE_NAME);
11
22
  /**
12
- * Load cached API key
23
+ * Get the keychain entry name for a provider.
24
+ * Falls back to the provider string itself if not found in the mapping.
13
25
  */
14
- export async function loadApiKey() {
26
+ function getEntryName(provider) {
27
+ return PROVIDER_KEYCHAIN_ENTRIES[provider] ?? provider;
28
+ }
29
+ /**
30
+ * Load API key for a specific provider from the keychain.
31
+ */
32
+ export async function loadProviderApiKey(provider) {
15
33
  try {
16
- const credentials = await storage.getCredentials(DEFAULT_API_KEY_ENTRY);
34
+ const entryName = getEntryName(provider);
35
+ const credentials = await storage.getCredentials(entryName);
17
36
  if (credentials?.token?.accessToken) {
18
37
  return credentials.token.accessToken;
19
38
  }
20
39
  return null;
21
40
  }
22
41
  catch (error) {
23
- // Log other errors but don't crash, just return null so user can re-enter key
24
- debugLogger.error('Failed to load API key from storage:', error);
42
+ debugLogger.error(`Failed to load API key for provider '${provider}' from storage:`, error);
25
43
  return null;
26
44
  }
27
45
  }
28
46
  /**
29
- * Save API key
47
+ * Save API key for a specific provider to the keychain.
30
48
  */
31
- export async function saveApiKey(apiKey) {
49
+ export async function saveProviderApiKey(provider, apiKey) {
50
+ const entryName = getEntryName(provider);
32
51
  if (!apiKey || apiKey.trim() === '') {
33
52
  try {
34
- await storage.deleteCredentials(DEFAULT_API_KEY_ENTRY);
53
+ await storage.deleteCredentials(entryName);
35
54
  }
36
55
  catch (error) {
37
- // Ignore errors when deleting, as it might not exist
38
- debugLogger.warn('Failed to delete API key from storage:', error);
56
+ debugLogger.warn(`Failed to delete API key for provider '${provider}' from storage:`, error);
39
57
  }
40
58
  return;
41
59
  }
42
- // Wrap API key in OAuthCredentials format as required by HybridTokenStorage
43
60
  const credentials = {
44
- serverName: DEFAULT_API_KEY_ENTRY,
61
+ serverName: entryName,
45
62
  token: {
46
63
  accessToken: apiKey,
47
64
  tokenType: 'ApiKey',
@@ -51,14 +68,37 @@ export async function saveApiKey(apiKey) {
51
68
  await storage.setCredentials(credentials);
52
69
  }
53
70
  /**
54
- * Clear cached API key
71
+ * Clear API key for a specific provider from the keychain.
55
72
  */
56
- export async function clearApiKey() {
73
+ export async function clearProviderApiKey(provider) {
57
74
  try {
58
- await storage.deleteCredentials(DEFAULT_API_KEY_ENTRY);
75
+ const entryName = getEntryName(provider);
76
+ await storage.deleteCredentials(entryName);
59
77
  }
60
78
  catch (error) {
61
- debugLogger.error('Failed to clear API key from storage:', error);
79
+ debugLogger.error(`Failed to clear API key for provider '${provider}' from storage:`, error);
62
80
  }
63
81
  }
82
+ // --- Backward-compatible aliases (delegate to gemini provider) ---
83
+ /**
84
+ * Load cached API key (Gemini)
85
+ * @deprecated Use loadProviderApiKey('gemini') instead
86
+ */
87
+ export async function loadApiKey() {
88
+ return loadProviderApiKey('gemini');
89
+ }
90
+ /**
91
+ * Save API key (Gemini)
92
+ * @deprecated Use saveProviderApiKey('gemini', apiKey) instead
93
+ */
94
+ export async function saveApiKey(apiKey) {
95
+ return saveProviderApiKey('gemini', apiKey);
96
+ }
97
+ /**
98
+ * Clear cached API key (Gemini)
99
+ * @deprecated Use clearProviderApiKey('gemini') instead
100
+ */
101
+ export async function clearApiKey() {
102
+ return clearProviderApiKey('gemini');
103
+ }
64
104
  //# sourceMappingURL=apiKeyCredentialStorage.js.map
package/dist/src/core/apiKeyCredentialStorage.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"apiKeyCredentialStorage.js","sourceRoot":"","sources":["../../../src/core/apiKeyCredentialStorage.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAC;AAElF,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,MAAM,qBAAqB,GAAG,oBAAoB,CAAC;AACnD,MAAM,qBAAqB,GAAG,iBAAiB,CAAC;AAEhD,MAAM,OAAO,GAAG,IAAI,kBAAkB,CAAC,qBAAqB,CAAC,CAAC;AAE9D;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU;IAC9B,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC;QAExE,IAAI,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;YACpC,OAAO,WAAW,CAAC,KAAK,CAAC,WAAW,CAAC;QACvC,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,8EAA8E;QAC9E,WAAW,CAAC,KAAK,CAAC,sCAAsC,EAAE,KAAK,CAAC,CAAC;QACjE,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,MAAiC;IAEjC,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QACpC,IAAI,CAAC;YACH,MAAM,OAAO,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,CAAC;QACzD,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,qDAAqD;YACrD,WAAW,CAAC,IAAI,CAAC,wCAAwC,EAAE,KAAK,CAAC,CAAC;QACpE,CAAC;QACD,OAAO;IACT,CAAC;IAED,4EAA4E;IAC5E,MAAM,WAAW,GAAqB;QACpC,UAAU,EAAE,qBAAqB;QACjC,KAAK,EAAE;YACL,WAAW,EAAE,MAAM;YACnB,SAAS,EAAE,QAAQ;SACpB;QACD,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;KACtB,CAAC;IAEF,MAAM,OAAO,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;AAC5C,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW;IAC/B,IAAI,CAAC;QACH,MAAM,OAAO,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,CAAC;IACzD,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,WAAW,CAAC,KAAK,CAAC,uCAAuC,EAAE,KAAK,CAAC,CAAC;IACpE,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"apiKeyCredentialStorage.js","sourceRoot":"","sources":["../../../src/core/apiKeyCredentialStorage.ts"],"names":[],"mappings":"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"}
package/dist/src/generated/git-commit.d.ts CHANGED
@@ -3,5 +3,5 @@
3
3
  * Copyright 2026 Google LLC
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
- export declare const GIT_COMMIT_INFO = "680168b70";
6
+ export declare const GIT_COMMIT_INFO = "ed20709df";
7
7
  export declare const CLI_VERSION = "0.27.0-nightly.20260121.97aac696f";
package/dist/src/generated/git-commit.js CHANGED
@@ -5,6 +5,6 @@
5
5
  */
6
6
  // This file is auto-generated by the build script (scripts/generate-git-commit-info.js)
7
7
  // Do not edit this file manually.
8
- export const GIT_COMMIT_INFO = '680168b70';
8
+ export const GIT_COMMIT_INFO = 'ed20709df';
9
9
  export const CLI_VERSION = '0.27.0-nightly.20260121.97aac696f';
10
10
  //# sourceMappingURL=git-commit.js.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@didim365/agent-cli-core",
3
- "version": "0.1.2",
3
+ "version": "0.1.3",
4
4
  "description": "Gemini CLI Core",
5
5
  "license": "Apache-2.0",
6
6
  "repository": {