@icode-js/icode 3.0.3 → 3.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@icode-js/icode",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "description": "Modern git workflow CLI with robust parent-repo and hook handling",
   "type": "module",
   "author": "C",

package/src/core/git-service.js

@@ -162,20 +162,52 @@ export class GitService {
   }
 
   async statusPorcelain() {
+    // 返回标准 porcelain 状态，供上层统一判断“是否存在未提交改动”。
     const result = await this.exec(['status', '--porcelain'])
     return result.stdout
   }
 
   async hasChanges() {
+    // 只要 porcelain 有输出，就说明暂存区、工作区或未跟踪文件存在改动。
     const output = await this.statusPorcelain()
     return cleanOutput(output).length > 0
   }
 
-  async diffWorkingTree() {
-    const result = await this.exec(['diff'])
+  // 列出未被忽略的未跟踪文件，供 AI 工作流补全新文件 diff。
+  async listUntrackedFiles() {
+    const result = await this.exec(['ls-files', '--others', '--exclude-standard'])
+    return result.stdout
+      .split('\n')
+      .map((item) => item.trim())
+      .filter(Boolean)
+  }
+
+  // 通过 no-index diff 生成“/dev/null -> 新文件”的补丁，覆盖未跟踪文件内容。
+  async buildUntrackedFileDiff(filePath) {
+    const result = await this.exec(['diff', '--no-index', '--binary', '--', '/dev/null', filePath], {
+      allowFailure: true
+    })
     return result.stdout
   }
 
+  async diffWorkingTree() {
+    // git diff 默认不包含 untracked 文件，这里显式补齐，避免新仓库被误判成“无改动”。
+    const trackedResult = await this.exec(['diff'])
+    const untrackedFiles = await this.listUntrackedFiles()
+    const untrackedDiffs = []
+
+    for (const filePath of untrackedFiles) {
+      const diff = await this.buildUntrackedFileDiff(filePath)
+      if (cleanOutput(diff)) {
+        untrackedDiffs.push(diff.trimEnd())
+      }
+    }
+
+    return [trackedResult.stdout.trimEnd(), ...untrackedDiffs]
+      .filter(Boolean)
+      .join('\n\n')
+  }
+
   async diffStaged() {
     const result = await this.exec(['diff', '--staged'])
     return result.stdout

package/src/workflows/ai-commit-workflow.js

@@ -33,6 +33,15 @@ function buildCommitMessage(parsed) {
   return `${header}\n\n${body}`
 }
 
+// 将多个 diff 片段稳定拼接，避免空块污染 prompt。
+function joinDiffSections(sections) {
+  return sections
+    .map((item) => (item || '').trim())
+    .filter(Boolean)
+    .join('\n\n')
+}
+
+// 基于“全部未提交改动”生成 AI commit，确保未暂存新文件也能被识别并提交。
 export async function runAiCommitWorkflow(options) {
   const context = await resolveGitContext({
     cwd: options.cwd,
@@ -44,13 +53,19 @@ export async function runAiCommitWorkflow(options) {
     logger.info(`仓库根目录: ${context.topLevelPath}`)
   }
 
-  let diff = await git.diffStaged()
-  let diffSource = 'staged'
-
-  if (!diff.trim()) {
-    diff = await git.diffWorkingTree()
-    diffSource = 'working-tree'
-  }
+  const stagedDiff = await git.diffStaged()
+  const workingDiff = await git.diffWorkingTree()
+  const hasStagedDiff = Boolean(stagedDiff.trim())
+  const hasWorkingDiff = Boolean(workingDiff.trim())
+  const diff = joinDiffSections([
+    hasStagedDiff ? `--- STAGED DIFF ---\n${stagedDiff}` : '',
+    hasWorkingDiff ? `--- WORKING TREE DIFF ---\n${workingDiff}` : ''
+  ])
+  const diffSource = hasStagedDiff && hasWorkingDiff
+    ? 'staged+working-tree'
+    : hasStagedDiff
+      ? 'staged'
+      : 'working-tree'
 
   if (!diff.trim()) {
     throw new IcodeError('没有可用于生成提交信息的代码改动。', {
@@ -105,8 +120,8 @@ export async function runAiCommitWorkflow(options) {
     }
   }
 
-  if (diffSource === 'working-tree') {
-    // 从 working-tree 生成信息时，提交前统一暂存，避免 commit 为空。
+  if (hasWorkingDiff) {
+    // 统一暂存工作区改动，确保未暂存修改和新文件与 AI 看到的 diff 保持一致。
     await git.stageAll()
   }