sillyspec 3.15.0 → 3.15.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sillyspec",
-  "version": "3.15.0",
+  "version": "3.15.2",
   "description": "SillySpec CLI — 流程状态机，让 AI 严格按步骤来",
   "icon": "logo.jpg",
   "homepage": "https://sillyspec.ppdmq.top/",

package/src/run.js

@@ -10,6 +10,7 @@ import { ProgressManager } from './progress.js'
 import { stageRegistry, auxiliaryStages } from './stages/index.js'
 import { buildExecuteSteps } from './stages/execute.js'
 import { buildPlanSteps } from './stages/plan.js'
+import { formatExecuteSummary } from './worktree-apply.js'
 
 /**
  * 同步触发辅助函数：_write 后 best-effort 同步到平台
@@ -745,7 +746,21 @@ async function completeStep(pm, progress, stageName, cwd, outputText, inputText
     console.log(`✅ ${stageName} 阶段已完成（${total}/${total} 步）`)
 
     if (stageName === 'execute') {
-      console.log('\n👉 下一步：sillyspec run verify（验证通过后才能归档）')
+      // execute run summary：展示真实可得的结构化信息
+      try {
+        const lastOutput = steps[steps.length - 1]?.output || ''
+        const summary = formatExecuteSummary({
+          changeName,
+          stepsCompleted: total,
+          stepsTotal: total,
+          agentSummary: lastOutput,
+          cwd,
+        })
+        console.log(`\n${summary}`)
+      } catch (e) {
+        // summary 失败不影响主流程
+        console.log('\n👉 下一步：sillyspec run verify（验证通过后才能归档）')
+      }
     } else if (stageName === 'verify') {
       console.log('\n👉 下一步：sillyspec run archive（验证通过，可以归档了）')
     } else if (stageName === 'archive') {

package/src/worktree-apply.js

@@ -92,9 +92,17 @@ export function applyWorktree(changeName, { cwd, checkOnly = false } = {}) {
   // 同时检测 untracked 新文件（git diff 不包含 untracked）
   let changedFiles;
   try {
-    // tracked 文件的变更（modified/deleted）
-    const trackedRaw = git(worktreePath, `diff --name-only ${diffBase}`);
-    const trackedFiles = trackedRaw ? trackedRaw.split('\n').filter(Boolean) : [];
+    // 用 --name-status 捕获 rename/delete（--name-only 会丢失 rename 源文件）
+    const statusRaw = git(worktreePath, `diff --name-status ${diffBase}`);
+    const statusFiles = new Set();
+    if (statusRaw) {
+      for (const line of statusRaw.split('\n').filter(Boolean)) {
+        const parts = line.split('\t');
+        // R100 old.txt new.txt → 提取两个文件
+        if (parts.length >= 2) statusFiles.add(parts[parts.length - 1]);
+        if (parts.length >= 3) statusFiles.add(parts[parts.length - 2]);
+      }
+    }
 
     // untracked 新文件（diffBase 中不存在的文件）
     const untrackedRaw = gitQuiet(worktreePath, `ls-files --others --exclude-standard`);
@@ -102,7 +110,7 @@ export function applyWorktree(changeName, { cwd, checkOnly = false } = {}) {
       ? untrackedRaw.split('\n').filter(Boolean).filter(f => !f.startsWith('.sillyspec/') && f !== 'meta.json')
       : [];
 
-    changedFiles = [...new Set([...trackedFiles, ...untrackedFiles])];
+    changedFiles = [...new Set([...statusFiles, ...untrackedFiles])];
   } catch (e) {
     result.errors.push(`获取变更文件列表失败: ${e.message}`);
     return result;
@@ -216,8 +224,11 @@ export function applyWorktree(changeName, { cwd, checkOnly = false } = {}) {
 
     // 分 tracked 变更和 untracked 新文件生成 patch
     const trackedFiles = patchFiles.filter(f => {
-      // untracked 文件在 baseHash 的 tree 中不存在
-      return gitQuiet(worktreePath, `cat-file -e ${diffBase}:${f}`) !== null;
+      // 文件在 diffBase 的 tree 中存在 → tracked（包括 rename 目标可能的情况）
+      if (gitQuiet(worktreePath, `cat-file -e ${diffBase}:${f}`) !== null) return true;
+      // 文件在工作区 index 中已存在（比如被 git mv 处理过）→ 也视为 tracked
+      if (gitQuiet(worktreePath, `ls-files --error-unmatch ${f}`) !== null) return true;
+      return false;
     });
     const untrackedPatchFiles = patchFiles.filter(f => !trackedFiles.includes(f));
 
@@ -290,3 +301,91 @@ export function applyWorktree(changeName, { cwd, checkOnly = false } = {}) {
 
   return result;
 }
+
+/**
+ * 格式化 execute run summary（人类可读）
+ *
+ * 只展示 CLI 真实掌握的信息，不声称知道 per-task 状态。
+ * @param {object} opts
+ * @param {string} opts.changeName - 变更名
+ * @param {number} opts.stepsCompleted - 已完成步骤数
+ * @param {number} opts.stepsTotal - 总步骤数
+ * @param {string} opts.agentSummary - Agent 最终输出摘要
+ * @param {string} [opts.cwd] - 项目根目录（默认 process.cwd()）
+ * @returns {string} 格式化的 summary 文本
+ */
+export function formatExecuteSummary({ changeName, stepsCompleted, stepsTotal, agentSummary, cwd }) {
+  const wm = new WorktreeManager({ cwd });
+  const meta = wm.getMeta(changeName);
+  const lines = [];
+
+  const SEPARATOR = '─'.repeat(32);
+
+  // --- Header ---
+  lines.push(`Execute Summary`);
+  lines.push(SEPARATOR);
+
+  // --- Status ---
+  if (!meta) {
+    // worktree 不存在（可能已 cleanup 或没有用过 worktree）
+    lines.push(`Status:     COMPLETED`);
+    lines.push(`Steps:      ${stepsCompleted} / ${stepsTotal}`);
+    lines.push(`Apply:      N/A`);
+  } else {
+    const hasBaseline = meta.baselineCommit != null;
+    const wtExists = existsSync(meta.worktreePath);
+
+    const applyStatus = wtExists ? 'pending' : 'applied';
+    const baselineCount = meta.baselineFiles?.length || 0;
+    const baselineStatus = hasBaseline
+      ? `dirty (${baselineCount} baseline file${baselineCount === 1 ? '' : 's'} protected)`
+      : 'clean';
+
+    lines.push(`Status:     COMPLETED`);
+    lines.push(`Steps:      ${stepsCompleted} / ${stepsTotal}`);
+    lines.push(`Baseline:   ${baselineStatus}`);
+    lines.push(`Apply:      ${applyStatus}`);
+  }
+
+  // --- Changed files ---
+  // 从主工作区 diff 获取（worktree 已 apply）或从 worktree diff 获取
+  if (meta && existsSync(meta.worktreePath)) {
+    // worktree 还在，用 baselineCommit 或 baseHash 做 diff
+    try {
+      const diffBase = meta.baselineCommit || meta.baseHash;
+      const { execSync: es } = require('child_process');
+      const filesRaw = es(`git -C ${meta.worktreePath} diff --name-only ${diffBase} 2>/dev/null`, { encoding: 'utf8' });
+      const files = filesRaw ? filesRaw.trim().split('\n').filter(Boolean) : [];
+      if (files.length > 0) {
+        lines.push(``);
+        const maxShow = 10;
+        const showFiles = files.slice(0, maxShow);
+        const remain = files.length - maxShow;
+        lines.push(`Changed Files (${files.length})`);
+        showFiles.forEach(f => lines.push(`  ${f}`));
+        if (remain > 0) {
+          lines.push(`  ... ${remain} more`);
+        }
+      }
+    } catch {}
+  }
+
+  // --- Agent Summary ---
+  if (agentSummary) {
+    lines.push(``);
+    lines.push(`Agent Summary`);
+    // 缩进每行，截断过长内容
+    const maxLen = 200;
+    const summary = agentSummary.length > maxLen
+      ? agentSummary.slice(0, maxLen) + '...'
+      : agentSummary;
+    summary.split('\n').forEach(l => lines.push(`  ${l}`));
+  }
+
+  // --- Next ---
+  lines.push(``);
+  lines.push(`Next`);
+  lines.push(`  → sillyspec run verify`);
+
+  return lines.join('\n');
+}

