@goodandready/dsh-kanban 0.2.13 → 0.2.15

package/README.md

@@ -39,7 +39,7 @@
 
 Managing concurrent software tasks across multiple autonomous AI agents easily leads to context drift, lost pull request handoffs, and untracked branch lifecycles. Without a dedicated visual board, users must manually juggle disparate chat windows and verify issue states on remote VCS trackers.
 
-**`@goodandready/dsh-kanban`** introduces an interactive **Kanban Board** embedded natively into DeepSeek Harness. Every card represents a concrete development task linked to its own **dedicated agent session**. Moving a card between workflow columns automatically dispatches lifecycle instructions directly to the agent (e.g. implementing, opening PRs, deploying, or cleaning up worktrees), with continuous **2-way Gitea/Forgejo synchronization**.
+**`@goodandready/dsh-kanban`** introduces an interactive **Kanban Board** embedded natively into DeepSeek Harness. Every card represents a concrete development task linked to its own **dedicated agent session**. Moving a card between workflow columns automatically dispatches lifecycle instructions directly to the agent (e.g. implementing, opening PRs, deploying, or cleaning up worktrees), with continuous **2-way Gitea, Forgejo, and GitHub synchronization**.
 
 ---
 
@@ -64,7 +64,7 @@ graph LR
         Agent2["Agent: Task #53<br/>(PR Review)"]
     end
 
-    subgraph VCS ["Gitea / Forgejo Instance"]
+    subgraph VCS ["Git Forge (Gitea / GitHub)"]
         GiteaIssues["Issues & Milestones"]
         GiteaPRs["Pull Requests & Branches"]
         Webhook["Event Webhook (/dsh-kanban/webhook)"]
@@ -109,7 +109,7 @@ Unlike passive task boards, `dsh-kanban` actively drives the agents:
 
 ---
 
-### 3. Continuous 2-Way Gitea / Forgejo Sync
+### 3. Continuous 2-Way Gitea / Forgejo & GitHub Sync
 
 * **Bi-directional Reconciliation**: Polling and Webhook receiver (`/dsh-kanban/webhook`) sync issue descriptions, comments, PR status, labels, and closed states.
 * **Conflict Resolution**: Timestamp-based merge logic ensures manual edits in Gitea and board moves resolve cleanly without state clobbering.
@@ -207,6 +207,10 @@ dsh-kanban:
 | Key | Type | Default | Description |
 |:---|:---|:---|:---|
 | `boardKind` | `string` | `"project"` | Board workflow mode: `"project"` (6 columns) or `"simple"` (4 columns) |
+| `gitProvider` | `string` | `"auto"` | Active Git forge: `"auto"` (detect by credentials), `"gitea"`, or `"github"` |
+| `githubTokenRef` | `string` | `""` | DSH credential name containing GitHub PAT or App token |
+| `githubOwner` | `string` | `""` | Default GitHub organization or username |
+| `githubWebhookSecretRef` | `string` | `""` | DSH credential name containing GitHub webhook secret |
 | `giteaUrl` | `string` | `""` | Base URL of Gitea/Forgejo instance for task synchronization |
 | `giteaTokenEnv` | `string` | `"GITEA_TOKEN"` | DSH Credential name containing the Gitea API access token |
 | `giteaOwner` | `string` | `""` | Default organization or username for synced repositories |

package/README.ru.md

@@ -39,7 +39,7 @@
 
 При ведении параллельной разработки силами нескольких автономных AI-агентов легко потерять контроль над статусом задач, проверкой пулл-реквестов (PR) и ветками в репозитории. Без наглядной доски разработчику приходится переключаться между десятками вкладок чата и вручную сверять тикеты в трекере.
 
-**`@goodandready/dsh-kanban`** встраивает полноценную **Канбан-доску** прямо в Web UI DeepSeek Harness. Каждая карточка на доске связана со своей **выделенной сессией агента**. Перемещение карточки между колонками автоматически отправляет агенту целевую инструкцию (разработка, передача на ревью, деплой или очистка воркдеревьев), поддерживая непрерывную **двустороннюю синхронизацию с Gitea / Forgejo**.
+**`@goodandready/dsh-kanban`** встраивает полноценную **Канбан-доску** прямо в Web UI DeepSeek Harness. Каждая карточка на доске связана со своей **выделенной сессией агента**. Перемещение карточки между колонками автоматически отправляет агенту целевую инструкцию (разработка, передача на ревью, деплой или очистка воркдеревьев), поддерживая непрерывную **двустороннюю синхронизацию с Gitea / Forgejo и GitHub**.
 
 ---
 
