dsh-github-flow 0.1.0 → 0.1.3

package/lib/commands/gh.d.ts

@@ -1,2 +1,2 @@
 import type { GhExecutor } from '../executor.js';
-export declare function registerGhCommand(ctx: any, executor: GhExecutor): void;
+export declare function registerGhCommand(commandsService: any, executor: GhExecutor): void;

package/lib/commands/gh.js

@@ -1,63 +1,48 @@
-export function registerGhCommand(ctx, executor) {
-    const commandsService = ctx.get ? ctx.get('commands') : ctx.commands;
+export function registerGhCommand(commandsService, executor) {
     if (!commandsService || typeof commandsService.register !== 'function')
         return;
-    const doRegister = () => {
-        return commandsService.register({
-            name: 'gh',
-            description: 'GitHub CLI 状态与诊断快捷指令',
-            async handler({ rawInput }) {
-                const trimmed = (rawInput || '').trim();
-                if (!trimmed || trimmed === 'status') {
-                    const auth = await executor.checkAuth();
-                    const repo = await executor.getRepoMetadata();
-                    let md = `### GitHub 集成状态\n\n`;
-                    if (auth.loggedIn) {
-                        md += `- **登录账号**: \`${auth.user || '已登录'}\`\n`;
-                        md += `- **授权作用域**: ${auth.scopes?.map((s) => `\`${s}\``).join(', ') || '标准权限'}\n`;
-                    }
-                    else {
-                        md += `- **登录状态**: ❌ 未登录 GitHub\n`;
-                        md += `> 提示：请在系统终端执行 \`gh auth login\` 进行登录。\n`;
-                    }
-                    if (repo) {
-                        md += `\n**当前关联仓库**:\n`;
-                        md += `- 仓库名: [${repo.nameWithOwner}](${repo.url})\n`;
-                        md += `- 默认分支: \`${repo.defaultBranch}\`\n`;
-                        if (repo.description)
-                            md += `- 简介: ${repo.description}\n`;
-                    }
-                    else {
-                        md += `\n*当前目录尚未关联 Git 远程仓库或未托管在 GitHub。*\n`;
-                    }
-                    return {
-                        kind: 'markdown',
-                        text: md,
-                    };
+    commandsService.register({
+        name: 'gh',
+        description: 'GitHub CLI 状态与诊断快捷指令',
+        async handler({ rawInput }) {
+            const trimmed = (rawInput || '').trim();
+            if (!trimmed || trimmed === 'status') {
+                const auth = await executor.checkAuth();
+                const repo = await executor.getRepoMetadata();
+                let md = `### GitHub 集成状态\n\n`;
+                if (auth.loggedIn) {
+                    md += `- **登录账号**: \`${auth.user || '已登录'}\`\n`;
+                    md += `- **授权作用域**: ${auth.scopes?.map((s) => `\`${s}\``).join(', ') || '标准权限'}\n`;
                 }
-                if (trimmed === 'help') {
-                    return {
-                        kind: 'markdown',
-                        text: `### DSH GitHub Flow 帮助\n\n- \`/gh status\`: 检查当前 GitHub CLI 账号与仓库连接\n- \`/gh help\`: 显示此帮助信息\n\n可以在对话中直接让 Agent 操作 GitHub，如：\n- *"查看当前仓库有哪些开放的 PR"* \n- *"查看最近一次 CI 失败的原因"* \n- *"帮我给当前分支创建 PR"*`,
-                    };
+                else {
+                    md += `- **登录状态**: ❌ 未登录 GitHub\n`;
+                    md += `> 提示：请在系统终端执行 \`gh auth login\` 进行登录。\n`;
                 }
+                if (repo) {
+                    md += `\n**当前关联仓库**:\n`;
+                    md += `- 仓库名: [${repo.nameWithOwner}](${repo.url})\n`;
+                    md += `- 默认分支: \`${repo.defaultBranch}\`\n`;
+                    if (repo.description)
+                        md += `- 简介: ${repo.description}\n`;
+                }
+                else {
+                    md += `\n*当前目录尚未关联 Git 远程仓库或未托管在 GitHub。*\n`;
+                }
+                return {
+                    kind: 'success',
+                    text: md,
+                };
+            }
+            if (trimmed === 'help') {
                 return {
-                    kind: 'error',
-                    text: `未知命令选项: /gh ${trimmed}。可用用法: /gh status, /gh help`,
+                    kind: 'success',
+                    text: `### DSH GitHub Flow 帮助\n\n- \`/gh status\`: 检查当前 GitHub CLI 账号与仓库连接\n- \`/gh help\`: 显示此帮助信息\n\n可以在对话中直接让 Agent 操作 GitHub，如：\n- *"查看当前仓库有哪些开放的 PR"* \n- *"查看最近一次 CI 失败的原因"* \n- *"帮我给当前分支创建 PR"*`,
                 };
-            },
-        });
-    };
-    if (ctx.effect) {
-        ctx.effect(() => {
-            const dispose = doRegister();
-            return () => {
-                if (typeof dispose === 'function')
-                    dispose();
+            }
+            return {
+                kind: 'error',
+                text: `未知命令选项: /gh ${trimmed}。可用用法: /gh status, /gh help`,
             };
-        }, 'github-flow: gh command');
-    }
-    else {
-        doRegister();
-    }
+        },
+    });
 }