package/src/worktree.js

@@ -302,10 +302,11 @@ export class WorktreeManager {
       const staged = gitQuiet(mainCwd, 'diff --cached --name-only') || '';
       if (staged) {
         try {
-          const patchContent = execSync(`git diff --cached --binary`, { cwd: mainCwd, encoding: 'utf8', stdio: ['pipe','pipe','pipe'] });
-          if (patchContent) {
+          // 用 Buffer 模式读取，避免二进制 patch 被 UTF-8 解码损坏
+          const patchBuf = execSync(`git diff --cached --binary`, { cwd: mainCwd, stdio: ['pipe','pipe','pipe'] });
+          if (patchBuf && patchBuf.length > 0) {
             const patchFile = join(worktreePath, '.sillyspec-baseline-staged.patch');
-            writeFileSync(patchFile, patchContent);
+            writeFileSync(patchFile, patchBuf);
             git(worktreePath, `apply --binary ${patchFile}`);
             rmSync(patchFile, { force: true });
           }
@@ -319,10 +320,11 @@ export class WorktreeManager {
       const unstaged = gitQuiet(mainCwd, 'diff --name-only') || '';
       if (unstaged) {
         try {
-          const patchContent = execSync(`git diff --binary`, { cwd: mainCwd, encoding: 'utf8', stdio: ['pipe','pipe','pipe'] });
-          if (patchContent) {
+          // 用 Buffer 模式读取，避免二进制 patch 被 UTF-8 解码损坏
+          const patchBuf = execSync(`git diff --binary`, { cwd: mainCwd, stdio: ['pipe','pipe','pipe'] });
+          if (patchBuf && patchBuf.length > 0) {
             const patchFile = join(worktreePath, '.sillyspec-baseline-unstaged.patch');
-            writeFileSync(patchFile, patchContent);
+            writeFileSync(patchFile, patchBuf);
             git(worktreePath, `apply --binary ${patchFile}`);
             rmSync(patchFile, { force: true });
           }