dsh-github-flow 0.1.5 → 0.1.7

package/lib/executor.js

@@ -119,22 +119,39 @@ export class GhExecutor {
     /**
      * 智能解析最可靠的工作区物理路径：
      * 1. 优先使用显式指定的有效 cwd（若包含 .git 目录）
-     * 2. 读取当前进程/会话的 DSH_SESSION_ID 并匹配 ~/.dsh/storages/workspace.json
-     * 3. 匹配 ~/.dsh/storages/workspace.json 中最近活跃的工作区
-     * 4. 回退到 process.cwd()
+     * 2. 使用显式传入的 sessionId 或环境变量 DSH_SESSION_ID 精确反查工作区
+     * 3. 递归探测：若传入了 explicitCwd（如聚合父目录），自动检查其直系子目录中是否包含 Git 仓库
+     * 4. 匹配 ~/.dsh/storages/workspace.json 中最近活跃且存在 .git 的仓库工作区
+     * 5. 回退到 process.cwd()
      */
-    resolveWorkspaceCwd(explicitCwd) {
-        // 显式路径优先，但只认真正含 .git 的目录：调用方传进来的可能是会话根目录而非仓库目录，
-        // 此时继续往下走按会话/最近活跃反查，比盲信传入值更准。
+    resolveWorkspaceCwd(explicitCwd, explicitSessionId) {
+        // 1. 显式路径优先，若有效且直接包含 .git 目录，则直接使用
         if (explicitCwd && hasGitDir(explicitCwd)) {
             return explicitCwd;
         }
-        const sessionId = process.env.DSH_SESSION_ID;
-        if (sessionId) {
-            const bySession = findWorkspacePathBySession(sessionId);
-            if (bySession)
+        // 2. 使用显式传入的 sessionId 或环境变量中的 DSH_SESSION_ID 反查
+        const targetSessionId = explicitSessionId || process.env.DSH_SESSION_ID;
+        if (targetSessionId) {
+            const bySession = findWorkspacePathBySession(targetSessionId);
+            if (bySession && hasGitDir(bySession))
                 return bySession;
         }
+        // 3. 递归探测：若传入了 explicitCwd（如非 Git 的父工作区目录），检查其一级子目录中是否存在 Git 仓库
+        if (explicitCwd && fs.existsSync(explicitCwd)) {
+            try {
+                const entries = fs.readdirSync(explicitCwd, { withFileTypes: true });
+                for (const entry of entries) {
+                    if (entry.isDirectory()) {
+                        const subDir = path.join(explicitCwd, entry.name);
+                        if (hasGitDir(subDir)) {
+                            return subDir;
+                        }
+                    }
+                }
+            }
+            catch { }
+        }
+        // 4. 从工作区配置中匹配最近活跃且明确具备 .git 的仓库路径
         const recent = findMostRecentWorkspacePath();
         if (recent)
             return recent;
@@ -145,7 +162,7 @@ export class GhExecutor {
      * 采用 execFile 参数数组隔离，彻底杜绝 Shell 字符串拼接注入漏洞
      */
     async run(args, options = {}) {
-        const cwd = this.resolveWorkspaceCwd(options.cwd);
+        const cwd = this.resolveWorkspaceCwd(options.cwd, options.sessionId);
         const timeout = options.timeoutMs || this.defaultTimeoutMs;
         try {
             const { stdout, stderr } = await execFileAsync(this.ghPath, args, {
@@ -222,19 +239,46 @@ export class GhExecutor {
         }
         return value;
     }
+    /** 生成当前操作系统平台的推荐安装引导与命令 */
+    getPlatformInstallGuide() {
+        const p = process.platform;
+        if (p === 'win32') {
+            return {
+                command: 'winget install --id GitHub.cli',
+                altCommand: 'scoop install gh',
+                downloadUrl: 'https://cli.github.com/',
+                description: '推荐使用 Windows Package Manager (winget) 一键安装，或下载官方 .msi 安装包。',
+            };
+        }
+        if (p === 'darwin') {
+            return {
+                command: 'brew install gh',
+                altCommand: 'port install gh',
+                downloadUrl: 'https://cli.github.com/',
+                description: '推荐使用 Homebrew 安装 GitHub CLI。',
+            };
+        }
+        return {
+            command: 'sudo apt install gh',
+            altCommand: 'sudo dnf install gh',
+            downloadUrl: 'https://cli.github.com/',
+            description: '推荐使用系统包管理器安装（Debian/Ubuntu 运行 apt，Fedora/CentOS 运行 dnf）。',
+        };
+    }
     /** 实际执行 `gh auth status` 并解析结果，不含缓存逻辑 */
     async probeAuth(cwd) {
         const res = await this.run(['auth', 'status'], { cwd, timeoutMs: 10_000, rawText: true });
         const raw = (res.rawOutput || '') + '\n' + (res.error || '');
         const loggedIn = raw.includes('Logged in to') || raw.includes('✓');
         // 只要已登录或有常规输出，则必然安装了 gh
-        const isNotInstalled = Boolean(res.error && res.error.includes('系统未检测到 GitHub CLI'));
+        const isNotInstalled = Boolean(res.error && (res.error.includes('系统未检测到 GitHub CLI') || res.error.includes('ENOENT')));
         const installed = loggedIn || !isNotInstalled;
         if (!installed) {
             return {
                 installed: false,
                 loggedIn: false,
                 platform: process.platform,
+                installGuide: this.getPlatformInstallGuide(),
                 raw: res.error,
             };
         }
@@ -312,8 +356,8 @@ export class GhExecutor {
      * 获取当前目录（工作区）关联的远程仓库元数据
      * 采用 gh repo view + 本地 git remote 双保险机制，彻底杜绝已配置远程却误判未关联的问题
      */
-    async getRepoMetadata(cwd) {
-        const targetCwd = this.resolveWorkspaceCwd(cwd);
+    async getRepoMetadata(cwd, sessionId) {
+        const targetCwd = this.resolveWorkspaceCwd(cwd, sessionId);
         // 1. 优先尝试由 gh 直接根据当前上下文识别
         const res = await this.run(['repo', 'view', '--json', 'nameWithOwner,name,owner,defaultBranchRef,description,isPrivate,url'], { cwd: targetCwd, timeoutMs: 10_000 });
         if (res.ok && res.data && res.data.nameWithOwner) {

package/lib/tools/api.js

@@ -54,6 +54,7 @@ export function createApiTool(executor) {
         },
         async execute(args, execContext) {
             const cwd = execContext?.cwd || process.cwd();
+            const sessionId = execContext?.sessionId || execContext?.session?.id || process.env.DSH_SESSION_ID;
             const cmd = ['api', args.endpoint];
             if (args.method && args.method !== 'GET') {
                 cmd.push('-X', args.method);
@@ -81,7 +82,7 @@ export function createApiTool(executor) {
                     cmd.push('-f', `${k}=${String(v)}`);
                 }
             }
-            const res = await executor.run(cmd, { cwd, rawText: args.raw === true });
+            const res = await executor.run(cmd, { cwd, sessionId, rawText: args.raw === true });
             if (!res.ok)
                 throw new Error(res.error);
             return normalizeOutput(res.data !== undefined ? res.data : res.rawOutput);

package/lib/tools/issue.js

@@ -64,17 +64,22 @@ export function createIssueTool(executor) {
         },
         async execute(args, execContext) {
             const cwd = execContext?.cwd || process.cwd();
+            const sessionId = execContext?.sessionId || execContext?.session?.id || process.env.DSH_SESSION_ID;
             let repoTarget = args.repo;
             if (!repoTarget) {
-                const meta = await executor.getRepoMetadata(cwd);
+                const meta = await executor.getRepoMetadata(cwd, sessionId);
                 if (meta?.nameWithOwner) {
                     repoTarget = meta.nameWithOwner;
                 }
             }
-            const repoArgs = repoTarget ? ['-R', repoTarget] : [];
+            if (!repoTarget) {
+                throw new Error('未能自动识别当前工作区关联的 GitHub 仓库。请通过 `repo` 参数显式指定目标仓库 [owner/repo]（例如: "ItQianChen/dsh-github-flow"），或在当前工作区目录下关联 Git 远程仓库。');
+            }
+            const repoArgs = ['-R', repoTarget];
+            const runOpts = { cwd, sessionId };
             switch (args.action) {
                 case 'list': {
-                    const res = await executor.run(['issue', 'list', ...repoArgs, '--json', 'number,title,state,author,labels,updatedAt', '-L', '20'], { cwd });
+                    const res = await executor.run(['issue', 'list', ...repoArgs, '--json', 'number,title,state,author,labels,updatedAt', '-L', '20'], runOpts);
                     if (!res.ok)
                         throw new Error(res.error);
                     return normalizeOutput(res.data || res.rawOutput);
@@ -82,7 +87,7 @@ export function createIssueTool(executor) {
                 case 'view': {
                     if (!args.issue_number)
                         throw new Error('view 操作必须提供 issue_number');
-                    const res = await executor.run(['issue', 'view', String(args.issue_number), ...repoArgs, '--json', 'number,title,body,state,author,labels,assignees,comments,url'], { cwd });
+                    const res = await executor.run(['issue', 'view', String(args.issue_number), ...repoArgs, '--json', 'number,title,body,state,author,labels,assignees,comments,url'], runOpts);
                     if (!res.ok)
                         throw new Error(res.error);
                     return normalizeOutput(res.data || res.rawOutput);
@@ -95,7 +100,7 @@ export function createIssueTool(executor) {
                     if (args.assignees && Array.isArray(args.assignees) && args.assignees.length > 0) {
                         cmd.push('--assignee', args.assignees.join(','));
                     }
-                    const res = await executor.run(cmd, { cwd });
+                    const res = await executor.run(cmd, runOpts);
                     if (!res.ok)
                         throw new Error(res.error);
                     return { message: 'Issue 创建成功', url: res.rawOutput };
@@ -103,7 +108,7 @@ export function createIssueTool(executor) {
                 case 'comment': {
                     if (!args.issue_number || !args.body)
                         throw new Error('comment 必须提供 issue_number 和 body');
-                    const res = await executor.run(['issue', 'comment', String(args.issue_number), ...repoArgs, '--body', args.body], { cwd });
+                    const res = await executor.run(['issue', 'comment', String(args.issue_number), ...repoArgs, '--body', args.body], runOpts);
                     if (!res.ok)
                         throw new Error(res.error);
                     return { message: '评论发布成功', output: res.rawOutput };
@@ -111,7 +116,7 @@ export function createIssueTool(executor) {
                 case 'close': {
                     if (!args.issue_number)
                         throw new Error('close 操作必须提供 issue_number');
-                    const res = await executor.run(['issue', 'close', String(args.issue_number), ...repoArgs], { cwd });
+                    const res = await executor.run(['issue', 'close', String(args.issue_number), ...repoArgs], runOpts);
                     if (!res.ok)
                         throw new Error(res.error);
                     return { message: `Issue #${args.issue_number} 已成功关闭` };
@@ -119,7 +124,7 @@ export function createIssueTool(executor) {
                 case 'reopen': {
                     if (!args.issue_number)
                         throw new Error('reopen 操作必须提供 issue_number');
-                    const res = await executor.run(['issue', 'reopen', String(args.issue_number), ...repoArgs], { cwd });
+                    const res = await executor.run(['issue', 'reopen', String(args.issue_number), ...repoArgs], runOpts);
                     if (!res.ok)
                         throw new Error(res.error);
                     return { message: `Issue #${args.issue_number} 已重新开启` };

package/lib/tools/pr.js

@@ -84,38 +84,43 @@ export function createPrTool(executor) {
         },
         async execute(args, execContext) {
             const cwd = execContext?.cwd || process.cwd();
+            const sessionId = execContext?.sessionId || execContext?.session?.id || process.env.DSH_SESSION_ID;
             let repoTarget = args.repo;
             if (!repoTarget) {
-                const meta = await executor.getRepoMetadata(cwd);
+                const meta = await executor.getRepoMetadata(cwd, sessionId);
                 if (meta?.nameWithOwner) {
                     repoTarget = meta.nameWithOwner;
                 }
             }
-            const repoArgs = repoTarget ? ['-R', repoTarget] : [];
+            if (!repoTarget) {
+                throw new Error('未能自动识别当前工作区关联的 GitHub 仓库。请通过 `repo` 参数显式指定目标仓库 [owner/repo]（例如: "ItQianChen/dsh-github-flow"），或在当前工作区目录下关联 Git 远程仓库。');
+            }
+            const repoArgs = ['-R', repoTarget];
+            const runOpts = { cwd, sessionId };
             switch (args.action) {
                 case 'list': {
-                    const res = await executor.run(['pr', 'list', ...repoArgs, '--json', 'number,title,author,headRefName,isDraft,state,updatedAt', '-L', '20'], { cwd });
+                    const res = await executor.run(['pr', 'list', ...repoArgs, '--json', 'number,title,author,headRefName,isDraft,state,updatedAt', '-L', '20'], runOpts);
                     if (!res.ok)
                         throw new Error(res.error);
                     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 });
+                    const res = await executor.run(['pr', 'view', ...target, ...repoArgs, '--json', 'number,title,body,state,author,labels,assignees,reviewDecision,mergeable,statusCheckRollup,url'], runOpts);
                     if (!res.ok)
                         throw new Error(res.error);
                     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 });
+                    const res = await executor.run(['pr', 'checks', ...target, ...repoArgs, '--json', 'name,state,conclusion,detailsUrl'], runOpts);
                     if (!res.ok)
                         throw new Error(res.error);
                     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 });
+                    const res = await executor.run(['pr', 'diff', ...target, ...repoArgs], runOpts);
                     if (!res.ok)
                         throw new Error(res.error);
                     return { result: res.rawOutput || '无差异内容' };
@@ -134,7 +139,7 @@ export function createPrTool(executor) {
                     const dryRun = args.dry_run === true;
                     if (dryRun)
                         createCmd.push('--dry-run');
-                    const res = await executor.run(createCmd, { cwd });
+                    const res = await executor.run(createCmd, runOpts);
                     if (!res.ok)
                         throw new Error(res.error);
                     return dryRun
@@ -153,7 +158,7 @@ export function createPrTool(executor) {
                         reviewCmd.push('--comment');
                     if (args.body)
                         reviewCmd.push('--body', args.body);
-                    const res = await executor.run(reviewCmd, { cwd });
+                    const res = await executor.run(reviewCmd, runOpts);
                     if (!res.ok)
                         throw new Error(res.error);
                     return { message: 'Review 提交成功', detail: res.rawOutput };
@@ -167,7 +172,7 @@ export function createPrTool(executor) {
                     // 而 gh 默认不删。替用户做掉它违背「可撤销的直接做、不可撤销的先问」。
                     if (args.delete_branch === true)
                         mergeCmd.push('--delete-branch');
-                    const res = await executor.run(mergeCmd, { cwd });
+                    const res = await executor.run(mergeCmd, runOpts);
                     if (!res.ok)
                         throw new Error(res.error);
                     return { message: 'PR 合并完成', output: res.rawOutput };

package/lib/tools/repo.js

@@ -50,19 +50,21 @@ export function createRepoTool(executor) {
         },
         async execute(args, execContext) {
             const cwd = execContext?.cwd || process.cwd();
+            const sessionId = execContext?.sessionId || execContext?.session?.id || process.env.DSH_SESSION_ID;
             const limitStr = String(args.limit || 10);
+            const runOpts = { cwd, sessionId };
             switch (args.action) {
                 case 'view': {
                     let repoTarget = args.repo;
                     let meta = null;
                     if (!repoTarget) {
-                        meta = await executor.getRepoMetadata(cwd);
+                        meta = await executor.getRepoMetadata(cwd, sessionId);
                         if (meta?.nameWithOwner) {
                             repoTarget = meta.nameWithOwner;
                         }
                     }
                     const repoArgs = repoTarget ? [repoTarget] : [];
-                    const res = await executor.run(['repo', 'view', ...repoArgs, '--json', 'nameWithOwner,description,defaultBranchRef,isPrivate,stargazerCount,forkCount,url'], { cwd });
+                    const res = await executor.run(['repo', 'view', ...repoArgs, '--json', 'nameWithOwner,description,defaultBranchRef,isPrivate,stargazerCount,forkCount,url'], runOpts);
                     if (!res.ok) {
                         // 若执行 gh 失败（如离线或环境限制），但本地已成功识别仓库元数据，进行优雅兜底返回
                         if (meta && meta.nameWithOwner) {
@@ -76,7 +78,7 @@ export function createRepoTool(executor) {
                     if (!args.query)
                         throw new Error('search_code 必须提供 query');
                     const repoArgs = args.repo ? ['--repo', args.repo] : [];
-                    const res = await executor.run(['search', 'code', args.query, ...repoArgs, '--json', 'path,repository,textMatches', '-L', limitStr], { cwd });
+                    const res = await executor.run(['search', 'code', args.query, ...repoArgs, '--json', 'path,repository,textMatches', '-L', limitStr], runOpts);
                     if (!res.ok)
                         throw new Error(res.error);
                     return normalizeOutput(res.data || res.rawOutput);
@@ -84,7 +86,7 @@ export function createRepoTool(executor) {
                 case 'search_repos': {
                     if (!args.query)
                         throw new Error('search_repos 必须提供 query');
-                    const res = await executor.run(['search', 'repos', args.query, '--json', 'fullName,description,stargazersCount,updatedAt', '-L', limitStr], { cwd });
+                    const res = await executor.run(['search', 'repos', args.query, '--json', 'fullName,description,stargazersCount,updatedAt', '-L', limitStr], runOpts);
                     if (!res.ok)
                         throw new Error(res.error);
                     return normalizeOutput(res.data || res.rawOutput);

package/lib/tools/run.js

@@ -50,17 +50,22 @@ export function createRunTool(executor) {
         },
         async execute(args, execContext) {
             const cwd = execContext?.cwd || process.cwd();
+            const sessionId = execContext?.sessionId || execContext?.session?.id || process.env.DSH_SESSION_ID;
             let repoTarget = args.repo;
             if (!repoTarget) {
-                const meta = await executor.getRepoMetadata(cwd);
+                const meta = await executor.getRepoMetadata(cwd, sessionId);
                 if (meta?.nameWithOwner) {
                     repoTarget = meta.nameWithOwner;
                 }
             }
-            const repoArgs = repoTarget ? ['-R', repoTarget] : [];
+            if (!repoTarget) {
+                throw new Error('未能自动识别当前工作区关联的 GitHub 仓库。请通过 `repo` 参数显式指定目标仓库 [owner/repo]（例如: "ItQianChen/dsh-github-flow"），或在当前工作区目录下关联 Git 远程仓库。');
+            }
+            const repoArgs = ['-R', repoTarget];
+            const runOpts = { cwd, sessionId };
             switch (args.action) {
                 case 'list': {
-                    const res = await executor.run(['run', 'list', ...repoArgs, '--json', 'databaseId,name,status,conclusion,event,headBranch,createdAt', '-L', String(args.limit || 10)], { cwd });
+                    const res = await executor.run(['run', 'list', ...repoArgs, '--json', 'databaseId,name,status,conclusion,event,headBranch,createdAt', '-L', String(args.limit || 10)], runOpts);
                     if (!res.ok)
                         throw new Error(res.error);
                     return normalizeOutput(res.data || res.rawOutput);
@@ -68,7 +73,7 @@ export function createRunTool(executor) {
                 case 'view': {
                     if (!args.run_id)
                         throw new Error('view 操作必须提供 run_id');
-                    const res = await executor.run(['run', 'view', String(args.run_id), ...repoArgs, '--json', 'databaseId,name,status,conclusion,jobs,url'], { cwd });
+                    const res = await executor.run(['run', 'view', String(args.run_id), ...repoArgs, '--json', 'databaseId,name,status,conclusion,jobs,url'], runOpts);
                     if (!res.ok)
                         throw new Error(res.error);
                     return normalizeOutput(res.data || res.rawOutput);
@@ -78,7 +83,7 @@ export function createRunTool(executor) {
                         throw new Error('log_failed 操作必须提供 run_id');
                     // gh 原生支持仅提取失败的日志！对 Agent 故障诊断价值极高
                     const res = await executor.run(['run', 'view', String(args.run_id), ...repoArgs, '--log-failed'], {
-                        cwd,
+                        ...runOpts,
                         timeoutMs: 60_000,
                         rawText: true,
                     });
@@ -89,7 +94,7 @@ export function createRunTool(executor) {
                 case 'rerun': {
                     if (!args.run_id)
                         throw new Error('rerun 操作必须提供 run_id');
-                    const res = await executor.run(['run', 'rerun', String(args.run_id), ...repoArgs, '--failed'], { cwd });
+                    const res = await executor.run(['run', 'rerun', String(args.run_id), ...repoArgs, '--failed'], runOpts);
                     if (!res.ok)
                         throw new Error(res.error);
                     return { message: '已成功重新触发失败任务', output: res.rawOutput };
@@ -97,7 +102,7 @@ export function createRunTool(executor) {
                 case 'cancel': {
                     if (!args.run_id)
                         throw new Error('cancel 操作必须提供 run_id');
-                    const res = await executor.run(['run', 'cancel', String(args.run_id), ...repoArgs], { cwd });
+                    const res = await executor.run(['run', 'cancel', String(args.run_id), ...repoArgs], runOpts);
                     if (!res.ok)
                         throw new Error(res.error);
                     return { message: '已取消该工作流任务', output: res.rawOutput };

package/lib/types.d.ts

@@ -18,6 +18,8 @@ export interface PluginConfig {
 export interface GhExecutionOptions {
     /** 命令执行的工作目录，优先使用当前 Agent 会话所在的 Workspace 物理路径 */
     cwd?: string;
+    /** 当前调用的会话 ID，用于精确关联物理工作区路径 */
+    sessionId?: string;
     /** 进程超时限制（毫秒），默认 30,000ms */
     timeoutMs?: number;
     /** 附加环境变量 */
@@ -33,6 +35,16 @@ export interface GhResult<T = unknown> {
     /** 是否因超出安全阈值而被截断 */
     truncated?: boolean;
 }
+export interface AuthInstallGuide {
+    /** 推荐包管理器命令，例如 Windows 下 "winget install --id GitHub.cli" */
+    command: string;
+    /** 备选命令（如 choco/scoop/brew） */
+    altCommand?: string;
+    /** 官方下载与安装文档链接 */
+    downloadUrl: string;
+    /** 简明指引提示 */
+    description?: string;
+}
 export interface AuthStatus {
     installed: boolean;
     loggedIn: boolean;
@@ -42,6 +54,7 @@ export interface AuthStatus {
     activeAccount?: boolean;
     protocol?: string;
     scopes?: string[];
+    installGuide?: AuthInstallGuide;
     raw?: string;
 }
 export interface RepoMetadata {
@@ -75,6 +88,19 @@ export interface PrItem {
     url: string;
     updatedAt: string;
 }
+/**
+ * Issue 分类维度契约：
+ * - reported: 用户提起的（他人向我名下项目或本仓库提交的 Issue 反馈）
+ * - assigned: 分配给我的（指派给当前账号的待办任务，跨仓库通用）
+ * - created: 我创建的（由当前账号亲自发起的 Issue）
+ */
+export type IssueCategory = 'reported' | 'assigned' | 'created';
+export interface IssueStats {
+    total: number;
+    reported: number;
+    assigned: number;
+    created: number;
+}
 export interface IssueItem {
     number: number;
     title: string;
@@ -91,6 +117,8 @@ export interface IssueItem {
     }>;
     url: string;
     updatedAt: string;
+    /** 命中的所有身份分类 */
+    categories?: IssueCategory[];
 }
 export interface WorkflowRunItem {
     databaseId: number;
@@ -107,6 +135,7 @@ export interface GitHubOverviewData {
     repo?: RepoMetadata;
     pullRequests: PrItem[];
     issues: IssueItem[];
+    issueStats?: IssueStats;
     runs: WorkflowRunItem[];
     lastUpdated: string;
     error?: string;
@@ -129,6 +158,28 @@ export interface WorkspaceMatrixItem {
     repo?: RepoMetadata;
     sessionCount: number;
 }
+export interface GlobalIssueItem {
+    number: number;
+    title: string;
+    repository: {
+        name?: string;
+        nameWithOwner: string;
+    };
+    author?: {
+        login: string;
+    };
+    assignees?: Array<{
+        login: string;
+    }>;
+    labels?: Array<{
+        name: string;
+        color: string;
+    }>;
+    url: string;
+    updatedAt: string;
+    state?: 'OPEN' | 'CLOSED';
+    categories: IssueCategory[];
+}
 export interface GlobalOverviewData {
     auth: AuthStatus;
     userRepos: UserRepoItem[];
@@ -142,15 +193,8 @@ export interface GlobalOverviewData {
         url: string;
         updatedAt: string;
     }>;
-    myIssues: Array<{
-        number: number;
-        title: string;
-        repository: {
-            nameWithOwner: string;
-        };
-        url: string;
-        updatedAt: string;
-    }>;
+    myIssues: GlobalIssueItem[];
+    issueStats?: IssueStats;
     lastUpdated: string;
     error?: string;
     /** 工作区矩阵读取失败的原因。区分「没有工作区」与「读不到工作区」，避免把故障显示成空状态 */

package/lib/workspace.d.ts

@@ -27,9 +27,12 @@ export declare function tryReadWorkspaces(): {
  */
 export declare function findWorkspacePathBySession(sessionId: string): string | undefined;
 /**
- * 匹配最近活跃的工作区路径。
- * 注意 updatedAt 可能缺失或非 ISO 格式，统一用时间戳比较，无效值视为 0 而非 NaN——
- * 后者会让所有比较都返回 false，导致永远选不中任何工作区。
+ * 匹配最近活跃且包含 Git 仓库的工作区路径。
+ *
+ * 为什么必须优先检查 hasGitDir：workspace.json 中可能记录了父级纯文件夹工作区（例如工程聚合根目录，本身非 Git 仓库），
+ * 当它被打开过导致 updatedAt 较新时，若不检查 .git 就会误把该父目录当成当前仓库执行路径，
+ * 进而导致后续 gh 命令报出 "fatal: not a git repository"。
+ * 策略：优先选取最近活跃且明确具备 .git 的工作区；若均无 .git 再优雅回退到任意普通工作区。
  */
 export declare function findMostRecentWorkspacePath(): string | undefined;
 export declare function hasGitDir(dir: string): boolean;

package/lib/workspace.js

@@ -79,24 +79,39 @@ export function findWorkspacePathBySession(sessionId) {
     return undefined;
 }
 /**
- * 匹配最近活跃的工作区路径。
- * 注意 updatedAt 可能缺失或非 ISO 格式，统一用时间戳比较，无效值视为 0 而非 NaN——
- * 后者会让所有比较都返回 false，导致永远选不中任何工作区。
+ * 匹配最近活跃且包含 Git 仓库的工作区路径。
+ *
+ * 为什么必须优先检查 hasGitDir：workspace.json 中可能记录了父级纯文件夹工作区（例如工程聚合根目录，本身非 Git 仓库），
+ * 当它被打开过导致 updatedAt 较新时，若不检查 .git 就会误把该父目录当成当前仓库执行路径，
+ * 进而导致后续 gh 命令报出 "fatal: not a git repository"。
+ * 策略：优先选取最近活跃且明确具备 .git 的工作区；若均无 .git 再优雅回退到任意普通工作区。
  */
 export function findMostRecentWorkspacePath() {
     try {
         const { workspaces } = tryReadWorkspaces();
-        let best = null;
-        let bestAt = -1;
+        let bestGitWs = null;
+        let bestGitAt = -1;
+        let fallbackWs = null;
+        let fallbackAt = -1;
         for (const ws of workspaces) {
+            if (!ws.path || !fs.existsSync(ws.path))
+                continue;
             const at = Date.parse(ws.updatedAt || '');
             const score = Number.isFinite(at) ? at : 0;
-            if (score > bestAt && ws.path && fs.existsSync(ws.path)) {
-                best = ws;
-                bestAt = score;
+            if (hasGitDir(ws.path)) {
+                if (score > bestGitAt) {
+                    bestGitWs = ws;
+                    bestGitAt = score;
+                }
+            }
+            else {
+                if (score > fallbackAt) {
+                    fallbackWs = ws;
+                    fallbackAt = score;
+                }
             }
         }
-        return best?.path;
+        return bestGitWs?.path || fallbackWs?.path;
     }
     catch {
         return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-github-flow",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "icon": "icon.svg",
   "description": "GitHub Flow: Native GitHub CLI (gh) integration for DeepSeek Harness — Agent Tools, Slash Commands, and Web UI Workspace",
   "type": "module",