@code4bug/jarvis-agent 1.1.7 → 1.2.1

package/dist/screens/setup/SetupWizard.d.ts

@@ -0,0 +1,7 @@
+import { BootstrapStatus } from '../../config/bootstrap.js';
+interface SetupWizardProps {
+    initialStatus: BootstrapStatus;
+    onCompleted: () => void;
+}
+export default function SetupWizard({ initialStatus, onCompleted }: SetupWizardProps): import("react/jsx-runtime").JSX.Element;
+export {};

package/dist/screens/setup/SetupWizard.js

@@ -0,0 +1,198 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useMemo, useState } from 'react';
+import { Box, Text, useApp, useInput } from 'ink';
+import SetupHeader from '../../components/setup/SetupHeader.js';
+import SetupWelcomeStep from '../../components/setup/SetupWelcomeStep.js';
+import SetupProviderStep from '../../components/setup/SetupProviderStep.js';
+import SetupFormStep from '../../components/setup/SetupFormStep.js';
+import SetupConfirmStep from '../../components/setup/SetupConfirmStep.js';
+import SetupDoneStep from '../../components/setup/SetupDoneStep.js';
+import { buildJarvisConfig, getDefaultSetupForm, validateSetupForm, writeBootstrapConfig, } from '../../config/bootstrap.js';
+import { useDoubleCtrlCExit } from '../../hooks/useDoubleCtrlCExit.js';
+import { useTerminalWidth } from '../../hooks/useTerminalWidth.js';
+const PROVIDERS = ['openai-compatible', 'ollama'];
+const FORM_FIELDS = [
+    'profileName',
+    'apiUrl',
+    'apiKey',
+    'model',
+    'temperature',
+    'maxTokens',
+];
+function findFirstInvalidFieldIndex(errors) {
+    const firstField = FORM_FIELDS.findIndex((field) => Boolean(errors[field]));
+    return firstField >= 0 ? firstField : 0;
+}
+export default function SetupWizard({ initialStatus, onCompleted }) {
+    const width = useTerminalWidth();
+    const { exit } = useApp();
+    const { countdown, handleCtrlC } = useDoubleCtrlCExit(() => {
+        exit();
+        setTimeout(() => process.exit(0), 50);
+    });
+    const [step, setStep] = useState('welcome');
+    const [provider, setProvider] = useState('openai-compatible');
+    const [form, setForm] = useState(() => getDefaultSetupForm('openai-compatible'));
+    const [errors, setErrors] = useState({});
+    const [selectedFieldIndex, setSelectedFieldIndex] = useState(0);
+    const [editingField, setEditingField] = useState(null);
+    const [editBuffer, setEditBuffer] = useState('');
+    const [isSubmitting, setIsSubmitting] = useState(false);
+    const [result, setResult] = useState(null);
+    const selectedField = FORM_FIELDS[selectedFieldIndex];
+    const preview = useMemo(() => JSON.stringify(buildJarvisConfig(form), null, 2), [form]);
+    function moveProvider(offset) {
+        const currentIndex = PROVIDERS.indexOf(provider);
+        const nextIndex = (currentIndex + offset + PROVIDERS.length) % PROVIDERS.length;
+        const nextProvider = PROVIDERS[nextIndex];
+        setProvider(nextProvider);
+        setForm(getDefaultSetupForm(nextProvider));
+        setErrors({});
+    }
+    function moveField(offset) {
+        setSelectedFieldIndex((current) => {
+            const next = current + offset;
+            if (next < 0)
+                return FORM_FIELDS.length - 1;
+            if (next >= FORM_FIELDS.length)
+                return 0;
+            return next;
+        });
+    }
+    function startEditing() {
+        setEditingField(selectedField);
+        setEditBuffer(form[selectedField]);
+    }
+    function startEditingField(field) {
+        setEditingField(field);
+        setEditBuffer(form[field]);
+    }
+    function stopEditing(save) {
+        if (!editingField)
+            return;
+        if (save) {
+            setForm((current) => ({ ...current, [editingField]: editBuffer }));
+        }
+        setEditingField(null);
+        setEditBuffer('');
+    }
+    async function submitConfig() {
+        const nextErrors = validateSetupForm(form);
+        setErrors(nextErrors);
+        if (Object.keys(nextErrors).length > 0) {
+            setSelectedFieldIndex(findFirstInvalidFieldIndex(nextErrors));
+            setStep('form');
+            return;
+        }
+        setIsSubmitting(true);
+        const config = buildJarvisConfig(form);
+        const writeResult = writeBootstrapConfig(config);
+        setIsSubmitting(false);
+        if (writeResult.success) {
+            setResult({
+                success: true,
+                message: '基础模型配置已完成，后续可直接启动进入聊天界面。',
+                configPath: writeResult.path,
+            });
+        }
+        else {
+            setResult({
+                success: false,
+                message: writeResult.message,
+            });
+        }
+        setStep('done');
+    }
+    useInput((input, key) => {
+        if (key.ctrl && input === 'c') {
+            handleCtrlC();
+            return;
+        }
+        if (editingField) {
+            if (key.escape) {
+                stopEditing(false);
+                return;
+            }
+            if (key.return) {
+                stopEditing(true);
+                return;
+            }
+            if (key.backspace || key.delete) {
+                setEditBuffer((current) => current.slice(0, -1));
+                return;
+            }
+            if (input) {
+                setEditBuffer((current) => current + input);
+            }
+            return;
+        }
+        if (step === 'welcome') {
+            if (key.return) {
+                setStep('provider');
+            }
+            return;
+        }
+        if (step === 'provider') {
+            if (key.upArrow)
+                moveProvider(-1);
+            if (key.downArrow)
+                moveProvider(1);
+            if (key.escape)
+                setStep('welcome');
+            if (key.return) {
+                setErrors({});
+                setSelectedFieldIndex(0);
+                setStep('form');
+            }
+            return;
+        }
+        if (step === 'form') {
+            if (key.upArrow)
+                moveField(-1);
+            if (key.downArrow || key.tab)
+                moveField(1);
+            if (key.escape) {
+                setErrors({});
+                setStep('provider');
+            }
+            if (key.return) {
+                const nextErrors = validateSetupForm(form);
+                setErrors(nextErrors);
+                if (Object.keys(nextErrors).length === 0) {
+                    setStep('confirm');
+                }
+                else {
+                    const invalidIndex = findFirstInvalidFieldIndex(nextErrors);
+                    const invalidField = FORM_FIELDS[invalidIndex];
+                    setSelectedFieldIndex(invalidIndex);
+                    startEditingField(invalidField);
+                }
+            }
+            if (input === 'e') {
+                startEditing();
+            }
+            return;
+        }
+        if (step === 'confirm') {
+            if (key.escape) {
+                setStep('form');
+                return;
+            }
+            if (key.return && !isSubmitting) {
+                void submitConfig();
+            }
+            return;
+        }
+        if (step === 'done' && result) {
+            if (key.return) {
+                if (result.success) {
+                    onCompleted();
+                }
+                else {
+                    setStep('form');
+                }
+            }
+        }
+    });
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(SetupHeader, { width: width, currentStep: step, status: initialStatus }), step === 'welcome' ? _jsx(SetupWelcomeStep, { reasonText: initialStatus.ok ? '配置状态正常' : initialStatus.message }) : null, step === 'provider' ? _jsx(SetupProviderStep, { provider: provider }) : null, step === 'form' ? (_jsx(SetupFormStep, { provider: provider, form: form, errors: errors, selectedField: selectedField, editingField: editingField, editBuffer: editBuffer })) : null, step === 'confirm' ? (_jsx(SetupConfirmStep, { form: form, preview: preview, isSubmitting: isSubmitting })) : null, step === 'done' && result ? (_jsx(SetupDoneStep, { success: result.success, message: result.message, configPath: result.configPath })) : null, _jsxs(Box, { flexDirection: "column", paddingX: 1, marginTop: 1, children: [_jsx(Text, { color: "gray", children: "\u5FEB\u6377\u952E\uFF1AEnter \u4E0B\u4E00\u6B65\u6216\u786E\u8BA4\uFF0CEsc \u8FD4\u56DE\uFF0Ce \u7F16\u8F91\u5F53\u524D\u5B57\u6BB5\uFF0CCtrl+C \u9000\u51FA" }), countdown !== null ? _jsxs(Text, { color: "yellow", children: ["\u518D\u6B21\u6309 Ctrl+C \u9000\u51FA\uFF08", countdown, "s\uFF09"] }) : null] })] }));
+}