@@ -64,7 +64,7 @@ graph LR
         Agent2["Агент: Задача #53<br/>(Ревью PR)"]
     end
 
-    subgraph VCS ["Сервер Gitea / Forgejo"]
+    subgraph VCS ["Git Forge (Gitea / GitHub)"]
         GiteaIssues["Задачи и Вехи"]
         GiteaPRs["Пулл-реквесты и Ветки"]
         Webhook["Вебхук-приёмник (/dsh-kanban/webhook)"]
@@ -159,6 +159,10 @@ dsh-kanban:
 | Параметр | Тип | По умолчанию | Описание |
 |:---|:---|:---|:---|
 | `boardKind` | `string` | `"project"` | Режим колонок: `"project"` (6 колонок) или `"simple"` (4 колонки) |
+| `gitProvider` | `string` | `"auto"` | Активный Git-провайдер: `"auto"` (по доступным ключам), `"gitea"` или `"github"` |
+| `githubTokenRef` | `string` | `""` | Имя DSH Credential с токеном доступа GitHub PAT / App |
+| `githubOwner` | `string` | `""` | Организация или логин владельца репозитория GitHub |
+| `githubWebhookSecretRef` | `string` | `""` | Имя DSH Credential с секретом вебхука GitHub |
 | `giteaUrl` | `string` | `""` | URL инстанса Gitea/Forgejo для синхронизации задач |
 | `giteaTokenEnv` | `string` | `"GITEA_TOKEN"` | Имя DSH Credential с токеном доступа к Gitea API |
 | `giteaOwner` | `string` | `""` | Организация или логин владельца репозитория |
@@ -170,7 +174,7 @@ dsh-kanban:
 
 ## 🧪 Тестирование и верификация
 