package/lib/index.d.ts

@@ -1,17 +1,4 @@
-import Schema from '@deepseek-ai/schemastery';
-import type { PluginConfig } from './types.js';
 export declare const name = "dsh-github-flow";
-/**
- * 仅将核心基础服务作为硬性依赖，解绑 webServer 与 commands。
- * 在无 Web 界面环境（如 Headless、纯终端、CI 自动化模式）下也能即刻激活，杜绝 PENDING 卡死。
- */
-export declare const inject: readonly ['tools'];
-/**
- * 遵循官方 Cordis 规范导出的强类型配置接口与运行时校验器
- */
-export interface Config extends PluginConfig {
-}
-export declare const Config: Schema<Config>;
-export declare function apply(ctx: any, config?: Config): void;
-export { GitHubService } from './service.js';
+export declare const inject: readonly ['tools', 'commands', 'webServer', 'workspaceRegistry'];
+export declare function apply(ctx: any): void;
 export * from './types.js';

package/lib/index.js

@@ -1,6 +1,4 @@
-import Schema from '@deepseek-ai/schemastery';
 import { GhExecutor } from './executor.js';
-import { GitHubService } from './service.js';
 import { createPrTool } from './tools/pr.js';
 import { createIssueTool } from './tools/issue.js';
 import { createRunTool } from './tools/run.js';
@@ -9,49 +7,24 @@ import { createApiTool } from './tools/api.js';
 import { registerGhCommand } from './commands/gh.js';
 import { registerApiRoutes } from './api/routes.js';
 export const name = 'dsh-github-flow';
