@seandong/seno 0.1.0 → 0.1.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 CHANGED
@@ -4,25 +4,23 @@ ONES 企业内部 AI Agent CLI
4
4
 
5
5
  ## 快速开始
6
6
 
7
- ### 环境要求
8
-
9
- - [Bun](https://bun.sh) >= 1.0
10
-
11
- ### 安装
7
+ ### 一键安装
12
8
 
13
9
  ```bash
14
- git clone <repo-url>
15
- cd ones-agent-cli
16
- bun install
17
- bun link
10
+ curl -fsSL https://seno.help/install.sh | bash
18
11
  ```
19
12
 
20
- ### 初始化
13
+ ### 手动安装
21
14
 
22
15
  ```bash
16
+ npm install -g @seandong/seno
23
17
  seno init
24
18
  ```
25
19
 
20
+ ### 环境要求
21
+
22
+ - Node.js >= 18
23
+
26
24
  按照交互提示完成配置:
27
25
 
28
26
  1. 选择 LLM Provider
@@ -1,9 +1,8 @@
1
1
  import { createInterface } from 'node:readline';
2
2
  import chalk from 'chalk';
3
3
  import { loadConfig, saveConfig, getConfigPath, isInitialized, formatModelId } from '../config/manager.js';
4
- import { PROVIDER_REGISTRY } from '../llm/factory.js';
5
- import { codexOAuthLogin } from '../llm/openai-codex.js';
6
- import { promptQuestion, promptChoice, questionSecret, CancelError } from '../cli/prompt.js';
4
+ import { promptQuestion, CancelError } from '../cli/prompt.js';
5
+ import { runProviderAuth } from './provider-auth.js';
7
6
  /**
8
7
  * 验证 URL 格式
9
8
  */
@@ -38,63 +37,36 @@ export async function initCommand() {
38
37
  }
39
38
  }
40
39
  console.log('\n🔧 SENO CLI 初始化配置\n');
41
- // ── Step 1: 选择 LLM Provider ──────────────────────────
42
- console.log(chalk.cyan(' 选择 LLM Provider:'));
43
- const providerOptions = PROVIDER_REGISTRY.map((p) => p.displayName);
44
- const providerIdx = await promptChoice(rl, '', providerOptions, 0);
45
- const selectedProvider = PROVIDER_REGISTRY[providerIdx ?? 0];
46
- // ── Step 2: 授权方式(只有一种时跳过) ────────────────────
47
- let selectedAuthMode = selectedProvider.authModes[0];
48
- if (selectedProvider.authModes.length > 1) {
49
- const authOptions = selectedProvider.authModes.map((a) => a.displayName);
50
- console.log();
51
- console.log(chalk.cyan(' 选择授权方式:'));
52
- const authIdx = await promptChoice(rl, '', authOptions, 0);
53
- selectedAuthMode = selectedProvider.authModes[authIdx ?? 0];
54
- }
55
- // ── Step 3: 凭证输入 ──────────────────────────────────────
56
- let apiKey;
57
- if (selectedAuthMode.mode === 'api_key') {
58
- // 关闭 rl 以便在 questionSecret 中直接操作 stdin
59
- rl.close();
60
- console.log();
61
- while (true) {
62
- apiKey = await questionSecret(` ${selectedProvider.displayName} API Key: `);
63
- if (selectedProvider.validateKey) {
64
- const err = selectedProvider.validateKey(apiKey);
65
- if (err) {
66
- console.log(chalk.red(` ❌ ${err}`));
67
- continue;
68
- }
69
- }
40
+ // ── Provider 授权流程(共享) ────────────────────────────
41
+ const authResult = await runProviderAuth(rl);
42
+ // ── ONES MCP URL ────────────────────────────────────────
43
+ console.log();
44
+ let mcpUrl = '';
45
+ while (true) {
46
+ mcpUrl = await promptQuestion(rl, chalk.cyan(' ONES MCP URL: '));
47
+ const err = validateUrl(mcpUrl);
48
+ if (!err)
70
49
  break;
71
- }
72
- // 重新创建 rl 用于后续普通输入(questionSecret 需要 raw mode)
73
- const rl2 = createInterface({
74
- input: process.stdin,
75
- output: process.stdout,
76
- });
77
- // 继续后续流程使用 rl2
78
- await completeInit(rl2, selectedProvider, selectedAuthMode.mode, apiKey);
79
- rl2.close();
80
- return;
81
- }
82
- else {
83
- // OAuth 模式
84
- console.log();
85
- console.log(chalk.gray(' 正在启动 OAuth 授权流程...'));
86
- console.log();
87
- try {
88
- await codexOAuthLogin();
89
- console.log(chalk.green(' ✓ OAuth 授权成功'));
90
- }
91
- catch (error) {
92
- console.log(chalk.red(` ✗ OAuth 授权失败: ${error instanceof Error ? error.message : String(error)}`));
93
- return;
94
- }
95
- await completeInit(rl, selectedProvider, selectedAuthMode.mode, undefined);
96
- return;
50
+ console.log(chalk.red(` ❌ ${err}`));
97
51
  }
52
+ // ── 保存配置 ────────────────────────────────────────────
53
+ const config = {
54
+ model: formatModelId(authResult.provider.name, authResult.selectedModelId),
55
+ ones_mcp_url: mcpUrl,
56
+ debug: false,
57
+ llm: {
58
+ providers: {
59
+ [authResult.provider.name]: authResult.providerConfig,
60
+ },
61
+ },
62
+ ones_skills: {
63
+ repository: 'https://github.com/seandong/ones-skills.git',
64
+ },
65
+ };
66
+ await saveConfig(config);
67
+ console.log(`\n${chalk.green('✅')} 配置已保存到 ${getConfigPath()}`);
68
+ console.log(` Model: ${config.model}`);
69
+ console.log(' 运行 seno 开始使用。\n');
98
70
  }