package/dist/screens/slashCommands.d.ts

@@ -4,4 +4,4 @@ import { Message } from '../types/index.js';
  *
  * 纯函数，返回要追加的系统消息。不涉及 React 状态。
  */
-export declare function executeSlashCommand(cmdName: string): Message | null;
+export declare function executeSlashCommand(cmdName: string): Promise<Message | null>;

package/dist/screens/slashCommands.js

@@ -9,10 +9,10 @@ import { listPermanentAuthorizations, DANGER_RULES, } from '../core/safeguard.js
  *
  * 纯函数，返回要追加的系统消息。不涉及 React 状态。
  */
-export function executeSlashCommand(cmdName) {
+export async function executeSlashCommand(cmdName) {
     switch (cmdName) {
         case 'init': {
-            const result = executeInit();
+            const result = await executeInit();
             return {
                 id: `init-${Date.now()}`,
                 type: 'system',

package/dist/services/api/llm.js

@@ -8,7 +8,7 @@
  */
 import { loadConfig, getActiveModel } from '../../config/loader.js';
 import { getAgent } from '../../agents/index.js';
-import { DEFAULT_AGENT } from '../../config/constants.js';
+import { getDefaultAgent } from '../../config/constants.js';
 import { getActiveAgent } from '../../config/agentState.js';
 import { getSystemInfoPrompt } from '../../config/systemInfo.js';
 import { getCachedUserProfile } from '../../config/userProfile.js';
@@ -174,7 +174,7 @@ export class LLMServiceImpl {
             return;
         }
         // 从当前激活的智能体加载 system prompt（运行时动态读取）
-        const currentAgent = getActiveAgent(DEFAULT_AGENT);
+        const currentAgent = getActiveAgent(getDefaultAgent());
         const agent = getAgent(currentAgent);
         const agentPrompt = agent?.systemPrompt
             ?? '你是一个强大的终端智能助手。回答时使用中文，简洁明了。当需要操作文件系统或执行命令时，请调用对应的工具。';

package/dist/tools/createSkill.js

@@ -96,6 +96,64 @@ function ensureFrontmatterDescription(skillMd, description) {
     // 兜底：在 frontmatter 末尾插入
     return skillMd.replace(/\n---/, `\ndescription: ${description}\n---`);
 }
+function decodeLooseJsonString(value) {
+    return value
+        .replace(/\\"/g, '"')
+        .replace(/\\n/g, '\n')
+        .replace(/\\r/g, '\r')
+        .replace(/\\t/g, '\t')
+        .replace(/\\\\/g, '\\');
+}
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+function extractLooseField(jsonStr, key, nextKeys) {
+    const keyPattern = new RegExp(`"${escapeRegExp(key)}"\\s*:\\s*"`, 'm');
+    const keyMatch = keyPattern.exec(jsonStr);
+    if (!keyMatch)
+        return undefined;
+    const valueStart = keyMatch.index + keyMatch[0].length;
+    let valueEnd = jsonStr.length;
+    for (const nextKey of nextKeys) {
+        const nextPattern = new RegExp(`"\\s*,\\s*\\n\\s*"${escapeRegExp(nextKey)}"\\s*:`, 'm');
+        const tail = jsonStr.slice(valueStart);
+        const nextMatch = nextPattern.exec(tail);
+        if (nextMatch) {
+            valueEnd = Math.min(valueEnd, valueStart + nextMatch.index);
+        }
+    }
+    if (nextKeys.length === 0) {
+        const tail = jsonStr.slice(valueStart);
+        const tailMatch = /"\s*\n?\s*}/m.exec(tail);
+        if (tailMatch) {
+            valueEnd = valueStart + tailMatch.index;
+        }
+    }
+    const rawValue = jsonStr.slice(valueStart, valueEnd);
+    return decodeLooseJsonString(rawValue);
+}
+function parseSkillJsonResult(jsonStr) {
+    try {
+        return JSON.parse(jsonStr);
+    }
+    catch {
+        const name = extractLooseField(jsonStr, 'name', ['description', 'argument_hint', 'skill_md', 'skill_py']);
+        const description = extractLooseField(jsonStr, 'description', ['argument_hint', 'skill_md', 'skill_py']);
+        const argument_hint = extractLooseField(jsonStr, 'argument_hint', ['skill_md', 'skill_py']);
+        const skill_md = extractLooseField(jsonStr, 'skill_md', ['skill_py']);
+        const skill_py = extractLooseField(jsonStr, 'skill_py', []);
+        if (!name || !description || !skill_md) {
+            throw new Error('无法从 LLM 输出中提取必要字段 (name, description, skill_md)');
+        }
+        return {
+            name: name.trim(),
+            description: description.trim(),
+            argument_hint: argument_hint?.trim() || undefined,
+            skill_md,
+            skill_py: skill_py || undefined,
+        };
+    }
+}
 /**
  * 调用 LLM 生成 skill 内容
  *
@@ -179,7 +237,7 @@ async function callLLMForSkill(requirement) {
         jsonStr = jsonBlockMatch[1].trim();
     }
     try {
-        const parsed = JSON.parse(jsonStr);
+        const parsed = parseSkillJsonResult(jsonStr);
         if (!parsed.name || !parsed.skill_md) {
             throw new Error('LLM 返回的 JSON 缺少必要字段 (name, skill_md)');
         }

package/dist/tools/readFile.js

@@ -1,17 +1,42 @@
 import fs from 'fs';
+import path from 'path';
+// 单次读取文件大小上限：1MB
+const MAX_FILE_SIZE = 1 * 1024 * 1024;
 export const readFile = {
     name: 'read_file',
     description: '读取指定路径的文件内容',
     parameters: {
-        path: { type: 'string', description: '文件路径', required: true },
+        path: { type: 'string', description: '文件路径（支持绝对路径或相对于当前工作目录的相对路径）', required: true },
     },
     execute: async (args) => {
-        const filePath = args.path;
+        const rawPath = args.path;
+        if (!rawPath || !rawPath.trim()) {
+            throw new Error('path 参数不能为空');
+        }
+        // 统一解析为绝对路径，相对路径基于 process.cwd()
+        const filePath = path.isAbsolute(rawPath) ? rawPath : path.resolve(process.cwd(), rawPath);
         try {
+            const stat = fs.statSync(filePath);
+            if (stat.isDirectory()) {
+                throw new Error(`路径是目录而非文件: ${filePath}`);
+            }
+            if (stat.size > MAX_FILE_SIZE) {
+                throw new Error(`文件过大（${(stat.size / 1024).toFixed(1)} KB），超过读取上限 ${MAX_FILE_SIZE / 1024} KB，请使用 search_files 或分段读取`);
+            }
             return fs.readFileSync(filePath, 'utf-8');
         }
         catch (e) {
-            throw new Error(`读取文件失败: ${e.message}`);
+            // 区分"文件不存在"和其他 IO 错误，给出更明确的提示
+            if (e.code === 'ENOENT') {
+                throw new Error(`文件不存在: ${filePath}`);
+            }
+            if (e.code === 'EACCES') {
+                throw new Error(`无权限读取文件: ${filePath}`);
+            }
+            // 重新抛出已包装的错误（如上面的 size/dir 检查）
+            throw e.message?.startsWith('文件') || e.message?.startsWith('路径')
+                ? e
+                : new Error(`读取文件失败: ${e.message}`);
         }
     },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@code4bug/jarvis-agent",
-  "version": "1.1.7",
+  "version": "1.2.1",
   "description": "基于 React + TypeScript + Ink 构建的命令行智能体交互界面",
   "type": "module",
   "main": "dist/index.js",