@xfe-repo/cli 2.0.9 → 2.0.11

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @xfe-repo/cli
 
+## 2.0.11
+
+### Patch Changes
+
+- 去除server依赖
+
+## 2.0.10
+
+### Patch Changes
+
+- 同步插件优化
+
+## 2.0.9
+
+### Patch Changes
+
+- 优化插件
+- Updated dependencies
+  - @xfe-repo/cli-presets@2.0.6
+  - @xfe-repo/cli-core@2.0.6
+  - @xfe-repo/server@0.1.1
+
 ## 2.0.9
 
 ### Patch Changes

package/dist/backend/http-backend.d.ts

@@ -13,6 +13,8 @@ export interface CreateRemoteTaskOptions {
     readonly description: string;
     readonly documentUrl?: string;
     readonly baseBranch?: string;
+    readonly branchName?: string;
+    readonly workflowId?: string;
     readonly prepareWorkspace?: boolean;
 }
 export interface StartRemoteTaskOptions {
@@ -29,8 +31,8 @@ export interface ListClientRequestsOptions {
     readonly status?: string;
 }
 export declare class HttpBackendGateway {
-    private baseUrl;
-    private tenantId?;
+    private readonly baseUrl;
+    private readonly tenantId?;
     constructor(options: BackendGatewayOptions);
     health(): Promise<unknown>;
     createTask(options: CreateRemoteTaskOptions): Promise<unknown>;

package/dist/backend/http-backend.js

@@ -3,12 +3,12 @@
  *
  * CLI 通过该适配器连接本地或远端 xfe server。
  */
-// ─── HttpBackendGateway ─────────────────────────────────────
+// ─── Gateway ───────────────────────────────────────────────
 export class HttpBackendGateway {
     baseUrl;
     tenantId;
     constructor(options) {
-        this.baseUrl = normalizeBaseUrl(options.baseUrl);
+        this.baseUrl = trimTrailingSlash(options.baseUrl);
         this.tenantId = options.tenantId;
     }
     async health() {
@@ -24,7 +24,7 @@ export class HttpBackendGateway {
         });
     }
     async listClientRequests(options = {}) {
-        return this.get(createPathWithQuery('/client-requests', { status: options.status }));
+        return this.get('/client-requests', { status: options.status });
     }
     async respondClientRequest(options) {
         return this.post(`/client-requests/${encodeURIComponent(options.requestId)}/respond`, {
@@ -32,20 +32,25 @@ export class HttpBackendGateway {
             content: options.content,
         });
     }
-    async get(pathname) {
-        const response = await fetch(this.createUrl(pathname), { headers: this.createHeaders() });
+    async get(pathname, query) {
+        const response = await fetch(this.createUrl(pathname, query), { headers: this.createHeaders() });
         return readResponse(response);
     }
     async post(pathname, body) {
         const response = await fetch(this.createUrl(pathname), {
             method: 'POST',
-            headers: { ...this.createHeaders(), 'content-type': 'application/json' },
+            headers: { ...this.createHeaders(), 'Content-Type': 'application/json' },
             body: JSON.stringify(body),
         });
         return readResponse(response);
     }
-    createUrl(pathname) {
-        return `${this.baseUrl}${pathname}`;
+    createUrl(pathname, query = {}) {
+        const url = new URL(`${this.baseUrl}${pathname}`);
+        for (const [key, value] of Object.entries(query)) {
+            if (value)
+                url.searchParams.set(key, value);
+        }
+        return url.toString();
     }
     createHeaders() {
         if (!this.tenantId)
@@ -53,17 +58,17 @@ export class HttpBackendGateway {
         return { 'x-xfe-tenant-id': this.tenantId };
     }
 }
-// ─── Helpers ────────────────────────────────────────────────
+// ─── Helpers ───────────────────────────────────────────────
 async function readResponse(response) {
-    const text = await response.text();
-    const body = parseJson(text);
+    const body = await readJson(response);
     if (!response.ok) {
-        const message = typeof body === 'object' && body && 'error' in body ? String(body.error) : text;
-        throw new Error(message || `HTTP ${response.status}`);
+        const message = typeof body === 'object' && body && 'error' in body ? String(body.error) : response.statusText;
+        throw new Error(`HTTP ${response.status}: ${message}`);
     }
     return body;
 }
-function parseJson(text) {
+async function readJson(response) {
+    const text = await response.text();
     if (!text)
         return undefined;
     try {
@@ -73,16 +78,7 @@ function parseJson(text) {
         return text;
     }
 }
-function normalizeBaseUrl(baseUrl) {
-    return baseUrl.replace(/\/$/, '');
-}
-function createPathWithQuery(pathname, query) {
-    const searchParams = new URLSearchParams();
-    for (const [key, value] of Object.entries(query)) {
-        if (value)
-            searchParams.set(key, value);
-    }
-    const queryString = searchParams.toString();
-    return queryString ? `${pathname}?${queryString}` : pathname;
+function trimTrailingSlash(value) {
+    return value.replace(/\/+$/, '');
 }
 //# sourceMappingURL=http-backend.js.map

package/dist/backend/server-task-commands.js

@@ -15,17 +15,19 @@ export function registerServerCommands(program) {
         .option('-p, --port <port>', `监听端口，默认 ${DEFAULT_SERVER_PORT}`)
         .option('-H, --host <host>', '监听地址')
         .action((options) => {
-        const port = resolvePort(options.port);
-        const server = startServer({ port, hostname: options.host });
-        console.log(`XFE Server listening on ${options.host ?? '0.0.0.0'}:${server.port}`);
-        console.log(`HTTP health: http://${options.host ?? 'localhost'}:${server.port}/health`);
-        console.log(`MCP endpoint: http://${options.host ?? 'localhost'}:${server.port}/mcp`);
-        process.once('SIGINT', () => void stopLocalServer(server.close));
-        process.once('SIGTERM', () => void stopLocalServer(server.close));
+        const server = startServer({ port: resolvePort(options.port), hostname: options.host });
+        printServerStarted(server);
+        bindServerSignals(server);
     });
 }
 export function registerTaskCommands(program) {
     const taskCmd = program.command('task').helpCommand(false).description('远端/本地 XFE Server 任务');
+    registerTaskCreateCommand(taskCmd);
+    registerTaskStartCommand(taskCmd);
+    registerRequestCommands(taskCmd);
+}
+// ─── Task Commands ─────────────────────────────────────────
+function registerTaskCreateCommand(taskCmd) {
     taskCmd
         .command('create')
         .description('通过 xfe server 创建远端 agent 任务')
@@ -36,41 +38,34 @@ export function registerTaskCommands(program) {
         .option('--tenant <tenantId>', '租户 ID，本地默认 local')
         .option('--document-url <url>', '需求文档链接')
         .option('--base-branch <branch>', '基准分支，默认 main')
+        .option('--branch <branchName>', '任务分支，默认 feat-${taskId}')
+        .option('--workflow <workflowId>', '任务流程 ID，默认 plan-code-review')
         .option('--prepare-workspace', '创建任务后立即 clone 仓库并创建任务分支')
         .option('--start', '创建任务后启动 agent workflow')
-        .option('--executor <executor>', 'agent executor，mock | codex | copilot')
+        .option('--executor <executor>', 'agent executor，mock | codex | claude | copilot')
         .option('--auto-approve', '启动 agent workflow 后自动通过计划审批')
         .action(async (options) => {
         const gateway = createBackendGateway(options);
-        const result = await gateway.createTask({
-            repoUrl: options.repo,
-            taskId: options.task,
-            description: options.description,
-            documentUrl: options.documentUrl,
-            baseBranch: options.baseBranch,
-            prepareWorkspace: options.prepareWorkspace,
-        });
+        const result = await gateway.createTask(createRemoteTaskPayload(options));
         printJson(result);
         if (!options.start)
             return;
-        const started = await gateway.startTask({ taskId: options.task, executor: options.executor, autoApprove: options.autoApprove });
-        printJson(started);
+        printJson(await gateway.startTask({ taskId: options.task, executor: options.executor, autoApprove: options.autoApprove }));
     });
+}
+function registerTaskStartCommand(taskCmd) {
     taskCmd
         .command('start <taskId>')
         .description('启动已创建的 agent workflow')
-        .option('--executor <executor>', 'agent executor，mock | codex | copilot')
+        .option('--executor <executor>', 'agent executor，mock | codex | claude | copilot')
         .option('--auto-approve', '自动通过计划审批')
         .option('--server <url>', `server 地址，默认 http://localhost:${DEFAULT_SERVER_PORT}`)
         .option('--tenant <tenantId>', '租户 ID，本地默认 local')
         .action(async (taskId, options) => {
         const gateway = createBackendGateway(options);
-        const started = await gateway.startTask({ taskId, executor: options.executor, autoApprove: options.autoApprove });
-        printJson(started);
+        printJson(await gateway.startTask({ taskId, executor: options.executor, autoApprove: options.autoApprove }));
     });
-    registerRequestCommands(taskCmd);
 }
-// ─── Command Registration ───────────────────────────────────
 function registerRequestCommands(taskCmd) {
     taskCmd
         .command('requests')
@@ -79,9 +74,7 @@ function registerRequestCommands(taskCmd) {
         .option('--server <url>', `server 地址，默认 http://localhost:${DEFAULT_SERVER_PORT}`)
         .option('--tenant <tenantId>', '租户 ID，本地默认 local')
         .action(async (options) => {
-        const gateway = createBackendGateway(options);
-        const result = await gateway.listClientRequests({ status: options.status });
-        printJson(result);
+        printJson(await createBackendGateway(options).listClientRequests({ status: options.status }));
     });
     taskCmd
         .command('watch')
@@ -91,11 +84,7 @@ function registerRequestCommands(taskCmd) {
         .option('--interval <ms>', '轮询间隔，默认 1000')
         .option('--once', '只处理当前 pending 请求后退出')
         .action(async (options) => {
-        await watchClientRequests({
-            gateway: createBackendGateway(options),
-            intervalMs: resolvePollInterval(options.interval),
-            once: Boolean(options.once),
-        });
+        await watchClientRequests({ gateway: createBackendGateway(options), intervalMs: resolvePollInterval(options.interval), once: Boolean(options.once) });
     });
     taskCmd
         .command('respond <requestId>')
@@ -105,8 +94,7 @@ function registerRequestCommands(taskCmd) {
         .option('--server <url>', `server 地址，默认 http://localhost:${DEFAULT_SERVER_PORT}`)
         .option('--tenant <tenantId>', '租户 ID，本地默认 local')
         .action(async (requestId, options) => {
-        const gateway = createBackendGateway(options);
-        const result = await gateway.respondClientRequest({
+        const result = await createBackendGateway(options).respondClientRequest({
             requestId,
             action: parseResponseAction(options.action),
             content: parseJsonRecord(options.content),
@@ -114,18 +102,13 @@ function registerRequestCommands(taskCmd) {
         printJson(result);
     });
 }
-// ─── Watch Flow ─────────────────────────────────────────────
+// ─── Watch Flow ────────────────────────────────────────────
 async function watchClientRequests(options) {
     const terminal = createInterface({ input: process.stdin, output: process.stdout });
     const handledRequestIds = new Set();
     try {
         while (true) {
-            const requests = await listPendingClientRequests(options.gateway, handledRequestIds);
-            for (const request of requests) {
-                handledRequestIds.add(request.id);
-                const response = await promptClientRequest(terminal, request);
-                await options.gateway.respondClientRequest({ requestId: request.id, action: response.action, content: response.content });
-            }
+            await handlePendingRequests(terminal, options.gateway, handledRequestIds);
             if (options.once)
                 return;
             await wait(options.intervalMs);
@@ -135,6 +118,14 @@ async function watchClientRequests(options) {
         terminal.close();
     }
 }
+async function handlePendingRequests(terminal, gateway, handledRequestIds) {
+    const requests = await listPendingClientRequests(gateway, handledRequestIds);
+    for (const request of requests) {
+        handledRequestIds.add(request.id);
+        const response = await promptClientRequest(terminal, request);
+        await gateway.respondClientRequest({ requestId: request.id, action: response.action, content: response.content });
+    }
+}
 async function listPendingClientRequests(gateway, handledRequestIds) {
     const response = await gateway.listClientRequests({ status: 'pending' });
     return extractClientRequests(response).filter((request) => !handledRequestIds.has(request.id));
@@ -144,8 +135,7 @@ async function promptClientRequest(terminal, request) {
     console.log(request.message);
     if (isActionOnlyRequest(request.kind))
         return { action: await promptAction(terminal), content: undefined };
-    const content = await promptSchemaContent(terminal, request.schema);
-    return { action: 'accept', content };
+    return { action: 'accept', content: await promptSchemaContent(terminal, request.schema) };
 }
 async function promptAction(terminal) {
     const answer = await terminal.question('处理方式 accept/decline/cancel，默认 accept: ');
@@ -181,10 +171,33 @@ async function promptSchemaField(terminal, field) {
         return Number(value);
     return String(value ?? '');
 }
-// ─── Helpers ────────────────────────────────────────────────
+function createRemoteTaskPayload(options) {
+    return {
+        repoUrl: options.repo,
+        taskId: options.task,
+        description: options.description,
+        documentUrl: options.documentUrl,
+        baseBranch: options.baseBranch,
+        branchName: options.branch,
+        workflowId: options.workflow,
+        prepareWorkspace: options.prepareWorkspace,
+    };
+}
 function createBackendGateway(options) {
     return new HttpBackendGateway({ baseUrl: options.server ?? `http://localhost:${DEFAULT_SERVER_PORT}`, tenantId: options.tenant });
 }
+function printServerStarted(server) {
+    console.log(`XFE Server listening on ${server.hostname}:${server.port}`);
+    console.log(`HTTP health: http://${server.hostname}:${server.port}/health`);
+}
+function bindServerSignals(server) {
+    process.once('SIGINT', () => void stopLocalServer(server));
+    process.once('SIGTERM', () => void stopLocalServer(server));
+}
+async function stopLocalServer(server) {
+    await server.close();
+    process.exit(0);
+}
 function resolvePort(rawPort) {
     const port = Number(rawPort);
     return Number.isInteger(port) && port > 0 ? port : DEFAULT_SERVER_PORT;
@@ -193,10 +206,6 @@ function resolvePollInterval(rawInterval) {
     const intervalMs = Number(rawInterval);
     return Number.isInteger(intervalMs) && intervalMs > 0 ? intervalMs : 1000;
 }
-async function stopLocalServer(close) {
-    await close();
-    process.exit(0);
-}
 function parseResponseAction(action) {
     if (action === 'accept' || action === 'decline' || action === 'cancel')
         return action;
@@ -206,9 +215,8 @@ function parseJsonRecord(content) {
     if (!content)
         return undefined;
     const parsed = JSON.parse(content);
-    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed))
         throw new Error('content 必须是 JSON object');
-    }
     return parsed;
 }
 function extractClientRequests(response) {

package/dist/components/Prompts/FuzzyPathPrompt.js

@@ -10,7 +10,7 @@ import { useKeymap, KeymapLayer } from '../../hooks/use-keymap.js';
 import { useSelectableList } from './use-selectable-list.js';
 import { OptionList, SearchBar } from './OptionList.js';
 export const FuzzyPathPrompt = memo(function FuzzyPathPrompt({ question, onSubmit }) {
-    const options = useMemo(() => collectPaths(question.rootPath || '.', question.itemType || 'any', question.excludePath).map((p) => ({ label: p, value: p })), [question.rootPath, question.itemType, question.excludePath]);
+    const options = useMemo(() => collectPaths(question.rootPath || '.', question.itemType || 'any', question.excludePath).map((p) => ({ key: p, label: p, value: p })), [question.rootPath, question.itemType, question.excludePath]);
     const { searchText, filtered, selectedIndex, selectedItem } = useSelectableList({
         items: options,
         searchable: true,

package/dist/components/Prompts/OptionList.js

@@ -1,4 +1,4 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 /**
  * @xfe-repo/cli - 可滚动选项列表展示组件
  *
@@ -15,13 +15,25 @@ export const OptionList = memo(function OptionList({ options, selectedIndex, pag
     return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [startIndex > 0 && _jsxs(Text, { dimColor: true, children: [" \u2191 \u8FD8\u6709 ", startIndex, " \u9879"] }), visibleItems.map((opt, i) => {
                 const actualIndex = startIndex + i;
                 const isFocused = actualIndex === selectedIndex;
-                return (_jsxs(Box, { gap: 1, children: [_jsx(Text, { color: isFocused ? 'cyan' : undefined, children: isFocused ? '❯' : ' ' }), mode === 'checkbox' && _jsx(CheckboxIcon, { checked: opt.checked }), _jsx(Text, { color: isFocused ? 'cyan' : undefined, bold: isFocused, children: opt.label })] }, `${opt.label}-${actualIndex}`));
+                return (_jsxs(Box, { alignItems: "flex-start", children: [_jsx(OptionPrefix, { mode: mode, checked: opt.checked, isFocused: isFocused }), _jsx(OptionContent, { option: opt, isFocused: isFocused })] }, opt.key));
             }), startIndex + windowSize < totalItems && _jsxs(Text, { dimColor: true, children: [" \u2193 \u8FD8\u6709 ", totalItems - startIndex - windowSize, " \u9879"] })] }));
 });
 export const SearchBar = memo(function SearchBar({ text }) {
     return (_jsxs(Box, { children: [_jsx(Text, { dimColor: true, children: "\u641C\u7D22: " }), _jsxs(Text, { children: [text, _jsx(Text, { color: "gray", children: "\u258C" })] })] }));
 });
 // ─── Render Helpers ─────────────────────────────────────────
+const OPTION_PREFIX_WIDTH = 2;
+const CHECKBOX_OPTION_PREFIX_WIDTH = 4;
+const FOCUSED_MARK = '❯';
+const EMPTY_MARK = ' ';
+const DESCRIPTION_COLOR = 'gray';
+const OptionPrefix = memo(function OptionPrefix({ mode, checked, isFocused, }) {
+    const prefixWidth = mode === 'checkbox' ? CHECKBOX_OPTION_PREFIX_WIDTH : OPTION_PREFIX_WIDTH;
+    return (_jsxs(Box, { width: prefixWidth, flexShrink: 0, children: [_jsx(Text, { color: isFocused ? 'cyan' : undefined, children: isFocused ? FOCUSED_MARK : EMPTY_MARK }), mode === 'checkbox' && (_jsxs(_Fragment, { children: [_jsx(Text, { children: " " }), _jsx(CheckboxIcon, { checked: checked })] })), _jsx(Text, { children: " " })] }));
+});
+const OptionContent = memo(function OptionContent({ option, isFocused }) {
+    return (_jsxs(Box, { flexDirection: "column", flexShrink: 1, children: [_jsx(Text, { color: isFocused ? 'cyan' : undefined, bold: isFocused, children: option.label }), option.description && (_jsx(Text, { color: DESCRIPTION_COLOR, dimColor: true, children: option.description }))] }));
+});
 const CheckboxIcon = memo(function CheckboxIcon({ checked }) {
     return _jsx(Text, { color: checked ? 'green' : 'gray', children: checked ? '◉' : '○' });
 });

package/dist/components/Prompts/index.d.ts

@@ -1,4 +1,4 @@
-import type { PromptQuestion } from '@xfe-repo/cli-core';
+import type { PromptChoice, PromptQuestion } from '@xfe-repo/cli-core';
 import type { SelectOption } from './use-selectable-list.js';
 export interface PromptViewProps {
     readonly question: PromptQuestion;
@@ -11,8 +11,5 @@ export { SearchListPrompt } from './SearchListPrompt.js';
 export { SearchCheckboxPrompt } from './SearchCheckboxPrompt.js';
 export { FuzzyPathPrompt } from './FuzzyPathPrompt.js';
 export declare const Prompt: import("react").NamedExoticComponent<PromptViewProps>;
-export declare function normalizeChoices(choices?: {
-    name: string;
-    value: any;
-}[] | string[]): SelectOption[];
+export declare function normalizeChoices(choices?: PromptChoice[] | string[]): SelectOption[];
 //# sourceMappingURL=index.d.ts.map

package/dist/components/Prompts/index.js

@@ -40,8 +40,19 @@ export function normalizeChoices(choices) {
         return [];
     return choices.map((choice) => {
         if (typeof choice === 'string')
-            return { label: choice, value: choice };
-        return { label: choice.name, value: choice.value };
+            return { key: choice, label: choice, value: choice };
+        return {
+            key: choice.key ?? getChoiceFallbackKey(choice),
+            label: choice.name,
+            value: choice.value,
+            description: choice.description,
+        };
     });
 }
+function getChoiceFallbackKey(choice) {
+    if (typeof choice.value === 'string' || typeof choice.value === 'number' || typeof choice.value === 'boolean') {
+        return String(choice.value);
+    }
+    return choice.short ?? choice.name;
+}
 //# sourceMappingURL=index.js.map

package/dist/components/Prompts/use-selectable-list.d.ts

@@ -5,8 +5,10 @@
  * 供 ListPrompt / SearchListPrompt / FuzzyPathPrompt / SearchCheckboxPrompt 复用
  */
 export interface SelectOption {
+    readonly key: string;
     readonly label: string;
     readonly value: any;
+    readonly description?: string;
 }
 interface UseSelectableListOptions<T extends SelectOption> {
     readonly items: T[];

package/dist/components/Prompts/use-selectable-list.js

@@ -14,8 +14,8 @@ export function useSelectableList({ items, defaultIndex = 0, searchable = false,
     const filtered = useMemo(() => {
         if (!searchable || !searchText)
             return items;
-        const q = searchText.toLowerCase();
-        return items.filter((opt) => opt.label.toLowerCase().includes(q));
+        const searchKeyword = searchText.toLowerCase();
+        return items.filter((option) => getOptionSearchText(option).includes(searchKeyword));
     }, [items, searchText, searchable]);
     // 过滤结果变化时重置选中（跳过首次渲染，避免覆盖 defaultIndex）
     useUpdateEffect(() => {
@@ -54,4 +54,9 @@ export function useSelectableList({ items, defaultIndex = 0, searchable = false,
         selectedItem: filtered[selectedIndex],
     };
 }
+// ─── Helpers ────────────────────────────────────────────────
+function getOptionSearchText(option) {
+    const searchableText = [option.label, option.description ?? ''].join(' ');
+    return searchableText.toLowerCase();
+}
 //# sourceMappingURL=use-selectable-list.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfe-repo/cli",
-  "version": "2.0.9",
+  "version": "2.0.11",
   "description": "XFE CLI - Ink-based terminal UI for project scaffolding",
   "type": "module",
   "main": "./dist/index.js",
@@ -17,8 +17,8 @@
     "ink-link": "^5.0.0",
     "react": "^19.1.0",
     "zod": "^4.3.6",
-    "@xfe-repo/cli-core": "2.0.5",
-    "@xfe-repo/cli-presets": "2.0.5"
+    "@xfe-repo/cli-presets": "2.0.6",
+    "@xfe-repo/cli-core": "2.0.6"
   },
   "devDependencies": {
     "@types/node": "^24.3.0",