dsh-github-flow 0.1.6 → 0.1.8

package/lib/commands/gh.d.ts

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

package/lib/commands/gh.js

@@ -1,4 +1,5 @@
-export function registerGhCommand(commandsService, executor) {
+import { CURRENT_PLUGIN_VERSION, PLUGIN_PACKAGE_NAME, NPM_PACKAGE_URL } from '../version.js';
+export function registerGhCommand(commandsService, executor, updateChecker) {
     if (!commandsService || typeof commandsService.register !== 'function')
         return;
     commandsService.register({
@@ -11,7 +12,14 @@ export function registerGhCommand(commandsService, executor) {
                 // 「我刚 gh auth login 到底成没成」，给他 30 秒前的缓存等于答非所问。
                 const auth = await executor.checkAuth(undefined, true);
                 const repo = await executor.getRepoMetadata();
+                const updateInfo = updateChecker?.getQuickStatus();
                 let md = `### GitHub 集成状态\n\n`;
+                // 若检测到新版本，在最上方展示醒目的升级指引横幅
+                if (updateInfo?.hasUpdate) {
+                    md += `> 🚀 **发现新版本 v${updateInfo.latestVersion}**（当前为 \`v${updateInfo.currentVersion}\`）\n`;
+                    md += `> 输入 \`/gh upgrade\` 查看升级指引，或在终端执行：\`${updateInfo.upgradeCommand}\`\n\n`;
+                }
+                md += `- **插件版本**: \`v${updateInfo?.currentVersion || CURRENT_PLUGIN_VERSION}\`\n`;
                 if (auth.loggedIn) {
                     md += `- **登录账号**: \`${auth.user || '已登录'}\`\n`;
                     md += `- **授权作用域**: ${auth.scopes?.map((s) => `\`${s}\``).join(', ') || '标准权限'}\n`;
@@ -35,15 +43,44 @@ export function registerGhCommand(commandsService, executor) {
                     text: md,
                 };
             }
+            if (trimmed === 'upgrade') {
+                const info = updateChecker ? await updateChecker.check(true) : null;
+                const curVer = info?.currentVersion || CURRENT_PLUGIN_VERSION;
+                const latestVer = info?.latestVersion || curVer;
+                const hasUpdate = info?.hasUpdate ?? false;
+                const isMac = process.platform === 'darwin';
+                const isWin = process.platform === 'win32';
+                const platformName = isMac ? 'macOS' : isWin ? 'Windows' : 'Linux';
+                let md = `### 🚀 ${PLUGIN_PACKAGE_NAME} 插件升级指南\n\n`;
+                md += `- **当前运行版本**: \`v${curVer}\`\n`;
+                md += `- **官方最新版本**: \`v${latestVer}\` ${hasUpdate ? '🔥 (有可用更新)' : '✅ (已是最新)'}\n`;
+                md += `- **操作系统环境**: \`${platformName} (${process.platform})\`\n`;
+                md += `- **npm 仓库地址**: [${NPM_PACKAGE_URL}](${NPM_PACKAGE_URL})\n\n`;
+                md += `#### 请根据你的 DSH 安装环境选择适用的升级方式：\n\n`;
+                md += `1. **DSH 官方标准工程升级（推荐）**:\n\`\`\`bash\npnpm dsh plugin add ${PLUGIN_PACKAGE_NAME}@latest\n\`\`\`\n\n`;
+                md += `2. **DSH 桌面版 Profile 环境升级**:\n\`\`\`bash\ndsh plugin --profile desktop add ${PLUGIN_PACKAGE_NAME}@latest\n\`\`\`\n`;
+                if (isMac) {
+                    md += `> 💡 *macOS 提示*：若在终端找不到 \`dsh\` 命令，可直接在桌面端目录更新：\n\`\`\`bash\ncd ~/.dsh/profiles/desktop && npm install ${PLUGIN_PACKAGE_NAME}@latest --save\n\`\`\`\n\n`;
+                }
+                else {
+                    md += `\n`;
+                }
+                md += `3. **Node 全局环境升级**:\n\`\`\`bash\nnpm install -g ${PLUGIN_PACKAGE_NAME}@latest\n\`\`\`\n\n`;
+                md += `> 💡 **升级后提示**：Node.js 运行时对已载入模块存在强缓存，升级后**请重启 DSH 服务以完全加载最新后端工具**。`;
+                return {
+                    kind: 'success',
+                    text: md,
+                };
+            }
             if (trimmed === 'help') {
                 return {
                     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"*`,
+                    text: `### DSH GitHub Flow 帮助\n\n- \`/gh status\`: 检查当前 GitHub CLI 账号、仓库连接与插件版本\n- \`/gh upgrade\`: 检查新版本并显示全场景升级命令指引\n- \`/gh help\`: 显示此帮助信息\n\n可以在对话中直接让 Agent 操作 GitHub，如：\n- *"查看当前仓库有哪些开放的 PR"* \n- *"查看最近一次 CI 失败的原因"* \n- *"帮我给当前分支创建 PR"*`,
                 };
             }
             return {
                 kind: 'error',
-                text: `未知命令选项: /gh ${trimmed}。可用用法: /gh status, /gh help`,
+                text: `未知命令选项: /gh ${trimmed}。可用用法: /gh status, /gh upgrade, /gh help`,
             };
         },
     });