-/**
- * 仅将核心基础服务作为硬性依赖，解绑 webServer 与 commands。
- * 在无 Web 界面环境（如 Headless、纯终端、CI 自动化模式）下也能即刻激活，杜绝 PENDING 卡死。
- */
-export const inject = ['tools'];
-export const Config = Schema.object({
-    ghPath: Schema.string().default('gh').description('GitHub CLI (gh) 二进制可执行文件路径'),
-    defaultTimeoutMs: Schema.number().default(30000).description('CLI 命令执行超时毫秒数'),
-    maxOutputChars: Schema.number().default(24000).description('防止 Token 溢出的单次截断安全阈值字符数'),
-    cacheTtlMs: Schema.number().default(15000).description('Web API 概览数据缓存有效时长 (ms)'),
-    defaultListLimit: Schema.number().default(20).description('默认查询列表返回条数'),
-});
-export function apply(ctx, config = {}) {
-    // 1. 初始化具备动态配置能力的执行引擎
-    const executor = new GhExecutor(config);
-    // 2. 将核心能力提升挂载为 Cordis 原生微内核服务 (ctx.github)
-    new GitHubService(ctx, executor);
-    // 3. 注册 Agent 模型工具集（5 大核心领域工具）
-    if (ctx.tools && typeof ctx.tools.register === 'function') {
+export const inject = ['tools', 'commands', 'webServer', 'workspaceRegistry'];
+export function apply(ctx) {
+    const executor = new GhExecutor();
+    // 1. 注册人类 Slash 命令 (/gh status, /gh help)
+    if (ctx.commands) {
+        registerGhCommand(ctx.commands, executor);
+    }
+    // 2. 注册 Agent 模型工具集（5 大核心领域工具）
+    if (ctx.tools) {
         ctx.tools.register(createPrTool(executor));
         ctx.tools.register(createIssueTool(executor));
         ctx.tools.register(createRunTool(executor));
         ctx.tools.register(createRepoTool(executor));
         ctx.tools.register(createApiTool(executor));
     }
-    // 4. 可选依赖：命令服务（存在时动态激活，不阻塞主流程）
-    if (ctx.inject && typeof ctx.inject === 'function') {
-        ctx.inject(['commands'], (innerCtx) => {
-            registerGhCommand(innerCtx, executor);
-        });
-    }
-    else if (ctx.commands) {
-        registerGhCommand(ctx, executor);
-    }
-    // 5. 可选依赖：Web 界面服务（存在时动态注入路由并由 effect 管理生命周期）
-    if (ctx.inject && typeof ctx.inject === 'function') {
-        ctx.inject(['webServer'], (innerCtx) => {
-            registerApiRoutes(innerCtx, executor, config);
-        });
-    }
-    else if (ctx.webServer) {
-        registerApiRoutes(ctx, executor, config);
+    // 3. 注册面向 Client 端的 WebServer HTTP 路由
+    if (ctx.webServer) {
+        registerApiRoutes(ctx.webServer, executor, ctx.workspaceRegistry);
     }
 }
-export { GitHubService } from './service.js';
 export * from './types.js';

package/lib/main.d.ts

@@ -0,0 +1,4 @@
+export declare const name = "dsh-github-flow";
+export declare const inject: readonly ['tools', 'commands', 'webServer', 'workspaceRegistry'];
+export declare function apply(ctx: any): void;
+export * from './types.js';

package/lib/main.js

@@ -0,0 +1,30 @@
+import { GhExecutor } from './executor.js';
+import { createPrTool } from './tools/pr.js';
+import { createIssueTool } from './tools/issue.js';
+import { createRunTool } from './tools/run.js';
+import { createRepoTool } from './tools/repo.js';
+import { createApiTool } from './tools/api.js';
+import { registerGhCommand } from './commands/gh.js';
+import { registerApiRoutes } from './api/routes.js';
+export const name = 'dsh-github-flow';
+export const inject = ['tools', 'commands', 'webServer', 'workspaceRegistry'];
+export function apply(ctx) {
+    const executor = new GhExecutor();
+    // 1. 注册人类 Slash 命令 (/gh status, /gh help)
+    if (ctx.commands) {
+        registerGhCommand(ctx.commands, executor);
+    }
+    // 2. 注册 Agent 模型工具集（5 大核心领域工具）
+    if (ctx.tools) {
+        ctx.tools.register(createPrTool(executor));
+        ctx.tools.register(createIssueTool(executor));
+        ctx.tools.register(createRunTool(executor));
+        ctx.tools.register(createRepoTool(executor));
+        ctx.tools.register(createApiTool(executor));
+    }
+    // 3. 注册面向 Client 端的 WebServer HTTP 路由
+    if (ctx.webServer) {
+        registerApiRoutes(ctx.webServer, executor, ctx.workspaceRegistry);
+    }
+}
+export * from './types.js';

package/lib/tools/api.d.ts

@@ -1,2 +1,38 @@
 import type { GhExecutor } from '../executor.js';
-export declare function createApiTool(executor: GhExecutor): any;
+export declare function createApiTool(executor: GhExecutor): {
+    name: string;
+    description: string;
+    parameters: {
+        type: string;
+        properties: {
+            endpoint: {
+                type: string;
+                description: string;
+            };
+            method: {
+                type: string;
+                enum: string[];
+                description: string;
+            };
+            jq: {
+                type: string;
+                description: string;
+            };
+            fields: {
+                type: string;
+                description: string;
+            };
+        };
+        required: string[];
+    };
+    output: {
+        schema: {
+            type: string;
+        };
+        render(args: any, value: any): {
+            type: string;
+            text: any;
+        }[];
+    };
+    execute(args: any, execContext: any): Promise<Record<string, any>>;
+};

package/lib/tools/api.js

@@ -1,6 +1,14 @@
-import { defineSafeTool } from './define.js';
+function normalizeOutput(data) {
+    if (data && typeof data === 'object' && !Array.isArray(data)) {
+        return data;
+    }
+    if (Array.isArray(data)) {
+        return { items: data, count: data.length };
+    }
+    return { result: data !== undefined && data !== null ? data : '' };
+}
 export function createApiTool(executor) {
-    return defineSafeTool({
+    return {
         name: 'github_api',
         description: '通过 GitHub CLI 认证环境直接调用任意 GitHub REST 或 GraphQL API 端点（兜底逃生门）。支持 --jq 过滤。',
         parameters: {
@@ -29,7 +37,15 @@ export function createApiTool(executor) {
         output: {
             schema: { type: 'object' },
             render(args, value) {
-                return [{ type: 'text', text: typeof value === 'string' ? value : JSON.stringify(value, null, 2) }];
+                if (!value)
+                    return [{ type: 'text', text: '无返回内容' }];
+                if (typeof value.result === 'string') {
+                    return [{ type: 'text', text: value.result }];
+                }
+                if (Array.isArray(value.items)) {
+                    return [{ type: 'text', text: JSON.stringify(value.items, null, 2) }];
+                }
+                return [{ type: 'text', text: JSON.stringify(value, null, 2) }];
             },
         },
         async execute(args, execContext) {
@@ -49,7 +65,7 @@ export function createApiTool(executor) {
             const res = await executor.run(cmd, { cwd });
             if (!res.ok)
                 throw new Error(res.error);
-            return res.data || res.rawOutput;
+            return normalizeOutput(res.data !== undefined ? res.data : res.rawOutput);
         },
-    });
+    };
 }

package/lib/tools/issue.d.ts

@@ -1,2 +1,56 @@
 import type { GhExecutor } from '../executor.js';
-export declare function createIssueTool(executor: GhExecutor): any;
+export declare function createIssueTool(executor: GhExecutor): {
+    name: string;
+    description: string;
+    parameters: {
+        type: string;
+        properties: {
+            action: {
+                type: string;
+                enum: string[];
+                description: string;
+            };
+            issue_number: {
+                type: string;
+                description: string;
+            };
+            repo: {
+                type: string;
+                description: string;
+            };
+            title: {
+                type: string;
+                description: string;
+            };
+            body: {
+                type: string;
+                description: string;
+            };
+            labels: {
+                type: string;
+                items: {
+                    type: string;
+                };
+                description: string;
+            };
+            assignees: {
+                type: string;
+                items: {
+                    type: string;
+                };
+                description: string;
+            };
+        };
+        required: string[];
+    };
+    output: {
+        schema: {
+            type: string;
+        };
+        render(args: any, value: any): {
+            type: string;
+            text: any;
+        }[];
+    };
+    execute(args: any, execContext: any): Promise<Record<string, any>>;
+};

package/lib/tools/issue.js

@@ -1,6 +1,14 @@
-import { defineSafeTool } from './define.js';
+function normalizeOutput(data) {
+    if (data && typeof data === 'object' && !Array.isArray(data)) {
+        return data;
+    }
+    if (Array.isArray(data)) {
+        return { items: data, count: data.length };
+    }
+    return { result: data !== undefined && data !== null ? data : '' };
+}
 export function createIssueTool(executor) {
-    return defineSafeTool({
+    return {
         name: 'github_issue',
         description: '管理 GitHub Issues。支持查看 Issue 列表、详情、创建新 Issue、追加评论以及关闭 Issue。',
         parameters: {
@@ -43,18 +51,33 @@ export function createIssueTool(executor) {
         output: {
             schema: { type: 'object' },
             render(args, value) {
-                return [{ type: 'text', text: typeof value === 'string' ? value : JSON.stringify(value, null, 2) }];
+                if (!value)
+                    return [{ type: 'text', text: '无返回内容' }];
+                if (typeof value.result === 'string') {
+                    return [{ type: 'text', text: value.result }];
+                }
+                if (Array.isArray(value.items)) {
+                    return [{ type: 'text', text: JSON.stringify(value.items, null, 2) }];
+                }
+                return [{ type: 'text', text: JSON.stringify(value, null, 2) }];
             },
         },
         async execute(args, execContext) {
             const cwd = execContext?.cwd || process.cwd();
-            const repoArgs = args.repo ? ['-R', args.repo] : [];
+            let repoTarget = args.repo;
+            if (!repoTarget) {
+                const meta = await executor.getRepoMetadata(cwd);
+                if (meta?.nameWithOwner) {
+                    repoTarget = meta.nameWithOwner;
+                }
+            }
+            const repoArgs = repoTarget ? ['-R', repoTarget] : [];
             switch (args.action) {
                 case 'list': {
                     const res = await executor.run(['issue', 'list', ...repoArgs, '--json', 'number,title,state,author,labels,updatedAt', '-L', '20'], { cwd });
                     if (!res.ok)
                         throw new Error(res.error);
-                    return res.data || res.rawOutput;
+                    return normalizeOutput(res.data || res.rawOutput);
                 }
                 case 'view': {
                     if (!args.issue_number)
@@ -62,7 +85,7 @@ export function createIssueTool(executor) {
                     const res = await executor.run(['issue', 'view', String(args.issue_number), ...repoArgs, '--json', 'number,title,body,state,author,labels,assignees,comments,url'], { cwd });
                     if (!res.ok)
                         throw new Error(res.error);
-                    return res.data || res.rawOutput;
+                    return normalizeOutput(res.data || res.rawOutput);
                 }
                 case 'create': {
                     const cmd = ['issue', 'create', ...repoArgs, '--title', args.title || '', '--body', args.body || ''];
@@ -105,5 +128,5 @@ export function createIssueTool(executor) {
                     throw new Error(`未知的 Issue 操作: ${args.action}`);
             }
         },
-    });
+    };
 }

package/lib/tools/pr.d.ts

@@ -1,2 +1,60 @@
 import type { GhExecutor } from '../executor.js';
-export declare function createPrTool(executor: GhExecutor): any;
+export declare function createPrTool(executor: GhExecutor): {
+    name: string;
+    description: string;
+    parameters: {
+        type: string;
+        properties: {
+            action: {
+                type: string;
+                enum: string[];
+                description: string;
+            };
+            pr_number: {
+                type: string;
+                description: string;
+            };
+            repo: {
+                type: string;
+                description: string;
+            };
+            title: {
+                type: string;
+                description: string;
+            };
+            body: {
+                type: string;
+                description: string;
+            };
+            base: {
+                type: string;
+                description: string;
+            };
+            draft: {
+                type: string;
+                description: string;
+            };
+            review_decision: {
+                type: string;
+                enum: string[];
+                description: string;
+            };
+            merge_method: {
+                type: string;
+                enum: string[];
+                description: string;
+            };
+        };
+        required: string[];
+    };
+    output: {
+        schema: {
+            type: string;
+        };
+        render(args: any, value: any): {
+            type: string;
+            text: any;
+        }[];
+    };
+    execute(args: any, execContext: any): Promise<Record<string, any>>;
+};

package/lib/tools/pr.js

@@ -1,6 +1,14 @@
-import { defineSafeTool } from './define.js';
+function normalizeOutput(data) {
+    if (data && typeof data === 'object' && !Array.isArray(data)) {
+        return data;
+    }
+    if (Array.isArray(data)) {
+        return { items: data, count: data.length };
+    }
+    return { result: data !== undefined && data !== null ? data : '' };
+}
 export function createPrTool(executor) {
-    return defineSafeTool({
+    return {
         name: 'github_pr',
         description: '管理与审查 GitHub Pull Request (PR)。支持查看列表、详情、差异比对、CI 检查状态、代码审查与合并操作。默认针对当前工作区关联的仓库。',
         parameters: {
@@ -51,39 +59,54 @@ export function createPrTool(executor) {
         output: {
             schema: { type: 'object' },
             render(args, value) {
-                return [{ type: 'text', text: typeof value === 'string' ? value : JSON.stringify(value, null, 2) }];
+                if (!value)
+                    return [{ type: 'text', text: '无返回内容' }];
+                if (typeof value.result === 'string') {
+                    return [{ type: 'text', text: value.result }];
+                }
+                if (Array.isArray(value.items)) {
+                    return [{ type: 'text', text: JSON.stringify(value.items, null, 2) }];
+                }
+                return [{ type: 'text', text: JSON.stringify(value, null, 2) }];
             },
         },
         async execute(args, execContext) {
             const cwd = execContext?.cwd || process.cwd();
-            const repoArgs = args.repo ? ['-R', args.repo] : [];
+            let repoTarget = args.repo;
+            if (!repoTarget) {
+                const meta = await executor.getRepoMetadata(cwd);
+                if (meta?.nameWithOwner) {
+                    repoTarget = meta.nameWithOwner;
+                }
+            }
+            const repoArgs = repoTarget ? ['-R', repoTarget] : [];
             switch (args.action) {
                 case 'list': {
                     const res = await executor.run(['pr', 'list', ...repoArgs, '--json', 'number,title,author,headRefName,isDraft,state,updatedAt', '-L', '20'], { cwd });
                     if (!res.ok)
                         throw new Error(res.error);
-                    return res.data || res.rawOutput;
+                    return normalizeOutput(res.data || res.rawOutput);
                 }
                 case 'view': {
                     const target = args.pr_number ? [String(args.pr_number)] : [];
                     const res = await executor.run(['pr', 'view', ...target, ...repoArgs, '--json', 'number,title,body,state,author,labels,assignees,reviewDecision,mergeable,statusCheckRollup,url'], { cwd });
                     if (!res.ok)
                         throw new Error(res.error);
-                    return res.data || res.rawOutput;
+                    return normalizeOutput(res.data || res.rawOutput);
                 }
                 case 'checks': {
                     const target = args.pr_number ? [String(args.pr_number)] : [];
                     const res = await executor.run(['pr', 'checks', ...target, ...repoArgs, '--json', 'name,state,conclusion,detailsUrl'], { cwd });
                     if (!res.ok)
                         throw new Error(res.error);
-                    return res.data || res.rawOutput;
+                    return normalizeOutput(res.data || res.rawOutput);
                 }
                 case 'diff': {
                     const target = args.pr_number ? [String(args.pr_number)] : [];
                     const res = await executor.run(['pr', 'diff', ...target, ...repoArgs], { cwd });
                     if (!res.ok)
                         throw new Error(res.error);
-                    return res.rawOutput || '无差异内容';
+                    return { result: res.rawOutput || '无差异内容' };
                 }
                 case 'create': {
                     const createCmd = ['pr', 'create', ...repoArgs, '--title', args.title || '', '--body', args.body || ''];
@@ -126,5 +149,5 @@ export function createPrTool(executor) {
                     throw new Error(`未知的 PR 操作: ${args.action}`);
             }
         },
-    });
+    };
 }

package/lib/tools/repo.d.ts

@@ -1,2 +1,38 @@
 import type { GhExecutor } from '../executor.js';
-export declare function createRepoTool(executor: GhExecutor): any;
+export declare function createRepoTool(executor: GhExecutor): {
+    name: string;
+    description: string;
+    parameters: {
+        type: string;
+        properties: {
+            action: {
+                type: string;
+                enum: string[];
+                description: string;
+            };
+            repo: {
+                type: string;
+                description: string;
+            };
+            query: {
+                type: string;
+                description: string;
+            };
+            limit: {
+                type: string;
+                description: string;
+            };
+        };
+        required: string[];
+    };
+    output: {
+        schema: {
+            type: string;
+        };
+        render(args: any, value: any): {
+            type: string;
+            text: any;
+        }[];
+    };
+    execute(args: any, execContext: any): Promise<Record<string, any>>;
+};