@goodandready/dsh-github-ops 0.6.6 → 0.6.7

package/lib/client.js

@@ -147,6 +147,11 @@ window.__ModuleLoader__.load({
       scmStageHunk: 'Stage Hunk',
       scmUnstageHunk: 'Unstage Hunk',
       scmHunk: 'Hunk',
+      scmCherryPick: 'Cherry-pick',
+      scmRevert: 'Revert',
+      scmSubmodules: 'Submodules',
+      scmSubmoduleUpdate: 'Update',
+      scmSubmoduleUpdateAll: 'Update All Submodules',
       scmGraphTitle: 'Git Graph',
       scmGraphRefresh: 'Refresh Graph',
       scmGraphEmpty: 'No commit history available.',
@@ -269,6 +274,11 @@ window.__ModuleLoader__.load({
       scmStageHunk: '暂存代码块',
       scmUnstageHunk: '取消暂存块',
       scmHunk: '代码块',
+      scmCherryPick: '择优拣选',
+      scmRevert: '还原提交',
+      scmSubmodules: '子模块',
+      scmSubmoduleUpdate: '更新',
+      scmSubmoduleUpdateAll: '更新所有子模块',
       scmGraphTitle: 'Git 提交图',
       scmGraphRefresh: '刷新提交图',
       scmGraphEmpty: '暂无可用的提交历史。',
@@ -584,6 +594,62 @@ window.__ModuleLoader__.load({
         ),
       ) : null
 
+      const graphBar = React.createElement('div', { className: 'gho-scm-bar' },
+        button(
+          showGraph ? `${t('scmGraphTitle')} ▾` : `${t('scmGraphTitle')} ▸`,
+          () => {
+            const next = !showGraph
+            setShowGraph(next)
+            if (next && graphData.phase === 'idle') loadGraph()
+          },
+        ),
+        showGraph ? button(t('scmGraphRefresh'), loadGraph, { disabled: graphData.phase === 'loading' }) : null,
+      )
+
+      const graphView = showGraph
+        ? React.createElement('div', { className: 'gho-git-graph' },
+            graphData.phase === 'loading'
+              ? React.createElement('div', { className: 'gho-scm-meta' }, t('scmLoading'))
+              : (graphData.entries && graphData.entries.length > 0
+                  ? graphData.entries.map((entry, idx) => {
+                      const sha = entry.hash || entry.sha
+                      const subject = entry.subject || entry.message
+                      return React.createElement('div', { key: sha || idx, className: 'gho-graph-row' },
+                        entry.graph ? React.createElement('span', { className: 'gho-graph-conn' }, entry.graph) : null,
+                        sha ? React.createElement('span', { className: 'gho-graph-sha' }, sha.slice(0, 7)) : null,
+                        entry.refs && entry.refs.length ? React.createElement('span', { className: 'gho-graph-refs' }, entry.refs.map((r, rIdx) => React.createElement('span', { key: rIdx, className: 'gho-graph-ref' }, r))) : null,
+                        subject ? React.createElement('span', { className: 'gho-graph-msg' }, subject) : null,
+                        sha ? React.createElement('span', { className: 'gho-scm-actions' },
+                          button(
+                            confirming === `cp:${sha}` ? t('scmConfirm') : t('scmCherryPick'),
+                            () => armed(`cp:${sha}`, 'cherry_pick', { commit: sha, confirm: true }),
+                          ),
+                          button(
+                            confirming === `rev:${sha}` ? t('scmConfirm') : t('scmRevert'),
+                            () => armed(`rev:${sha}`, 'revert', { commit: sha, confirm: true }),
+                            { warn: true },
+                          ),
+                        ) : null,
+                        entry.date ? React.createElement('span', { className: 'gho-graph-meta' }, entry.date) : null,
+                      )
+                    })
+                  : React.createElement('div', { className: 'gho-scm-meta' }, t('scmGraphEmpty'))
+                )
+          )
+        : null
+
+      const submoduleBar = (payload.submodules && payload.submodules.length > 0)
+        ? React.createElement('div', { className: 'gho-scm-bar' },
+            React.createElement('span', { className: 'gho-scm-counts' }, t('scmSubmodules')),
+            button(t('scmSubmoduleUpdateAll'), () => runAction('submodule_update', {})),
+            payload.submodules.map((sm, smIdx) => React.createElement('span', { key: sm.path || smIdx, style: { display: 'inline-flex', gap: '4px', alignItems: 'center' } },
+              React.createElement('span', { className: 'gho-scm-path' }, `${sm.path} (${sm.shortCommit || ''})`),
+              React.createElement('span', { className: `gho-badge gho-badge-${sm.status === 'in-sync' ? 'healthy' : (sm.status === 'conflict' ? 'failing' : 'building')}` }, sm.status),
+              button(t('scmSubmoduleUpdate'), () => runAction('submodule_update', { path: sm.path })),
+            )),
+          )
+        : null
+
       const worktreeBar = (payload.worktrees && payload.worktrees.length > 0)
         ? React.createElement('div', { className: 'gho-scm-bar' },
           React.createElement('span', { className: 'gho-scm-counts' }, t('scmWorktrees')),
@@ -687,6 +753,7 @@ window.__ModuleLoader__.load({
         graphView,
         branchBar,
         stashBar,
+        submoduleBar,
         worktreeBar,
         mirrorBar,
         React.createElement('div', { className: 'gho-scm-meta' },

package/lib/routes.js

@@ -10,7 +10,7 @@ import { join as joinPath } from 'node:path'
 
 import { statusPayload, isTrustedRequest, isTrustedWriteRequest, getRejectionStatus, getWriteRejectionStatus, sendJson } from './status.js'
 import { buildAction, validateCwd, validateStashRef, resolveConflictFile } from './scm-write.js'
-import { parseStatus, parseBranches, parseStashes, parseWorktrees, parseCount, scmPayload, mergeStateFrom, hasConflicts, parseConflictBlocks, parseDiffHunks, parseGitGraph } from './scm.js'
+import { parseStatus, parseBranches, parseStashes, parseWorktrees, parseSubmodules, parseCount, scmPayload, mergeStateFrom, hasConflicts, parseConflictBlocks, parseDiffHunks, parseGitGraph } from './scm.js'
 import { SseEventManager } from './events.js'
 import { encodeRepoPath } from './github.js'
 import { listIssues } from './tools/issues.js'
@@ -221,6 +221,25 @@ export function registerRoutes(ctx, deps = {}) {
                 stderr: String(answer.stderr || '').slice(0, 4000),
               })
               if (answer.code !== 0) {
+                const gitDirAnswer = await git(['rev-parse', '--absolute-git-dir'], { cwd })
+                const gitDir = gitDirAnswer.code === 0 ? gitDirAnswer.stdout.trim() : joinPath(cwd, '.git')
+                const merge = mergeStateFrom({
+                  mergeHead: existsSync(joinPath(gitDir, 'MERGE_HEAD')),
+                  rebaseDir: existsSync(joinPath(gitDir, 'rebase-merge')) || existsSync(joinPath(gitDir, 'rebase-apply')),
+                  cherryPickHead: existsSync(joinPath(gitDir, 'CHERRY_PICK_HEAD')),
+                  revertHead: existsSync(joinPath(gitDir, 'REVERT_HEAD')),
+                })
+                if (merge.inProgress) {
+                  return sendJson(res, 200, {
+                    ok: false,
+                    action: built.action,
+                    summary: built.summary,
+                    steps,
+                    mergeState: merge,
+                    hasConflicts: true,
+                    error: `${built.action} encountered merge conflicts`,
+                  })
+                }
                 return sendJson(res, 200, { ok: false, action: built.action, summary: built.summary, steps, error: 'git refused the step' })
               }
             }
@@ -285,12 +304,13 @@ export function registerRoutes(ctx, deps = {}) {
             ahead = aheadAnswer.code === 0 ? parseCount(aheadAnswer.stdout) : null
             behind = behindAnswer.code === 0 ? parseCount(behindAnswer.stdout) : null
           }
-          const [statusAnswer, branchesAnswer, tagsAnswer, stashesAnswer, worktreesAnswer] = await Promise.all([
+          const [statusAnswer, branchesAnswer, tagsAnswer, stashesAnswer, worktreesAnswer, submodulesAnswer] = await Promise.all([
             git(['status', '--porcelain=v1'], { cwd }),
             git(['branch', '--format=%(refname:short)\t%(HEAD)'], { cwd }),
             git(['tag', '--list'], { cwd }),
             git(['stash', 'list', '--format=%gd\t%gs'], { cwd }),
             git(['worktree', 'list', '--porcelain'], { cwd }),
+            git(['submodule', 'status'], { cwd }),
           ])
           const gitDirAnswer = await git(['rev-parse', '--absolute-git-dir'], { cwd })
           const gitDir = gitDirAnswer.code === 0 ? gitDirAnswer.stdout.trim() : joinPath(cwd, '.git')
@@ -311,6 +331,7 @@ export function registerRoutes(ctx, deps = {}) {
             tags: tagsAnswer.code === 0 ? tagsAnswer.stdout.split('\n').map((t) => t.trim()).filter(Boolean).slice(0, 50) : [],
             stashes: parseStashes(stashesAnswer.code === 0 ? stashesAnswer.stdout : ''),
             worktrees: parseWorktrees(worktreesAnswer.code === 0 ? worktreesAnswer.stdout : ''),
+            submodules: parseSubmodules(submodulesAnswer.code === 0 ? submodulesAnswer.stdout : ''),
             merge,
           }))
           } catch (err) {

package/lib/scm-write.js

@@ -17,6 +17,15 @@ const BRANCH_RE = /^(?!-)(?!.*\.\.)[A-Za-z0-9._/-]{1,120}$/
 /** A repository-relative path: no absolute paths, no traversal, no control characters. */
 const PATH_RE = /^(?!-)(?!\/)(?!.*\.\.)[^\u0000-\u001f]{1,500}$/
 
+/** A commit sha: 7 to 40 hexadecimal characters. */
+const SHA_RE = /^[0-9a-fA-F]{7,40}$/
+
+export function validateCommitSha(sha) {
+  const value = String(sha == null ? '' : sha).trim()
+  if (!SHA_RE.test(value)) throw new Error(`refusing an invalid commit hash: "${String(sha).slice(0, 40)}"`)
+  return value
+}
+
 export function validateBranch(name) {
   const value = String(name == null ? '' : name).trim()
   if (!BRANCH_RE.test(value)) throw new Error(`refusing an unsafe branch name: "${String(name).slice(0, 60)}"`)
@@ -175,12 +184,30 @@ export function buildAction(action, args = {}) {
       step.push(path)
       return result(name, [step], destructive, `remove worktree at ${path}`)
     }
+    case 'cherryPick':
+    case 'cherry_pick': {
+      const sha = validateCommitSha(args.commit || args.sha)
+      return result('cherry_pick', [['cherry-pick', sha]], destructive, `cherry-pick ${sha}`)
+    }
+    case 'revert': {
+      const sha = validateCommitSha(args.commit || args.sha)
+      const noEdit = args.noEdit !== false
+      const step = noEdit ? ['revert', '--no-edit', sha] : ['revert', sha]
+      return result('revert', [step], destructive, `revert ${sha}`)
+    }
+    case 'submoduleUpdate':
+    case 'submodule_update': {
+      const path = args.path ? validatePath(args.path) : ''
+      const step = ['submodule', 'update', '--init', '--recursive']
+      if (path) step.push('--', path)
+      return result('submodule_update', [step], false, `update submodules${path ? ` in ${path}` : ''}`)
+    }
     default:
       throw new Error(`unknown action: "${name.slice(0, 40)}"`)
   }
 }
 
-const DESTRUCTIVE = new Set(['discard', 'branchDelete', 'stashDrop', 'stash_drop', 'abort', 'worktreeRemove'])
+const DESTRUCTIVE = new Set(['discard', 'branchDelete', 'stashDrop', 'stash_drop', 'abort', 'worktreeRemove', 'cherry_pick', 'cherryPick', 'revert'])
 
 function result(action, steps, destructive, summary) {
   return { action, steps, mutating: true, destructive, needsConfirm: destructive, summary }
@@ -194,6 +221,7 @@ export const ACTIONS = Object.freeze([
   'worktreeAdd', 'worktreeRemove',
   'continue', 'abort',
   'resolveConflict',
+  'cherry_pick', 'revert', 'submodule_update',
 ])
 
 /** The verbs the panel offers for an unfinished operation. */

package/lib/scm.js

@@ -1,3 +1,36 @@
+export function parseSubmodules(stdout) {
+  if (!stdout || typeof stdout !== "string") return []
+  const lines = stdout.split("\n")
+  const submodules = []
+  for (const rawLine of lines) {
+    const line = rawLine.trimEnd()
+    if (!line) continue
+    const prefix = line[0]
+    let status = "in-sync"
+    if (prefix === "-") status = "uninitialized"
+    else if (prefix === "+") status = "modified"
+    else if (prefix === "U") status = "conflict"
+
+    const rest = (prefix === " " || prefix === "-" || prefix === "+" || prefix === "U") ? line.slice(1).trim() : line.trim()
+    const parts = rest.split(/\s+/)
+    const commit = parts[0] || ""
+    const path = parts[1] || ""
+    const describeMatch = rest.match(/\(([^)]+)\)/)
+    const describe = describeMatch ? describeMatch[1] : null
+
+    if (commit && path) {
+      submodules.push({
+        status,
+        commit,
+        shortCommit: commit.slice(0, 7),
+        path,
+        describe,
+      })
+    }
+  }
+  return submodules
+}
+
 // Reading a working copy, for the Source Control tab.
 //
 // The parsers are pure: they take the text git prints and return a structure. That keeps the
@@ -123,7 +156,7 @@ export function parseCount(text) {
  * ahead/behind, and that is reported as such rather than as an error.
  */
 export function scmPayload({
-  cwd, branch, upstream, ahead, behind, status, branches, tags, stashes, worktrees, merge, error,
+  cwd, branch, upstream, ahead, behind, status, branches, tags, stashes, worktrees, submodules, merge, error,
 } = {}) {
   return {
     cwd: cwd || '',
@@ -137,6 +170,7 @@ export function scmPayload({
     tags: Array.isArray(tags) ? tags : [],
     stashes: Array.isArray(stashes) ? stashes : [],
     worktrees: Array.isArray(worktrees) ? worktrees : [],
+    submodules: Array.isArray(submodules) ? submodules : [],
     mergeState: merge || { inProgress: false, kind: '' },
     error: error ? String(error).slice(0, 300) : '',
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-github-ops",
-  "version": "0.6.6",
+  "version": "0.6.7",
   "description": "GitHub operations for DeepSeek Harness: releases, tags, a guarded generic API pass-through, workflow runs, secrets and sanitized mirror publication.",
   "license": "MIT",
   "type": "module",