package/lib/executor.d.ts

@@ -21,11 +21,12 @@ export declare 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?: string): string;
+    resolveWorkspaceCwd(explicitCwd?: string, explicitSessionId?: string): string;
     /**
      * 安全执行 gh 命令
      * 采用 execFile 参数数组隔离，彻底杜绝 Shell 字符串拼接注入漏洞
@@ -57,5 +58,5 @@ export declare class GhExecutor {
      * 获取当前目录（工作区）关联的远程仓库元数据
      * 采用 gh repo view + 本地 git remote 双保险机制，彻底杜绝已配置远程却误判未关联的问题
      */
-    getRepoMetadata(cwd?: string): Promise<RepoMetadata | null>;
+    getRepoMetadata(cwd?: string, sessionId?: string): Promise<RepoMetadata | null>;
 }

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, {
@@ -252,7 +269,18 @@ export class GhExecutor {
     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('✓');
+        // 多重维度强健判定登录态 (容错 Windows Unicode 乱码、Keyring 告警与不同版本 CLI 输出差分)
+        const hasLoggedInFlag = /logged\s+in\s+to/i.test(raw) || raw.includes('✓') || raw.includes('√');
+        const hasActiveFlag = /active\s+account:\s*true/i.test(raw);
+        const hasTokenFlag = raw.includes('Token:') || raw.includes('Token scopes:');
+        const accountMatch = raw.match(/account\s+([A-Za-z0-9_-]+)/i);
+        const hasAccount = Boolean(accountMatch && accountMatch[1] && accountMatch[1].toLowerCase() !== 'none');
+        // 显式未登录特征排查
+        const isExplicitlyLoggedOut = /not\s+logged\s+in/i.test(raw) ||
+            raw.includes('gh auth login') ||
+            raw.includes('authentication required') ||
+            raw.includes('No accounts found');
+        const loggedIn = !isExplicitlyLoggedOut && (hasLoggedInFlag || hasActiveFlag || (hasTokenFlag && hasAccount));
         // 只要已登录或有常规输出，则必然安装了 gh
         const isNotInstalled = Boolean(res.error && (res.error.includes('系统未检测到 GitHub CLI') || res.error.includes('ENOENT')));
         const installed = loggedIn || !isNotInstalled;
@@ -275,7 +303,6 @@ export class GhExecutor {
         }
         // 解析用户名
         let user;
-        const accountMatch = raw.match(/account\s+([A-Za-z0-9_-]+)/i);
         if (accountMatch) {
             user = accountMatch[1];
         }
@@ -339,8 +366,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/main.d.ts

@@ -2,6 +2,13 @@ import { GhExecutor } from './executor.js';
 import './github-service.js';
 import type { PluginConfig } from './types.js';
 export declare const name = "dsh-github-flow";
+/**
+ * 核心服务依赖声明
+ *
+ * 必须显式声明 webServer 与 workspaceRegistry：
+ * 在 Cordis 依赖隔离机制下，只有在 inject 显式声明的服务，当前插件作用域 ctx 才能持有
+ * ctx.webServer 与 ctx.workspaceRegistry 引用，进而注册 Web UI 所需的后端 API 路由。
+ */
 export declare const inject: readonly ['tools', 'commands', 'webServer', 'workspaceRegistry'];
 export type Config = PluginConfig;
 /**
@@ -19,4 +26,8 @@ export declare const Config: {
 export declare function apply(ctx: any, config?: PluginConfig): void;
 export type GitHubService = GhExecutor;
 export * from './types.js';
+export * from './version.js';
+export * from './updater.js';
+export * from './upgrade-manager.js';
+export * from './executor.js';
 export * from './github-service.js';

package/lib/main.js

@@ -6,10 +6,20 @@ import { createRepoTool } from './tools/repo.js';
 import { createApiTool } from './tools/api.js';
 import { registerGhCommand } from './commands/gh.js';
 import { registerApiRoutes } from './api/routes.js';
+import { UpdateChecker } from './updater.js';
+import { UpgradeManager } from './upgrade-manager.js';
+import { NPM_PACKAGE_URL } from './version.js';
 // 引用即生效：加载本模块以挂上 declare module '@deepseek-ai/cordis' 的 ctx.github 类型声明，
 // 并随下面 `export * from './github-service.js'` 一起传给消费方。
 import './github-service.js';
 export const name = 'dsh-github-flow';
+/**
+ * 核心服务依赖声明
+ *
+ * 必须显式声明 webServer 与 workspaceRegistry：
+ * 在 Cordis 依赖隔离机制下，只有在 inject 显式声明的服务，当前插件作用域 ctx 才能持有
+ * ctx.webServer 与 ctx.workspaceRegistry 引用，进而注册 Web UI 所需的后端 API 路由。
+ */
 export const inject = ['tools', 'commands', 'webServer', 'workspaceRegistry'];
 /**
  * 符合 Standard Schema / Cordis Loader 契约的 Config 运行时校验规范
@@ -28,6 +38,9 @@ export const Config = {
                     maxOutputBytes: typeof cfg.maxOutputBytes === 'number' ? cfg.maxOutputBytes : undefined,
                     cacheTtlMs: typeof cfg.cacheTtlMs === 'number' ? cfg.cacheTtlMs : 15_000,
                     defaultListLimit: typeof cfg.defaultListLimit === 'number' ? cfg.defaultListLimit : 20,
+                    checkUpdate: typeof cfg.checkUpdate === 'boolean' ? cfg.checkUpdate : true,
+                    updateCheckIntervalMs: typeof cfg.updateCheckIntervalMs === 'number' ? cfg.updateCheckIntervalMs : 86_400_000,
+                    registryUrl: typeof cfg.registryUrl === 'string' ? cfg.registryUrl : undefined,
                 }
             };
         }
@@ -35,6 +48,11 @@ export const Config = {
 };
 export function apply(ctx, config = {}) {
     const executor = new GhExecutor(config);
+    const updateChecker = new UpdateChecker({
+        intervalMs: config.updateCheckIntervalMs,
+        customRegistry: config.registryUrl,
+    });
+    const upgradeManager = new UpgradeManager();
     // 1. 兑现生态服务契约：将 GitHub 执行引擎作为服务暴露给其他 DSH 插件 (ctx.github)
     if (ctx.provide && typeof ctx.provide === 'function') {
         ctx.provide('github', executor);
@@ -42,9 +60,9 @@ export function apply(ctx, config = {}) {
     else {
         ctx.github = executor;
     }
-    // 2. 注册人类 Slash 命令 (/gh status, /gh help)
+    // 2. 注册人类 Slash 命令 (/gh status, /gh upgrade, /gh help)
     if (ctx.commands) {
-        registerGhCommand(ctx.commands, executor);
+        registerGhCommand(ctx.commands, executor, updateChecker);
     }
     // 3. 注册 Agent 模型工具集（5 大核心领域工具）
     if (ctx.tools) {
@@ -58,9 +76,29 @@ export function apply(ctx, config = {}) {
     if (ctx.webServer) {
         // 传入 ctx 作用域对象，使 routes 能够通过 ctx.effect 绑定生命周期并在插件卸载/重载时自动注销；
         // cacheTtlMs 传给路由层以尊重用户的缓存 TTL 配置。
-        registerApiRoutes(ctx, executor, ctx.workspaceRegistry, config.cacheTtlMs || 15_000);
+        registerApiRoutes(ctx, executor, ctx.workspaceRegistry, config.cacheTtlMs || 15_000, updateChecker, upgradeManager);
+    }
+    // 5. 启动后低优先级后台闲时静默探测：若有新版本，仅输出一次友好的控制台提示
+    if (config.checkUpdate !== false) {
+        setTimeout(() => {
+            updateChecker.check(false).then((info) => {
+                if (info.hasUpdate) {
+                    console.log(`
+┌────────────────────────────────────────────────────────────────────────┐
+│  🚀 dsh-github-flow 插件有新版本可用: ${info.currentVersion} -> ${info.latestVersion}              │
+│  升级命令: ${info.upgradeCommand.padEnd(58, ' ')}│
+│  更新主页: ${NPM_PACKAGE_URL.padEnd(58, ' ')}│
+└────────────────────────────────────────────────────────────────────────┘
+`);
+                }
+            }).catch(() => { });
+        }, 3_000);
     }
 }
 export * from './types.js';
+export * from './version.js';
+export * from './updater.js';
+export * from './upgrade-manager.js';
+export * from './executor.js';
 // 让 `ctx.github` 的类型声明随包一起被消费方加载（声明合并在 './github-service.js' 内）
 export * from './github-service.js';

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 };