-Запуск полного набора из более чем 520 юнит- и интеграционных тестов:
+Запуск полного набора из более чем 710 юнит- и интеграционных тестов:
 
 ```bash
 npm test

package/README.zh.md

@@ -159,6 +159,10 @@ dsh-kanban:
 | 配置项 | 数据类型 | 默认值 | 功能说明 |
 |:---|:---|:---|:---|
 | `boardKind` | `string` | `"project"` | 看板模式：`"project"`（6 泳道）或 `"simple"`（4 泳道） |
+| `gitProvider` | `string` | `"auto"` | 活动 Git 平台：`"auto"`（按凭证自动检测）、`"gitea"` 或 `"github"` |
+| `githubTokenRef` | `string` | `""` | 包含 GitHub PAT 或应用令牌的 DSH 凭证名称 |
+| `githubOwner` | `string` | `""` | 默认监听的 GitHub 组织或用户名 |
+| `githubWebhookSecretRef` | `string` | `""` | 包含 GitHub Webhook 密钥的 DSH 凭证名称 |
 | `giteaUrl` | `string` | `""` | 用于同步任务的 Gitea / Forgejo 实例基础地址 |
 | `giteaTokenEnv` | `string` | `"GITEA_TOKEN"` | 存储 Gitea API Token 的 DSH 凭据键名 |
 | `giteaOwner` | `string` | `""` | 默认同步的仓库所属组织或用户名 |

package/lib/client.js

@@ -608,6 +608,7 @@ window.__ModuleLoader__.load({
     }
 
     const helpers = {
+      ROW_ID, ROW_CONFIG_KEY, PKG, KanbanSettingsCard,
       neighboursFor, tasksOf, sortTasks, packInfo, groupByAssignee, applyToEach, recallLaunch, rememberLaunch, stillOffered,
       cardRef, taskRef, cardStatus, facetLabel, boardTitle,
       columnTitle, planLine, stateLabel, isCollapsed,
@@ -721,6 +722,8 @@ window.__ModuleLoader__.load({
       '.dkb-section-card{border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-3);border-radius:10px;padding:14px 16px;display:flex;flex-direction:column;gap:8px;margin-bottom:12px}' +'.dkb-section-title{font-size:14px;font-weight:600;color:var(--dsw-alias-label-primary);display:flex;align-items:center;justify-content:space-between;gap:8px;padding-bottom:4px;border-bottom:1px solid var(--dsw-alias-border-l2)}' +'.dkb-section-badge{font-size:11px;font-weight:500;padding:2px 8px;border-radius:999px;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-secondary)}' +'.dkb-section-badge-ok{border-color:var(--dsw-alias-state-success-border,#34d399);color:var(--dsw-alias-state-success-primary,#059669);background:var(--dsw-alias-state-success-bg,rgba(16,185,129,0.1))}' +
       '.dkb-card{border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-3);border-radius:12px;list-style:none}' +
       '.dkb-cardOpen{background:var(--dsw-alias-bg-layer-2);border-color:var(--dsw-alias-label-dimmed)}' +
+      '.dkb-page{padding:0}' +
+      '.dkb-page .dkb-body{border-top:none;margin:0}' +
       '.dkb-head{appearance:none;width:100%;font:inherit;color:inherit;text-align:left;cursor:pointer;background:0 0;border:0;border-radius:12px;display:flex;align-items:center;gap:12px;padding:14px 16px}' +
       '.dkb-headText{flex-direction:column;flex:1;gap:4px;min-width:0;display:flex}' +
       '.dkb-title{color:var(--dsw-alias-label-primary);font-size:15px;font-weight:600;line-height:1.4}' +
@@ -907,7 +910,17 @@ window.__ModuleLoader__.load({
       'title': 'Kanban',
       'subtitle': 'Task board: Gitea issues and a session per task',
       'section.label': 'Kanban',
+      'group.forge': 'Git Forge',
       'group.gitea': 'Gitea',
+      'group.github': 'GitHub',
+      'field.gitProvider': 'Git Provider',
+      'hint.gitProvider': 'Active forge: "auto" (detect by credentials), "gitea", or "github".',
+      'field.githubTokenRef': 'GitHub credential token',
+      'hint.githubTokenRef': 'Name of DSH credential holding GitHub PAT or App token. Never type raw token.',
+      'field.githubOwner': 'GitHub organization/user',
+      'hint.githubOwner': 'Default GitHub account to watch. Empty uses authenticated user.',
+      'field.githubWebhookSecretRef': 'GitHub webhook secret',
+      'hint.githubWebhookSecretRef': 'Name of DSH credential holding GitHub webhook secret (HMAC-SHA256).',
       'group.general': 'General',
       'field.giteaUrl': 'Instance URL',
       'field.giteaTokenRef': 'Credential name',
@@ -1285,7 +1298,17 @@ window.__ModuleLoader__.load({
       'title': '看板',
       'subtitle': '任务看板：Gitea issue，每个任务一个会话',
       'section.label': '看板',
+      'group.forge': 'Git 平台',
       'group.gitea': 'Gitea',
+      'group.github': 'GitHub',
+      'field.gitProvider': 'Git 平台',
+      'hint.gitProvider': '活动 Git 平台："auto"（自动检测）、"gitea"或"github"。',
+      'field.githubTokenRef': 'GitHub 凭据名称',
+      'hint.githubTokenRef': '存储 GitHub PAT 或应用令牌的 DSH 凭据名称。切勿在此输入真实令牌。',
+      'field.githubOwner': 'GitHub 组织或用户名',
+      'hint.githubOwner': '默认监听的 GitHub 账户。留空使用认证用户。',
+      'field.githubWebhookSecretRef': 'GitHub Webhook 密钥',
+      'hint.githubWebhookSecretRef': '存储 GitHub Webhook 密钥的 DSH 凭据名称。',
       'group.general': '通用',
       'field.giteaUrl': '实例地址',
       'field.giteaTokenRef': '凭据名称',
@@ -1660,8 +1683,12 @@ window.__ModuleLoader__.load({
 
 
     const FIELDS = [
+      { field: 'gitProvider', kind: 'text', group: 'forge' },
       { field: 'giteaUrl', kind: 'text', group: 'gitea' },
       { field: 'giteaTokenRef', kind: 'text', group: 'gitea' },
+      { field: 'githubTokenRef', kind: 'text', group: 'github' },
+      { field: 'githubOwner', kind: 'text', group: 'github' },
+      { field: 'githubWebhookSecretRef', kind: 'text', group: 'github' },
       { field: 'defaultProjectRoot', kind: 'text', group: 'general' },
       { field: 'startPrompt', kind: 'area', group: 'general' },
       { field: 'replyInstruction', kind: 'text', group: 'general' },
@@ -1692,6 +1719,8 @@ window.__ModuleLoader__.load({
     function hintKey(spec) {
       if (spec.group === 'sync') return 'hint.' + spec.field
       if (spec.group === 'gitea') return 'hint.' + spec.field
+      if (spec.group === 'github') return 'hint.' + spec.field
+      if (spec.group === 'forge') return 'hint.' + spec.field
       if (spec.group === 'labels') return 'hint.label'
       if (spec.group === 'limits') return 'hint.limit'
       return 'hint.' + spec.field
@@ -1818,8 +1847,16 @@ window.__ModuleLoader__.load({
     }
 
     function KanbanSettingsCard(props) {
-      const ctx = props.ctx
-      const t = props.t || fallbackT
+      const ctx = props && props.ctx
+      const t = (props && props.t) || fallbackT
+      ensureCss()
+
+      // Row seat (plugins.row.config): summary is a one-liner
+      if (props && props.view === 'summary') {
+        return h('span', { className: 'dkb-sub' }, t('settings.subtitle') || t('subtitle') || 'Kanban board for sessions and tasks')
+      }
+      const page = !!(props && props.view === 'page')
+
       const [open, setOpen] = React.useState(false)
       const [draft, setDraft] = React.useState(null)
       const [saving, setSaving] = React.useState(false)
@@ -1891,7 +1928,7 @@ window.__ModuleLoader__.load({
       ensureCss()
       const style = null
 
-      if (!open) return h('li', { className: 'dkb-card' }, head)
+      if (!page && !open) return h('li', { className: 'dkb-card' }, head)
 
       let body
       if (status === 'loading') {
@@ -1950,6 +1987,11 @@ window.__ModuleLoader__.load({
             badge = h('span', {
               className: 'dkb-section-badge' + (hasUrl ? ' dkb-section-badge-ok' : ''),
             }, hasUrl ? 'Gitea Configured' : 'No URL')
+          } else if (grp === 'github') {
+            const hasGh = Boolean(valueOf('githubTokenRef'))
+            badge = h('span', {
+              className: 'dkb-section-badge' + (hasGh ? ' dkb-section-badge-ok' : ''),
+            }, hasGh ? 'GitHub Configured' : 'No Token')
           } else if (grp === 'sync') {
             const interval = Number(valueOf('syncIntervalSec')) || 0
             badge = h('span', {
@@ -1980,15 +2022,10 @@ window.__ModuleLoader__.load({
         body = rows
       }
 
-      // Row seat (plugins.row.config): the host page draws title/icon/crumb and the
-      // padding, so the summary is a one-liner and the page drops our card chrome.
-      if (props && props.view === 'summary') {
-        return h('span', { className: 'dkb-sub' }, t('settings.subtitle') || 'Kanban board for sessions and tasks')
+      if (page) {
+        return h('div', { className: 'dkb-page' }, h('div', { className: 'dkb-body' }, body))
       }
-      const page = !!(props && props.view === 'page')
-
-      return h(page ? 'div' : 'li', { className: page ? 'dkb-page' : 'dkb-card dkb-cardOpen' },
-        page ? null : head, h('div', { className: 'dkb-body' }, body))
+      return h('li', { className: 'dkb-card dkb-cardOpen' }, head, h('div', { className: 'dkb-body' }, body))
     }
 
     /** Стрелка влево для кнопки возврата: 14x14, обводка цветом текста. */
@@ -2238,6 +2275,36 @@ window.__ModuleLoader__.load({
       const [syncing, setSyncing] = React.useState(false)
       const [picked, setPicked] = React.useState({})
       const [archive, setArchive] = React.useState(null)
+      const [diffExpanded, setDiffExpanded] = React.useState(false)
+      const [diffLoading, setDiffLoading] = React.useState(false)
+      const [diffData, setDiffData] = React.useState(null)
+      const [commitsData, setCommitsData] = React.useState([])
+      const [merging, setMerging] = React.useState(false)
+
+      const loadDiffAndCommits = React.useCallback(async () => {
+        if (!openTask) return
+        setDiffLoading(true)
+        try {
+          const [dRes, cRes] = await Promise.all([
+            api('/task/' + encodeURIComponent(openTask.id) + '/diff'),
+            api('/task/' + encodeURIComponent(openTask.id) + '/commits'),
+          ])
+          setDiffData(dRes)
+          setCommitsData(cRes?.commits || [])
+        } catch (e) {
+          setError(t(e.key || e.error || 'error.unknown'))
+        } finally {
+          setDiffLoading(false)
+        }
+      }, [openTask, t])
+
+      React.useEffect(() => {
+        setDiffExpanded(false)
+        setDiffLoading(false)
+        setDiffData(null)
+        setCommitsData([])
+        setMerging(false)
+      }, [openTask?.id])
       const [metrics, setMetrics] = React.useState(null)
       const [onlyWaiting, setOnlyWaiting] = React.useState(false)
       const [onlyOverdue, setOnlyOverdue] = React.useState(false)
@@ -4518,25 +4585,59 @@ window.__ModuleLoader__.load({
       // below — the seat is additive, not an either/or candidate. The label is a static
       // string on purpose: it is resolved while the page renders, and a locale lookup
       // there would take the whole client batch down with it.
-      try {
-        ctx.slots.inject('plugins.item', () => {
-          ctx.slots.register({
+      const trySlot = (name, register) => {
+        try {
+          if (typeof ctx.slots?.inject === 'function') ctx.slots.inject(name, register)
+          else register()
+        } catch (e) {
+          console.warn('[dsh-kanban] slot registration failed for ' + name + ':', e && e.message)
+        }
+      }
+
+      // #274: Newest slot first, older slots as fallbacks:
+      // 1. plugins.row.config (Row seat on Plugins page, DSH 0.1.6-alpha.2)
+      let cardSlot = undefined
+      trySlot('plugins.row.config', () => {
+        ctx.slots.register(
+          {
+            name: 'plugins.row.config',
+            key: ROW_CONFIG_KEY,
+            locale: NS,
+            inject: () => ({ ctx }),
+          },
+          SafeSettingsCard,
+        )
+        if (!cardSlot) cardSlot = 'plugins.row.config'
+      })
+
+      // 2. plugins.item (Official group on Plugins page)
+      trySlot('plugins.item', () => {
+        ctx.slots.register(
+          {
             name: 'plugins.item',
             id: ROW_ID,
             order: 60,
             label: () => 'Kanban',
             locale: NS,
             inject: () => ({ ctx }),
-          }, SafeSettingsCard)
-        })
-      } catch (e) {
-        console.warn('[dsh-kanban] plugins.item seat unavailable', e)
-      }
+          },
+          SafeSettingsCard,
+        )
+      })
 
-      const cardSlot = registerFirst(ctx, [
-        { name: 'plugins.row.config', key: ROW_CONFIG_KEY, locale: NS, inject: () => ({ ctx }) },
-        { name: 'settings.plugin.item', key: NS, locale: NS, inject: () => ({ ctx }) },
-      ], SafeSettingsCard)
+      // 3. settings.plugin.item (legacy fallback for older cores)
+      trySlot('settings.plugin.item', () => {
+        ctx.slots.register(
+          {
+            name: 'settings.plugin.item',
+            key: NS,
+            locale: NS,
+            inject: () => ({ ctx }),
+          },
+          SafeSettingsCard,
+        )
+        if (!cardSlot) cardSlot = 'settings.plugin.item'
+      })
 
       const toggle = createToggle()
       ctx.effect(() => {

package/lib/commands.js

@@ -51,6 +51,7 @@ const TABLE = {
  *   `undefined` — такой колонки на этой доске нет.
  */
 export function commandFor(column, kind = 'project') {
+  if (!columnsOfKind(kind).includes(column)) return undefined
   const board = TABLE[kind]
   if (board === undefined) return undefined
   const found = board[column]

package/lib/config.js

@@ -55,8 +55,10 @@ export const DEFAULT_BOARDS = [
 
 /** Значения по умолчанию. Из них же собирается схема в `lib/index.js`. */
 export const CONFIG_DEFAULTS = {
+  gitProvider: 'auto',
   giteaUrl: '',
   giteaTokenRef: 'GITEA_TOKEN',
+  githubTokenRef: 'GITHUB_TOKEN',
   defaultProjectRoot: '',
   startPrompt: '',
   replyInstruction: '',
@@ -65,11 +67,13 @@ export const CONFIG_DEFAULTS = {
   syncIntervalSec: 120,
   staleAfterMin: 60,
   giteaOwner: '',
+  githubOwner: '',
   columnNames: '',
   watchRepos: '',
   archiveAfterDays: 7,
   boardToolEnabled: false,
   webhookSecretRef: '',
+  githubWebhookSecretRef: '',
   pushToGitea: true,
   worktreeIsolation: true,
   worktreeRoot: '',
@@ -86,8 +90,10 @@ export const CONFIG_DEFAULTS = {
 
 /** Пояснения к полям; повторно используются схемой и карточкой настроек. */
 export const CONFIG_HINTS = {
+  gitProvider: 'Active Git forge: "auto" (detect by credentials), "gitea", or "github".',
   giteaUrl: 'Gitea or Forgejo instance URL, e.g. https://gitea.example.com. Empty disables import.',
   giteaTokenRef: 'Name of DSH credential holding the access token. Do not enter raw token.',
+  githubTokenRef: 'Name of DSH credential holding GitHub Personal Access Token or App token. Do not enter raw token.',
   defaultProjectRoot: 'Directory containing project repositories. Empty uses harness working directory.',
   startPrompt: 'Template for initial message to agent session. Empty uses built-in default.',
   replyInstruction: 'Instruction appended to initial message (e.g. language/format constraints). Empty adds nothing.',
@@ -96,11 +102,13 @@ export const CONFIG_HINTS = {
   syncIntervalSec: 'Interval in seconds for polling Gitea synchronization. 0 disables polling.',
   staleAfterMin: 'Minutes of inactivity before active task session is flagged stale. 0 disables.',
   giteaOwner: 'Default Gitea organization/user to track. Auto-detected if single organization.',
+  githubOwner: 'Default GitHub user or organization to track. Empty uses the authenticated user.',
   columnNames: 'Custom column title mappings as "id=Name" pairs comma-separated.',
   watchRepos: 'Filter sync to specific repository names comma-separated. Empty watches all repos.',
   archiveAfterDays: 'Days completed tasks remain before automatic archiving. 0 disables.',
   boardToolEnabled: 'Allow autonomous agent to advance cards via board_move tool.',
   webhookSecretRef: 'Name of DSH credential holding Gitea webhook secret.',
+  githubWebhookSecretRef: 'Name of DSH credential holding GitHub webhook secret (HMAC-SHA256).',
   pushToGitea: 'Automatically close corresponding Gitea issue when card moves to Done.',
   worktreeIsolation: 'Isolate task sessions in dedicated git worktrees to prevent workspace collisions.',
   worktreeRoot: 'Custom root directory for task worktrees. Empty defaults to $DSH_HOME/worktrees.',

package/lib/git-provider.js

@@ -0,0 +1,156 @@
+// Композитный маршрутизатор Git-провайдеров (Gitea и GitHub).
+//
+// Предоставляет единый интерфейс к обеим системам:
+// - прозрачно направляет запросы задач в соответствующий провайдер (task.provider / issueUrl);
+// - в режиме 'auto' опрашивает настроенный провайдер или объединяет результаты поиска;
+// - позволяет доске бесшовно работать как только с Gitea, так и только с GitHub или с обоими сразу.
+
+export function createGitProvider({ gitea, github, getConfig }) {
+  async function resolveActiveProvider(hint) {
+    if (hint && typeof hint === 'object') {
+      if (hint.provider === 'github') return github
+      if (hint.provider === 'gitea') return gitea
+      if (typeof hint.issueUrl === 'string' && hint.issueUrl.includes('github.com')) {
+        return github
+      }
+    } else if (hint === 'github') {
+      return github
+    } else if (hint === 'gitea') {
+      return gitea
+    }
+
+    const mode = String(getConfig()?.gitProvider || 'auto').toLowerCase()
+    if (mode === 'github') return github
+    if (mode === 'gitea') return gitea
+
+    // В режиме 'auto': проверяем доступность провайдеров
+    const giteaReady = await gitea.isConfigured()
+    const githubReady = await github.isConfigured()
+    if (githubReady && !giteaReady) return github
+    return gitea
+  }
+
+  function forTarget(target) {
+    if (target === github || target?.provider === 'github') return github
+    if (target === gitea || target?.provider === 'gitea') return gitea
+    return undefined
+  }
+
+  return {
+    gitea,
+    github,
+
+    /** Определить провайдера для задачи или контекста. */
+    resolve: resolveActiveProvider,
+
+    /** Настроен ли хотя бы один или конкретный провайдер. */
+    async isConfigured(providerName) {
+      if (providerName === 'github') return github.isConfigured()
+      if (providerName === 'gitea') return gitea.isConfigured()
+      const gReady = await gitea.isConfigured()
+      if (gReady) return true
+      return github.isConfigured()
+    },
+
+    /** Логин текущего пользователя. */
+    async me(target) {
+      const p = forTarget(target) || await resolveActiveProvider(target)
+      return p.me()
+    },
+
+    /** Список issues. */
+    async listIssues(options) {
+      const p = forTarget(options?.provider) || await resolveActiveProvider(options)
+      return p.listIssues(options)
+    },
+
+    /** Получить issue по номеру. */
+    async getIssue(options) {
+      const p = forTarget(options?.provider) || await resolveActiveProvider(options)
+      return p.getIssue(options)
+    },
+
+    /** Создать issue. */
+    async createIssue(options) {
+      const p = forTarget(options?.provider) || await resolveActiveProvider(options)
+      return p.createIssue(options)
+    },
+
+    /** Закрыть issue. */
+    async closeIssue(options) {
+      const p = forTarget(options?.provider) || await resolveActiveProvider(options)
+      return p.closeIssue(options)
+    },
+
+    /** Комментарий в issue. */
+    async comment(options) {
+      const p = forTarget(options?.provider) || await resolveActiveProvider(options)
+      return p.comment(options)
+    },
+
+    /** Назначить ответственных. */
+    async setAssignees(options) {
+      const p = forTarget(options?.provider) || await resolveActiveProvider(options)
+      return p.setAssignees(options)
+    },
+
+    /** Список Pull Requests. */
+    async listPulls(options) {
+      const p = forTarget(options?.provider) || await resolveActiveProvider(options)
+      return p.listPulls(options)
+    },
+
+    /** Создать Pull Request. */
+    async createPullRequest(options) {
+      const p = forTarget(options?.provider) || await resolveActiveProvider(options)
+      return p.createPullRequest(options)
+    },
+
+    /** Список веток репозитория. */
+    async listBranches(options) {
+      const p = forTarget(options?.provider) || await resolveActiveProvider(options)
+      return p.listBranches(options)
+    },
+
+    /** Список организаций. */
+    async listOrgs(target) {
+      const p = forTarget(target) || await resolveActiveProvider(target)
+      return p.listOrgs()
+    },
+
+    /** Репозитории организации. */
+    async listOrgRepos(options) {
+      const p = forTarget(options?.provider) || await resolveActiveProvider(options)
+      return p.listOrgRepos(options)
+    },
+
+    /**
+     * Поиск репозиториев: ищет в целевом провайдере либо агрегирует результаты
+     * из обоих, если включены оба.
+     */
+    async searchRepos(options) {
+      const target = forTarget(options?.provider)
+      if (target) {
+        return target.searchRepos(options)
+      }
+
+      const mode = String(getConfig()?.gitProvider || 'auto').toLowerCase()
+      if (mode === 'github') return github.searchRepos(options)
+      if (mode === 'gitea') return gitea.searchRepos(options)
+
+      // Если режим 'auto' / 'both', опрашиваем оба настроенных
+      const [giteaConfigured, githubConfigured] = await Promise.all([
+        gitea.isConfigured(),
+        github.isConfigured(),
+      ])
+
+      const requests = []
+      if (giteaConfigured) requests.push(gitea.searchRepos(options).catch(() => []))
+      if (githubConfigured) requests.push(github.searchRepos(options).catch(() => []))
+
+      if (requests.length === 0) return []
+      const results = await Promise.all(requests)
+      return results.flat()
+    },
+  }
+}

package/lib/gitea.js

@@ -33,7 +33,9 @@ export function safeSegment(value) {
 
 /** Имя учётной записи — имя переменной окружения, а не сам секрет. */
 export function isCredentialName(value) {
-  return /^[A-Za-z_][A-Za-z0-9_]*$/.test(String(value || ''))
+  const str = String(value || '')
+  if (looksLikeSecret(str)) return false
+  return /^[A-Za-z_][A-Za-z0-9_]*$/.test(str)
 }
 
 /** Похоже на сам токен, а не на его имя. */