@icode-js/icode 3.2.0 → 3.4.0

package/src/core/git/service.js

@@ -96,10 +96,31 @@ function parseGitLogRecords(output) {
     .filter((item) => item.hash && item.subject)
 }
 
+// 把秒数格式化成“3 分钟前”这类相对时间。
+function formatRelativeSeconds(seconds) {
+  const value = Math.max(0, seconds)
+  if (value < 60) {
+    return `${value} 秒前`
+  }
+  if (value < 3600) {
+    return `${Math.floor(value / 60)} 分钟前`
+  }
+  if (value < 86400) {
+    return `${Math.floor(value / 3600)} 小时前`
+  }
+  return `${Math.floor(value / 86400)} 天前`
+}
+
 export class GitService {
   constructor(context) {
     this.context = context
     this.cwd = context.topLevelPath
+    this.remote = context.remote || 'origin'
+  }
+
+  // 远程跟踪分支引用，例如 origin/main。
+  remoteRef(branchName) {
+    return `${this.remote}/${branchName}`
   }
 
   async exec(args, options = {}) {
@@ -117,8 +138,18 @@ export class GitService {
     return cleanOutput(result.stdout)
   }
 
-  async fetch() {
-    await this.exec(['fetch', '--all', '--prune'])
+  // 默认只 fetch 当前使用的 remote，remote 很多的仓库也不会变慢。
+  async fetch(options = {}) {
+    if (options.all) {
+      await this.exec(['fetch', '--all', '--prune'])
+      return
+    }
+    // 仓库没有配置这个 remote（例如纯本地仓库）时跳过，和 fetch --all 的行为保持一致。
+    if (Array.isArray(this.context.remotes) && !this.context.remotes.includes(this.remote)) {
+      logger.debug(`remote ${this.remote} 不存在，跳过 fetch`)
+      return
+    }
+    await this.exec(['fetch', this.remote, '--prune'])
   }
 
   operationFileExists(fileName) {
@@ -162,13 +193,13 @@ export class GitService {
   }
 
   async branchExistsRemote(branchName) {
-    const result = await this.exec(['ls-remote', '--exit-code', '--heads', 'origin', branchName], {
+    const result = await this.exec(['ls-remote', '--exit-code', '--heads', this.remote, branchName], {
       allowFailure: true
     })
     return result.exitCode === 0
   }
 
-  async getRemoteUrl(remoteName = 'origin') {
+  async getRemoteUrl(remoteName = this.remote) {
     const result = await this.exec(['remote', 'get-url', remoteName], {
       allowFailure: true
     })
@@ -183,7 +214,7 @@ export class GitService {
       .filter(Boolean)
   }
 
-  async listRemoteBranches(remoteName = 'origin') {
+  async listRemoteBranches(remoteName = this.remote) {
     const result = await this.exec(['for-each-ref', '--format=%(refname:strip=3)', `refs/remotes/${remoteName}`], {
       allowFailure: true
     })
@@ -199,10 +230,11 @@ export class GitService {
   }
 
   async listMergedLocalBranches(targetRef) {
-    const result = await this.exec(['branch', '--merged', targetRef])
+    // for-each-ref 输出稳定，不会带上 `*` / `+`（worktree）等标记。
+    const result = await this.exec(['for-each-ref', '--format=%(refname:short)', `--merged=${targetRef}`, 'refs/heads'])
     return result.stdout
       .split('\n')
-      .map((item) => item.replace('*', '').trim())
+      .map((item) => item.trim())
       .filter(Boolean)
   }
 
@@ -211,7 +243,7 @@ export class GitService {
   }
 
   async checkoutTracking(branchName) {
-    await this.exec(['checkout', '-b', branchName, '--track', `origin/${branchName}`])
+    await this.exec(['checkout', '-b', branchName, '--track', this.remoteRef(branchName)])
   }
 
   async checkoutNewBranch(branchName, fromBranch) {
@@ -219,11 +251,11 @@ export class GitService {
   }
 
   async createTrackingFromRemote(branchName) {
-    await this.exec(['branch', '--track', branchName, `origin/${branchName}`])
+    await this.exec(['branch', '--track', branchName, this.remoteRef(branchName)])
   }
 
   async pull(branchName, options = {}) {
-    const args = ['pull', 'origin', branchName]
+    const args = ['pull', this.remote, branchName]
 
     if (options.rebase) {
       args.push('--rebase')
@@ -255,7 +287,7 @@ export class GitService {
 
   // 继续已解决冲突的 merge 操作，供 undo recover 统一恢复合并现场。
   async mergeContinue() {
-    await this.exec(['merge', '--continue'])
+    await this.exec(['merge', '--continue'], { env: { ...process.env, GIT_EDITOR: 'true' } })
   }
 
   // 中止未完成的 merge 操作，保留给显式 recover abort 使用，不自动清理用户现场。
@@ -347,8 +379,12 @@ export class GitService {
   }
 
   // 列出未被忽略的未跟踪文件，供 AI 工作流补全新文件 diff。
-  async listUntrackedFiles() {
-    const result = await this.exec(['ls-files', '--others', '--exclude-standard'])
+  async listUntrackedFiles(paths = []) {
+    const args = ['ls-files', '--others', '--exclude-standard']
+    if (paths.length) {
+      args.push('--', ...paths)
+    }
+    const result = await this.exec(args)
     return result.stdout
       .split('\n')
       .map((item) => item.trim())
@@ -363,10 +399,10 @@ export class GitService {
     return result.stdout
   }
 
-  async diffWorkingTree() {
+  async diffWorkingTree(paths = []) {
     // git diff 默认不包含 untracked 文件，这里显式补齐，避免新仓库被误判成“无改动”。
-    const trackedResult = await this.exec(['diff'])
-    const untrackedFiles = await this.listUntrackedFiles()
+    const trackedResult = await this.exec(paths.length ? ['diff', '--', ...paths] : ['diff'])
+    const untrackedFiles = await this.listUntrackedFiles(paths)
     const untrackedDiffs = []
 
     for (const filePath of untrackedFiles) {
@@ -381,8 +417,8 @@ export class GitService {
       .join('\n\n')
   }
 
-  async diffStaged() {
-    const result = await this.exec(['diff', '--staged'])
+  async diffStaged(paths = []) {
+    const result = await this.exec(paths.length ? ['diff', '--staged', '--', ...paths] : ['diff', '--staged'])
     return result.stdout
   }
 
@@ -465,9 +501,16 @@ export class GitService {
     }
 
     const args = ['commit', '-m', message]
+    if (options.amend) {
+      args.push('--amend')
+    }
     if (options.noVerify) {
       args.push('--no-verify')
     }
+    if (Array.isArray(options.paths) && options.paths.length) {
+      // 只提交指定路径，其它已暂存改动保持原样。
+      args.push('--', ...options.paths)
+    }
 
     try {
       await this.exec(args)
@@ -484,6 +527,26 @@ export class GitService {
     }
   }
 
+  // 生成 fixup! 提交，供 rebase --autosquash 自动合并到目标提交。
+  async commitFixup(targetSha, options = {}) {
+    const args = ['commit', `--fixup=${targetSha}`]
+    if (options.noVerify) {
+      args.push('--no-verify')
+    }
+    try {
+      await this.exec(args)
+    } catch (error) {
+      if (detectHookFailure(error)) {
+        throw new IcodeError(buildHookHint('git commit --fixup'), {
+          code: 'HOOK_COMMIT_BLOCKED',
+          cause: error,
+          meta: error.meta
+        })
+      }
+      throw error
+    }
+  }
+
   async push(branchName, options = {}) {
     const args = ['push']
 
@@ -491,7 +554,14 @@ export class GitService {
       args.push('--no-verify')
     }
 
-    args.push('origin', branchName)
+    if (options.forceWithLease) {
+      // 只允许 --force-with-lease：远程被别人更新过时会拒绝覆盖。
+      args.push(options.expectedRemoteSha
+        ? `--force-with-lease=${branchName}:${options.expectedRemoteSha}`
+        : '--force-with-lease')
+    }
+
+    args.push(this.remote, branchName)
 
     if (options.setUpstream) {
       args.push('--set-upstream')
@@ -519,7 +589,7 @@ export class GitService {
       args.push('--no-verify')
     }
 
-    args.push('origin', `${sourceBranch}:${targetBranch}`)
+    args.push(this.remote, `${sourceBranch}:${targetBranch}`)
 
     try {
       await this.exec(args)
@@ -556,7 +626,7 @@ export class GitService {
     if (options.noVerify) {
       args.push('--no-verify')
     }
-    args.push('origin', tagName)
+    args.push(this.remote, tagName)
 
     try {
       await this.exec(args)
@@ -589,7 +659,7 @@ export class GitService {
   }
 
   async revertContinue() {
-    await this.exec(['revert', '--continue'])
+    await this.exec(['revert', '--continue'], { env: { ...process.env, GIT_EDITOR: 'true' } })
   }
 
   async revertAbort() {
@@ -632,7 +702,7 @@ export class GitService {
   }
 
   async cherryPickContinue() {
-    await this.exec(['cherry-pick', '--continue'])
+    await this.exec(['cherry-pick', '--continue'], { env: { ...process.env, GIT_EDITOR: 'true' } })
   }
 
   async abortCherryPick() {
@@ -645,6 +715,366 @@ export class GitService {
   }
 
   async deleteRemoteBranch(branchName) {
-    await this.exec(['push', 'origin', '--delete', branchName])
+    await this.exec(['push', this.remote, '--delete', branchName])
+  }
+
+  // ---------- 通用读取 ----------
+
+  async revParse(ref = 'HEAD') {
+    const result = await this.exec(['rev-parse', '--verify', '--quiet', `${ref}^{commit}`], { allowFailure: true })
+    return cleanOutput(result.stdout)
+  }
+
+  async refExists(ref) {
+    return Boolean(await this.revParse(ref))
+  }
+
+  async isAncestor(ancestorRef, descendantRef) {
+    const result = await this.exec(['merge-base', '--is-ancestor', ancestorRef, descendantRef], { allowFailure: true })
+    return result.exitCode === 0
+  }
+
+  async mergeBase(refA, refB) {
+    const result = await this.exec(['merge-base', refA, refB], { allowFailure: true })
+    return cleanOutput(result.stdout)
+  }
+
+  async countCommits(rangeSpec) {
+    const result = await this.exec(['rev-list', '--count', rangeSpec], { allowFailure: true })
+    const value = Number(cleanOutput(result.stdout))
+    return Number.isFinite(value) ? value : 0
+  }
+
+  /**
+   * 列出将被提交的文件（不含删除），用于提交前的敏感文件/大文件扫描。
+   * mode=all：全部改动（含未跟踪文件，逐个展开目录）；mode=staged：仅暂存区；
+   * 传 paths 时只看这些路径。输出为相对仓库根目录的文件路径数组。
+   */
+  async listPendingFiles(options = {}) {
+    const mode = options.mode || 'all'
+    const paths = Array.isArray(options.paths) ? options.paths.filter(Boolean) : []
+
+    if (mode === 'staged') {
+      const result = await this.exec(['diff', '--cached', '--name-only', '-z', '--diff-filter=ACMR'])
+      return result.stdout.split('\0').map((item) => item.trim()).filter(Boolean)
+    }
+
+    const args = ['status', '--porcelain=v1', '-z', '-uall']
+    if (paths.length) {
+      args.push('--', ...paths)
+    }
+    const result = await this.exec(args)
+    const tokens = result.stdout.split('\0')
+    const files = []
+    for (let index = 0; index < tokens.length; index += 1) {
+      const token = tokens[index]
+      if (!token || token.length < 4) {
+        continue
+      }
+      const indexStatus = token[0]
+      const worktreeStatus = token[1]
+      const filePath = token.slice(3)
+      if (indexStatus === 'R' || indexStatus === 'C') {
+        // -z 模式下 rename 的源路径紧跟在下一个 token。
+        index += 1
+      }
+      if (indexStatus === 'D' || worktreeStatus === 'D') {
+        continue
+      }
+      files.push(filePath)
+    }
+    return [...new Set(files)]
+  }
+
+  async stagePaths(paths = []) {
+    if (!paths.length) {
+      return
+    }
+    await this.exec(['add', '-A', '--', ...paths])
+  }
+
+  async hasStagedChanges() {
+    const result = await this.exec(['diff', '--cached', '--quiet'], { allowFailure: true })
+    return result.exitCode === 1
+  }
+
+  // 读取当前分支 upstream 的远程 sha，没有 upstream 时返回空串。
+  async getRemoteBranchSha(branchName) {
+    return this.revParse(this.remoteRef(branchName))
+  }
+
+  // ---------- 引用 / 备份 ----------
+
+  async updateRef(refName, sha, message = '') {
+    const args = ['update-ref']
+    if (message) {
+      args.push('-m', message)
+    }
+    args.push(refName, sha)
+    await this.exec(args)
+  }
+
+  async deleteRef(refName) {
+    await this.exec(['update-ref', '-d', refName], { allowFailure: true })
+  }
+
+  async listRefs(prefix, format = '%(refname)%09%(objectname)') {
+    const result = await this.exec(['for-each-ref', `--format=${format}`, prefix], { allowFailure: true })
+    return result.stdout.split('\n').map((item) => item.trimEnd()).filter(Boolean)
+  }
+
+  // 生成不修改工作区的 stash 提交（git stash create），没有改动时返回空串。
+  async stashCreate(message = '') {
+    const args = ['stash', 'create']
+    if (message) {
+      args.push(message)
+    }
+    const result = await this.exec(args, { allowFailure: true })
+    return cleanOutput(result.stdout)
+  }
+
+  // ---------- stash ----------
+
+  async stashList() {
+    const result = await this.exec(['stash', 'list', '--format=%gd%x1f%H%x1f%cr%x1f%gs'], { allowFailure: true })
+    return result.stdout
+      .split('\n')
+      .map((line) => line.trim())
+      .filter(Boolean)
+      .map((line) => {
+        const [ref = '', hash = '', relativeDate = '', subject = ''] = line.split('\x1f')
+        return { ref, hash, relativeDate, subject }
+      })
+  }
+
+  async stashPush(options = {}) {
+    const args = ['stash', 'push']
+    if (options.includeUntracked !== false) {
+      args.push('--include-untracked')
+    }
+    if (options.staged) {
+      args.push('--staged')
+    }
+    if (options.message) {
+      args.push('-m', options.message)
+    }
+    if (Array.isArray(options.paths) && options.paths.length) {
+      args.push('--', ...options.paths)
+    }
+    await this.exec(args)
+  }
+
+  async stashApply(ref = 'stash@{0}', options = {}) {
+    const args = ['stash', options.pop ? 'pop' : 'apply']
+    if (options.index) {
+      args.push('--index')
+    }
+    args.push(ref)
+    await this.exec(args)
+  }
+
+  async stashDrop(ref = 'stash@{0}') {
+    await this.exec(['stash', 'drop', ref])
+  }
+
+  async stashShow(ref = 'stash@{0}') {
+    const result = await this.exec(['stash', 'show', '--stat', '--include-untracked', ref], { allowFailure: true })
+    if (result.exitCode === 0) {
+      return result.stdout
+    }
+    const fallback = await this.exec(['stash', 'show', '--stat', ref], { allowFailure: true })
+    return fallback.stdout
+  }
+
+  // ---------- 分支 ----------
+
+  /**
+   * 列出本地分支详情：最近提交时间、upstream、ahead/behind、是否 gone。
+   * 输出按最近提交时间倒序排列。
+   */
+  async listBranchDetails() {
+    const format = [
+      '%(refname:short)',
+      '%(committerdate:unix)',
+      '%(committerdate:relative)',
+      '%(upstream:short)',
+      '%(upstream:track)',
+      '%(objectname:short)',
+      '%(contents:subject)'
+    ].join('%1f')
+    const result = await this.exec(['for-each-ref', '--sort=-committerdate', `--format=${format}`, 'refs/heads'], {
+      allowFailure: true
+    })
+    return result.stdout
+      .split('\n')
+      .map((line) => line.trim())
+      .filter(Boolean)
+      .map((line) => {
+        const [name = '', unix = '0', relativeDate = '', upstream = '', track = '', sha = '', subject = ''] = line.split('\x1f')
+        const aheadMatch = track.match(/ahead (\d+)/)
+        const behindMatch = track.match(/behind (\d+)/)
+        return {
+          name,
+          timestamp: Number(unix) || 0,
+          relativeDate,
+          upstream,
+          gone: track.includes('gone'),
+          ahead: aheadMatch ? Number(aheadMatch[1]) : 0,
+          behind: behindMatch ? Number(behindMatch[1]) : 0,
+          sha,
+          subject
+        }
+      })
+  }
+
+  async switchBranch(branchName, options = {}) {
+    const args = ['switch']
+    if (options.create) {
+      args.push('-c', branchName)
+      if (options.startPoint) {
+        args.push(options.startPoint)
+      }
+      if (options.track) {
+        args.push('--track')
+      }
+    } else {
+      args.push(branchName)
+    }
+    await this.exec(args)
   }
+
+  async createBranch(branchName, startPoint) {
+    await this.exec(['branch', branchName, startPoint])
+  }
+
+  // ---------- 历史 ----------
+
+  /**
+   * 结构化读取提交历史。
+   * 输入为 range/limit/author/file 等过滤条件，输出 hash/作者/时间/标题/引用列表。
+   */
+  async logEntries(options = {}) {
+    const args = ['log', `--format=%H%x1f%h%x1f%an%x1f%ae%x1f%aI%x1f%ar%x1f%D%x1f%s%x1e`]
+    if (options.limit) {
+      args.push(`-${options.limit}`)
+    }
+    if (options.author) {
+      args.push(`--author=${options.author}`)
+    }
+    if (options.since) {
+      args.push(`--since=${options.since}`)
+    }
+    if (options.grep) {
+      args.push(`--grep=${options.grep}`, '-i')
+    }
+    if (options.noMerges) {
+      args.push('--no-merges')
+    }
+    if (options.firstParent) {
+      args.push('--first-parent')
+    }
+    if (options.range) {
+      args.push(options.range)
+    }
+    if (options.file) {
+      args.push('--follow', '--', options.file)
+    }
+    const result = await this.exec(args, { allowFailure: true })
+    return result.stdout
+      .split('\x1e')
+      .map((record) => record.trim())
+      .filter(Boolean)
+      .map((record) => {
+        const [hash = '', shortHash = '', author = '', email = '', date = '', relativeDate = '', refs = '', subject = ''] = record.split('\x1f')
+        return {
+          hash,
+          shortHash,
+          author,
+          email,
+          date,
+          relativeDate,
+          refs: refs ? refs.split(',').map((item) => item.trim()).filter(Boolean) : [],
+          subject
+        }
+      })
+  }
+
+  async getConfigValue(key) {
+    const result = await this.exec(['config', '--get', key], { allowFailure: true })
+    return cleanOutput(result.stdout)
+  }
+
+  async reflogEntries(ref = 'HEAD', limit = 30) {
+    // --date=unix 让 %gd 输出操作时间戳（HEAD@{1730000000}），选择器按顺序还原成 HEAD@{n}。
+    const result = await this.exec(['reflog', 'show', `-${limit}`, '--date=unix', '--format=%H%x1f%h%x1f%gd%x1f%gs', ref], {
+      allowFailure: true
+    })
+    const now = Math.floor(Date.now() / 1000)
+    return result.stdout
+      .split('\n')
+      .map((line) => line.trim())
+      .filter(Boolean)
+      .map((line, index) => {
+        const [hash = '', shortHash = '', rawSelector = '', subject = ''] = line.split('\x1f')
+        const timestamp = Number((rawSelector.match(/\{(\d+)\}/) || [])[1]) || 0
+        return {
+          hash,
+          shortHash,
+          selector: `${ref}@{${index}}`,
+          timestamp,
+          relativeDate: timestamp ? formatRelativeSeconds(now - timestamp) : '',
+          subject
+        }
+      })
+  }
+
+  // ---------- rebase ----------
+
+  /**
+   * 执行非交互 rebase。
+   * autosquash=true 时通过 GIT_SEQUENCE_EDITOR=: 自动接受 fixup 排序，不会打开编辑器。
+   */
+  async rebaseOnto(baseRef, options = {}) {
+    const args = ['rebase']
+    if (options.autosquash) {
+      args.push('-i', '--autosquash')
+    }
+    if (options.autostash) {
+      args.push('--autostash')
+    }
+    if (options.root) {
+      args.push('--root')
+    } else {
+      args.push(baseRef)
+    }
+    const env = options.autosquash ? { ...process.env, GIT_SEQUENCE_EDITOR: ':' } : process.env
+    await this.exec(args, { env })
+  }
+
+  async rebaseContinue() {
+    // 继续 rebase 时不弹编辑器，沿用原提交信息。
+    await this.exec(['rebase', '--continue'], { env: { ...process.env, GIT_EDITOR: 'true' } })
+  }
+
+  // ---------- tag ----------
+
+  async listTagsSorted(pattern = '*') {
+    const result = await this.exec(['tag', '--list', pattern, '--sort=-v:refname'], { allowFailure: true })
+    return result.stdout.split('\n').map((item) => item.trim()).filter(Boolean)
+  }
+
+  async describeLatestTag(ref = 'HEAD') {
+    const result = await this.exec(['describe', '--tags', '--abbrev=0', ref], { allowFailure: true })
+    return result.exitCode === 0 ? cleanOutput(result.stdout) : ''
+  }
+
+  async tagExists(tagName) {
+    const result = await this.exec(['show-ref', '--verify', '--quiet', `refs/tags/${tagName}`], { allowFailure: true })
+    return result.exitCode === 0
+  }
+
+  async deleteTag(tagName) {
+    await this.exec(['tag', '-d', tagName], { allowFailure: true })
+  }
+
 }

package/src/core/platform/http.js

@@ -0,0 +1,53 @@
+import { IcodeError } from '../errors.js'
+import { normalizeRemoteMergeReason, parseRemoteMergePayload } from '../remote-merge/shared.js'
+
+/**
+ * 发起一次 JSON 请求并归一化结果。
+ * 输入为 URL、fetch 选项和失败时的文案前缀，输出 { ok, status, payload, rawText, reason }。
+ * 网络错误直接抛 IcodeError；HTTP 错误不抛错，交给调用方按状态码判断。
+ */
+export async function requestJson(url, options = {}, errorLabel = '平台 API 请求失败') {
+  let response
+  try {
+    response = await fetch(url, options)
+  } catch (error) {
+    throw new IcodeError(`${errorLabel}: ${error?.message || '未知网络错误'}`, {
+      code: 'PLATFORM_FETCH_ERROR',
+      exitCode: 2,
+      cause: error
+    })
+  }
+
+  const rawText = await response.text()
+  const payload = parseRemoteMergePayload(rawText)
+
+  return {
+    ok: response.ok,
+    status: response.status,
+    payload,
+    rawText,
+    reason: response.ok
+      ? ''
+      : normalizeRemoteMergeReason(payload, `HTTP ${response.status}${rawText ? `: ${rawText.trim().slice(0, 500)}` : ''}`)
+  }
+}
+
+/**
+ * 请求失败时抛出统一错误。
+ * 输入为 requestJson 结果和文案前缀，输出为空。
+ */
+export function assertResponseOk(result, label, code = 'PLATFORM_API_ERROR') {
+  if (result.ok) {
+    return
+  }
+
+  const hint = result.status === 401 || result.status === 403
+    ? '\n请检查平台 token 是否有效、是否有仓库权限：icode config platform token set <provider> <token>'
+    : ''
+
+  throw new IcodeError(`${label}(HTTP ${result.status}): ${result.reason}${hint}`, {
+    code,
+    exitCode: 2,
+    meta: { status: result.status, reason: result.reason }
+  })
+}