99
71
  catch (error) {
100
72
  if (error instanceof CancelError) {
@@ -110,61 +82,4 @@ export async function initCommand() {
110
82
  rl.close();
111
83
  }
112
84
  }
113
- /**
114
- * 完成初始化流程的后半部分(模型选择 + MCP URL + 保存)
115
- */
116
- async function completeInit(rl, provider, authMode, apiKey) {
117
- // ── Step 4: 选择模型 ────────────────────────────────────
118
- console.log();
119
- console.log(chalk.cyan(' 选择模型:'));
120
- const modelOptions = provider.models.map((m) => `${m.displayName} (${m.id})`);
121
- modelOptions.push(chalk.gray('自定义模型 ID'));
122
- const modelIdx = await promptChoice(rl, '', modelOptions, 0);
123
- let selectedModelId;
124
- if (modelIdx === null) {
125
- // 无效输入,使用第一个模型
126
- selectedModelId = provider.models[0].id;
127
- }
128
- else if (modelIdx === provider.models.length) {
129
- // 自定义模型 ID
130
- selectedModelId = await promptQuestion(rl, chalk.cyan(' 模型 ID: '));
131
- if (!selectedModelId) {
132
- selectedModelId = provider.models[0].id;
133
- }
134
- }
135
- else {
136
- selectedModelId = provider.models[modelIdx].id;
137
- }
138
- // ── Step 5: ONES MCP URL ────────────────────────────────
139
- console.log();
140
- let mcpUrl = '';
141
- while (true) {
142
- mcpUrl = await promptQuestion(rl, chalk.cyan(' ONES MCP URL: '));
143
- const err = validateUrl(mcpUrl);
144
- if (!err)
145
- break;
146
- console.log(chalk.red(` ❌ ${err}`));
147
- }
148
- // ── Step 6: 保存配置 ────────────────────────────────────
149
- const config = {
150
- model: formatModelId(provider.name, selectedModelId),
151
- ones_mcp_url: mcpUrl,
152
- debug: false,
153
- llm: {
154
- providers: {
155
- [provider.name]: {
156
- mode: authMode,
157
- ...(apiKey ? { api_key: apiKey } : {}),
158
- },
159
- },
160
- },
161
- ones_skills: {
162
- repository: 'https://github.com/seandong/ones-skills.git',
163
- },
164
- };
165
- await saveConfig(config);
166
- console.log(`\n${chalk.green('✅')} 配置已保存到 ${getConfigPath()}`);
167
- console.log(` Model: ${config.model}`);
168
- console.log(' 运行 seno 开始使用。\n');
169
- }
170
85
  //# sourceMappingURL=init.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE3G,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD;;GAEG;AACH,SAAS,WAAW,CAAC,GAAW;IAC9B,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC9D,OAAO,oCAAoC,CAAC;IAC9C,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW;IAC/B,MAAM,EAAE,GAAG,eAAe,CAAC;QACzB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,WAAW;QACX,IAAI,MAAM,aAAa,EAAE,EAAE,CAAC;YAC1B,MAAM,cAAc,GAAG,MAAM,UAAU,EAAE,CAAC;YAC1C,OAAO,CAAC,GAAG,CAAC,aAAa,aAAa,EAAE,EAAE,CAAC,CAAC;YAC5C,OAAO,CAAC,GAAG,CAAC,eAAe,cAAc,EAAE,KAAK,IAAI,KAAK,EAAE,CAAC,CAAC;YAC7D,OAAO,CAAC,GAAG,CAAC,eAAe,cAAc,EAAE,YAAY,EAAE,CAAC,CAAC;YAE3D,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC,EAAE,EAAE,mBAAmB,CAAC,CAAC;YAChE,IAAI,SAAS,CAAC,WAAW,EAAE,KAAK,GAAG,IAAI,SAAS,CAAC,WAAW,EAAE,KAAK,KAAK,EAAE,CAAC;gBACzE,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACpB,OAAO;YACT,CAAC;QACH,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;QAErC,oDAAoD;QACpD,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,EAAE,CAAC,CAAC;QAE7C,2DAA2D;QAC3D,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,OAAO,IAAI,EAAE,CAAC;YACZ,MAAM,GAAG,MAAM,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;YAClE,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;YAChC,IAAI,CAAC,GAAG;gBAAE,MAAM;YAChB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC,CAAC;QACvC,CAAC;QAED,uDAAuD;QACvD,MAAM,MAAM,GAAe;YACzB,KAAK,EAAE,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAuB,EAAE,UAAU,CAAC,eAAe,CAAC;YAC7F,YAAY,EAAE,MAAM;YACpB,KAAK,EAAE,KAAK;YACZ,GAAG,EAAE;gBACH,SAAS,EAAE;oBACT,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC,cAAc;iBACtD;aACF;YACD,WAAW,EAAE;gBACX,UAAU,EAAE,6CAA6C;aAC1D;SACF,CAAC;QAEF,MAAM,UAAU,CAAC,MAAM,CAAC,CAAC;QAEzB,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,aAAa,EAAE,EAAE,CAAC,CAAC;QAC/D,OAAO,CAAC,GAAG,CAAC,aAAa,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;QACzC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,WAAW,EAAE,CAAC;YACjC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACtB,OAAO;QACT,CAAC;QACD,IAAK,KAA+B,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;YACpE,OAAO;QACT,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;YAAS,CAAC;QACT,EAAE,CAAC,KAAK,EAAE,CAAC;IACb,CAAC;AACH,CAAC"}
@@ -1,8 +1,9 @@
1
1
  import chalk from 'chalk';
2
2
  import { parseModelId, formatModelId, saveConfig } from '../config/manager.js';
3
3
  import { PROVIDER_REGISTRY, getProviderInfo, createLLMProvider, fetchAvailableModels, } from '../llm/factory.js';
4
- import { codexOAuthLogin, getCodexAccessToken } from '../llm/openai-codex.js';
5
- import { promptQuestion, promptChoice } from '../cli/prompt.js';
4
+ import { getCodexAccessToken } from '../llm/openai-codex.js';
5
+ import { promptQuestion, promptChoice, CancelError } from '../cli/prompt.js';
6
+ import { runProviderAuth } from './provider-auth.js';
6
7
  // ─── /model — 查看当前配置 ──────────────────────────────────
7
8
  export async function modelInfo(config) {
8
9
  console.log();
@@ -139,132 +140,38 @@ export async function modelAuth(rl, config, switchFn) {
139
140
  console.log();
140
141
  console.log(chalk.gray(' 配置 Provider 授权 [按 ESC 键取消]'));
141
142
  console.log();
142
- // 1. 列出所有 Provider
143
- const options = PROVIDER_REGISTRY.map((p) => {
144
- const pc = config.llm?.providers?.[p.name];
145
- const isAuthed = pc && (pc.mode === 'oauth' || !!pc.api_key);
146
- const status = isAuthed ? chalk.green(' ✓') : '';
147
- return `${p.displayName}${status}`;
148
- });
149
- console.log(chalk.cyan(' 选择 Provider:'));
150
- const providerIdx = await promptChoice(rl, '', options, 0);
151
- if (providerIdx === null) {
152
- console.log(chalk.yellow(' 无效选择'));
153
- return;
154
- }
155
- const selectedProvider = PROVIDER_REGISTRY[providerIdx];
156
- // 2. 选择授权方式(只有一种时跳过)
157
- let selectedAuthMode = selectedProvider.authModes[0];
158
- if (selectedProvider.authModes.length > 1) {
159
- const authOptions = selectedProvider.authModes.map((a) => a.displayName);
160
- console.log();
161
- console.log(chalk.cyan(' 选择授权方式:'));
162
- const authIdx = await promptChoice(rl, '', authOptions, 0);
163
- if (authIdx === null) {
164
- console.log(chalk.yellow(' 无效选择'));
165
- return;
166
- }
167
- selectedAuthMode = selectedProvider.authModes[authIdx];
168
- }
169
- // 3. 执行授权
170
- let newProviderConfig;
171
- if (selectedAuthMode.mode === 'api_key') {
172
- // API Key 输入
173
- const keyHint = selectedProvider.keyPlaceholder
174
- ? chalk.gray(` (${selectedProvider.keyPlaceholder})`)
175
- : '';
176
- console.log(`\n ${selectedProvider.displayName} API Key${keyHint}:`);
177
- const apiKey = await promptQuestion(rl, ' > ');
178
- // 校验
179
- if (selectedProvider.validateKey) {
180
- const err = selectedProvider.validateKey(apiKey);
181
- if (err) {
182
- console.log(chalk.red(` ✗ ${err}`));
183
- return;
184
- }
143
+ try {
144
+ // 共享授权流程(含 Provider 选择、凭证输入、模型选择)
145
+ const authResult = await runProviderAuth(rl, {
146
+ existingProviders: config.llm?.providers,
147
+ fetchModelsFromApi: true,
148
+ showAuthStatus: true,
149
+ });
150
+ // 保存到 config
151
+ if (!config.llm) {
152
+ config.llm = { providers: {} };
185
153
  }
186
- newProviderConfig = {
187
- mode: 'api_key',
188
- api_key: apiKey,
189
- base_url: config.llm?.providers?.[selectedProvider.name]?.base_url,
190
- };
191
- }
192
- else {
193
- // OAuth
194
- console.log();
195
- console.log(chalk.gray(' 正在启动 OAuth 授权流程...'));
154
+ config.llm.providers[authResult.provider.name] = authResult.providerConfig;
155
+ // 询问是否切换为当前使用
196
156
  console.log();
197
- // 暂停 rl 防止 stdin 被 readline 和子进程同时读取
198
- rl.pause();
199
- try {
200
- await codexOAuthLogin();
201
- }
202
- catch (error) {
203
- console.log(chalk.red(` OAuth 授权失败: ${error instanceof Error ? error.message : String(error)}`));
204
- return;
205
- }
206
- finally {
207
- // 清除子进程残留的 stdin 数据,防止泄漏到 readline
208
- if (process.stdin.readable) {
209
- process.stdin.read();
210
- }
211
- rl.resume();
212
- }
213
- newProviderConfig = {
214
- mode: 'oauth',
215
- base_url: config.llm?.providers?.[selectedProvider.name]?.base_url,
216
- };
217
- }
218
- // 4. 保存到 config
219
- if (!config.llm) {
220
- config.llm = { providers: {} };
221
- }
222
- config.llm.providers[selectedProvider.name] = newProviderConfig;
223
- console.log();
224
- console.log(chalk.green(` ✓ ${selectedProvider.displayName} 授权成功`));
225
- // 5. 获取模型列表并选择
226
- let credential;
227
- if (newProviderConfig.mode === 'oauth') {
228
- try {
229
- credential = await getCodexAccessToken();
157
+ console.log(chalk.cyan(' 是否切换为当前使用的模型?'));
158
+ const switchIdx = await promptChoice(rl, '', ['是', '否'], 0);
159
+ if (switchIdx === 0) {
160
+ config.model = formatModelId(authResult.provider.name, authResult.selectedModelId);
161
+ const newProvider = await createLLMProvider(authResult.providerConfig, authResult.provider.name);
162
+ switchFn(newProvider, authResult.selectedModelId);
163
+ console.log(chalk.green(` 已切换为 ${config.model}`));
230
164
  }
231
- catch { /* fallback to hardcoded */ }
232
- }
233
- else {
234
- credential = newProviderConfig.api_key;
165
+ await saveConfig(config);
166
+ console.log();
235
167
  }
236
- const models = await fetchAvailableModels(selectedProvider.name, credential);
237
- const modelOptions = models.map((m) => m.displayName || m.id);
238
- modelOptions.push(chalk.gray('自定义模型 ID'));
239
- console.log();
240
- console.log(chalk.cyan(' 选择默认模型:'));
241
- const modelIdx = await promptChoice(rl, '', modelOptions, 0);
242
- let selectedModelId;
243
- if (modelIdx === null || modelIdx === models.length) {
244
- if (modelIdx === models.length) {
245
- selectedModelId = await promptQuestion(rl, chalk.cyan(' 模型 ID: '));
246
- if (!selectedModelId) {
247
- selectedModelId = models[0].id;
248
- }
249
- }
250
- else {
251
- selectedModelId = models[0].id;
168
+ catch (error) {
169
+ if (error instanceof CancelError) {
170
+ console.log('\n 已取消。');
171
+ console.log();
172
+ return;
252
173
  }
174
+ throw error;
253
175
  }
254
- else {
255
- selectedModelId = models[modelIdx].id;
256
- }
257
- // 6. 询问是否切换为当前使用
258
- console.log();
259
- console.log(chalk.cyan(' 是否切换为当前使用的模型?'));
260
- const switchIdx = await promptChoice(rl, '', ['是', '否'], 0);
261
- if (switchIdx === 0) {
262
- config.model = formatModelId(selectedProvider.name, selectedModelId);
263
- const newProvider = await createLLMProvider(newProviderConfig, selectedProvider.name);
264
- switchFn(newProvider, selectedModelId);
265
- console.log(chalk.green(` ✓ 已切换为 ${config.model}`));
266
- }
267
- await saveConfig(config);
268
- console.log();
269
176
  }
270
177
  //# sourceMappingURL=model.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/commands/model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/commands/model.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,32 @@
1
+ import type * as readline from 'readline';
2
+ import type { LLMProviderName, ProviderConfig } from '../config/types.js';
3
+ import { type ProviderInfo } from '../llm/factory.js';
4
+ /**
5
+ * Provider 授权流程结果
6
+ */
7
+ export interface ProviderAuthResult {
8
+ provider: ProviderInfo;
9
+ authMode: string;
10
+ providerConfig: ProviderConfig;
11
+ selectedModelId: string;
12
+ }
13
+ /**
14
+ * Provider 授权流程选项
15
+ */
16
+ export interface ProviderAuthOptions {
17
+ /** 现有 providers 配置,用于保留 base_url 等已有设置 */
18
+ existingProviders?: Partial<Record<LLMProviderName, ProviderConfig>>;
19
+ /** 是否从 API 动态获取模型列表(默认 false,使用静态列表) */
20
+ fetchModelsFromApi?: boolean;
21
+ /** 是否显示已授权状态标记(默认 false) */
22
+ showAuthStatus?: boolean;
23
+ }
24
+ /**
25
+ * 共享的 Provider 授权交互流程
26
+ *
27
+ * 流程: 选择 Provider → 选择授权方式 → 输入凭证 → 选择模型
28
+ *
29
+ * readline 生命周期: API Key 输入时 pause rl,questionSecret 完成后 resume。
30
+ * 无需 close/recreate readline。
31
+ */
32
+ export declare function runProviderAuth(rl: readline.Interface, options?: ProviderAuthOptions): Promise<ProviderAuthResult>;
@@ -0,0 +1,146 @@
1
+ import chalk from 'chalk';
2
+ import { PROVIDER_REGISTRY, fetchAvailableModels, } from '../llm/factory.js';
3
+ import { getCodexAccessToken } from '../llm/openai-codex.js';
4
+ import { codexOAuthLogin } from '../llm/openai-codex.js';
5
+ import { promptQuestion, promptChoice, questionSecret, CancelError } from '../cli/prompt.js';
6
+ /**
7
+ * 共享的 Provider 授权交互流程
8
+ *
9
+ * 流程: 选择 Provider → 选择授权方式 → 输入凭证 → 选择模型
10
+ *
11
+ * readline 生命周期: API Key 输入时 pause rl,questionSecret 完成后 resume。
12
+ * 无需 close/recreate readline。
13
+ */
14
+ export async function runProviderAuth(rl, options) {
15
+ const fetchFromApi = options?.fetchModelsFromApi ?? false;
16
+ const showStatus = options?.showAuthStatus ?? false;
17
+ // ── 1. 选择 Provider ──────────────────────────────────────
18
+ const providerOptions = PROVIDER_REGISTRY.map((p) => {
19
+ if (showStatus) {
20
+ const pc = options?.existingProviders?.[p.name];
21
+ const isAuthed = pc && (pc.mode === 'oauth' || !!pc.api_key);
22
+ const status = isAuthed ? chalk.green(' ✓') : '';
23
+ return `${p.displayName}${status}`;
24
+ }
25
+ return p.displayName;
26
+ });
27
+ console.log(chalk.cyan(' 选择 Provider:'));
28
+ const providerIdx = await promptChoice(rl, '', providerOptions, 0);
29
+ if (providerIdx === null)
30
+ throw new CancelError();
31
+ const selectedProvider = PROVIDER_REGISTRY[providerIdx];
32
+ // ── 2. 选择授权方式(只有一种时跳过) ────────────────────
33
+ let selectedAuthMode = selectedProvider.authModes[0];
34
+ if (selectedProvider.authModes.length > 1) {
35
+ const authOptions = selectedProvider.authModes.map((a) => a.displayName);
36
+ console.log();
37
+ console.log(chalk.cyan(' 选择授权方式:'));
38
+ const authIdx = await promptChoice(rl, '', authOptions, 0);
39
+ if (authIdx === null)
40
+ throw new CancelError();
41
+ selectedAuthMode = selectedProvider.authModes[authIdx];
42
+ }
43
+ // ── 3. 凭证输入 ──────────────────────────────────────────
44
+ const existingConfig = options?.existingProviders?.[selectedProvider.name];
45
+ let providerConfig;
46
+ if (selectedAuthMode.mode === 'api_key') {
47
+ // pause rl,使用 questionSecret 安全输入
48
+ rl.pause();
49
+ let apiKey;
50
+ const keyHint = selectedProvider.keyPlaceholder
51
+ ? chalk.gray(` (${selectedProvider.keyPlaceholder})`)
52
+ : '';
53
+ console.log();
54
+ while (true) {
55
+ apiKey = await questionSecret(` ${selectedProvider.displayName} API Key${keyHint}: `);
56
+ if (selectedProvider.validateKey) {
57
+ const err = selectedProvider.validateKey(apiKey);
58
+ if (err) {
59
+ console.log(chalk.red(` ❌ ${err}`));
60
+ continue;
61
+ }
62
+ }
63
+ break;
64
+ }
65
+ rl.resume();
66
+ providerConfig = {
67
+ mode: 'api_key',
68
+ api_key: apiKey,
69
+ base_url: existingConfig?.base_url,
70
+ };
71
+ }
72
+ else {
73
+ // OAuth 模式
74
+ console.log();
75
+ console.log(chalk.gray(' 正在启动 OAuth 授权流程...'));
76
+ console.log();
77
+ rl.pause();
78
+ try {
79
+ await codexOAuthLogin();
80
+ console.log(chalk.green(' ✓ OAuth 授权成功'));
81
+ }
82
+ catch (error) {
83
+ rl.resume();
84
+ throw new Error(`OAuth 授权失败: ${error instanceof Error ? error.message : String(error)}`);
85
+ }
86
+ finally {
87
+ // 清除子进程残留的 stdin 数据
88
+ if (process.stdin.readable) {
89
+ process.stdin.read();
90
+ }
91
+ rl.resume();
92
+ }
93
+ providerConfig = {
94
+ mode: 'oauth',
95
+ base_url: existingConfig?.base_url,
96
+ };
97
+ }
98
+ console.log();
99
+ console.log(chalk.green(` ✓ ${selectedProvider.displayName} 授权成功`));
100
+ // ── 4. 选择模型 ──────────────────────────────────────────
101
+ let models;
102
+ if (fetchFromApi) {
103
+ let credential;
104
+ if (providerConfig.mode === 'oauth') {
105
+ try {
106
+ credential = await getCodexAccessToken();
107
+ }
108
+ catch {
109
+ /* fallback to static */
110
+ }
111
+ }
112
+ else {
113
+ credential = providerConfig.api_key;
114
+ }
115
+ models = await fetchAvailableModels(selectedProvider.name, credential);
116
+ }
117
+ else {
118
+ models = selectedProvider.models;
119
+ }
120
+ const modelOptions = models.map((m) => m.displayName || m.id);
121
+ modelOptions.push(chalk.gray('自定义模型 ID'));
122
+ console.log();
123
+ console.log(chalk.cyan(' 选择模型:'));
124
+ const modelIdx = await promptChoice(rl, '', modelOptions, 0);
125
+ let selectedModelId;
126
+ if (modelIdx === null) {
127
+ selectedModelId = models[0].id;
128
+ }
129
+ else if (modelIdx === models.length) {
130
+ // 自定义模型 ID
131
+ selectedModelId = await promptQuestion(rl, chalk.cyan(' 模型 ID: '));
132
+ if (!selectedModelId) {
133
+ selectedModelId = models[0].id;
134
+ }
135
+ }
136
+ else {
137
+ selectedModelId = models[modelIdx].id;
138
+ }
139
+ return {
140
+ provider: selectedProvider,
141
+ authMode: selectedAuthMode.mode,
142
+ providerConfig,
143
+ selectedModelId,
144
+ };
145
+ }
146
+ //# sourceMappingURL=provider-auth.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"provider-auth.js","sourceRoot":"","sources":["../../src/commands/provider-auth.ts"],"names":[],"mappings":"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"}
@@ -31,8 +31,10 @@ export function createLoadSkillTool(registry) {
31
31
  };
32
32
  }
33
33
  // 2. 拼接 SKILL.md 完整路径
34
+ // path 可能缺失(index.json 未包含),此时用 name 作为目录名
34
35
  const projectRoot = registry.getProjectRoot();
35
- const skillPath = join(projectRoot, skillMeta.path, 'SKILL.md');
36
+ const skillDir = skillMeta.path || skillMeta.name;
37
+ const skillPath = join(projectRoot, skillDir, 'SKILL.md');
36
38
  // 3. 检查文件是否存在
37
39
  if (!existsSync(skillPath)) {
38
40
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/skills/loader.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAIjC;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,QAAuB;IACzD,OAAO;QACL,IAAI,EAAE,YAAY;QAClB,WAAW,EACT,qFAAqF;QACvF,WAAW,EAAE;YACX,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,IAAI,EAAE;oBACJ,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,+BAA+B;iBAC7C;aACF;YACD,QAAQ,EAAE,CAAC,MAAM,CAAC;SACnB;QACD,OAAO,EAAE,KAAK,EAAE,IAA6B,EAAuB,EAAE;YACpE,MAAM,IAAI,GAAG,IAAI,CAAC,IAAc,CAAC;YAEjC,aAAa;YACb,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAC3C,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,OAAO;oBACL,OAAO,EAAE,UAAU,IAAI,kCAAkC;oBACzD,OAAO,EAAE,IAAI;iBACd,CAAC;YACJ,CAAC;YAED,sBAAsB;YACtB,MAAM,WAAW,GAAG,QAAQ,CAAC,cAAc,EAAE,CAAC;YAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAEhE,cAAc;YACd,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC3B,OAAO;oBACL,OAAO,EAAE,WAAW,SAAS,EAAE;oBAC/B,OAAO,EAAE,IAAI;iBACd,CAAC;YACJ,CAAC;YAED,WAAW;YACX,IAAI,CAAC;gBACH,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;gBAE/C,mCAAmC;gBACnC,IAAI,QAAQ,GAA4B,EAAE,CAAC;gBAC3C,IAAI,IAAY,CAAC;gBAEjB,IAAI,CAAC;oBACH,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;oBAC3B,QAAQ,GAAG;wBACT,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI;wBACxC,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,IAAI,SAAS,CAAC,WAAW;wBAC7D,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,SAAS,CAAC,MAAM;wBAC9C,GAAG,MAAM,CAAC,IAAI;qBACf,CAAC;oBACF,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBAC/B,CAAC;gBAAC,MAAM,CAAC;oBACP,4BAA4B;oBAC5B,IAAI,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;gBACpB,CAAC;gBAED,YAAY;gBACZ,MAAM,MAAM,GAAG;oBACb,QAAQ;oBACR,OAAO,EAAE,IAAI;iBACd,CAAC;gBAEF,OAAO;oBACL,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;iBACzC,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO;oBACL,OAAO,EAAE,aAAa,SAAS,MAAM,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;oBAC7F,OAAO,EAAE,IAAI;iBACd,CAAC;YACJ,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/skills/loader.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { readFile } from 'node:fs/promises';
2
- import { dirname, join } from 'node:path';
2
+ import { dirname } from 'node:path';
3
3
  /**
4
4
  * Skill 注册表
5
5
  * 管理 Skill 索引,提供搜索和列表能力
@@ -14,9 +14,8 @@ export class SkillRegistry {
14
14
  const content = await readFile(indexPath, 'utf-8');
15
15
  const index = JSON.parse(content);
16
16
  this.skills = index.skills;
17
- // indexPath 推导项目根目录
18
- // indexPath 形如 /path/to/project/skills/index.json
19
- this.projectRoot = join(dirname(indexPath), '..');
17
+ // 技能目录与 index.json 同级
18
+ this.projectRoot = dirname(indexPath);
20
19
  }
21
20
  /**
22
21
  * 按名称精确查找技能
@@ -1 +1 @@
1
- {"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/skills/registry.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/skills/registry.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@seandong/seno",
3
- "version": "0.1.0",
3
+ "version": "0.1.1",
4
4
  "description": "ONES AI Agent CLI",
5
5
  "type": "module",
6
6
  "main": "./dist/index.js",