@aipper/aiws 0.0.28 → 0.0.29

package/src/commands/change-status-command.js

@@ -1,10 +1,7 @@
-import path from "node:path";
-
 /**
  * @param {{
  *   gitRoot: string,
  *   branch: string,
- *   changeWorktreeHint: string,
  *   status: any
  * }} input
  * @param {{
@@ -14,21 +11,14 @@ import path from "node:path";
  * }} deps
  */
 export async function renderChangeStatusOutput(input, deps) {
-  const { gitRoot, branch, changeWorktreeHint, status } = input;
+  const { gitRoot, branch, status } = input;
   /** @type {string[]} */
   const lines = [];
 
   lines.push(`✓ aiws change status: ${status.changeId}`);
   lines.push(`dir: ${status.dir}`);
   lines.push(`phase: ${status.phase}`);
-  lines.push(`worktree: ${gitRoot}`);
   lines.push(`branch: ${branch || "(detached HEAD)"}`);
-  if (changeWorktreeHint) lines.push(`note: change/<id> checked out in another worktree: ${changeWorktreeHint}`);
-  if (status.context?.worktree && path.resolve(status.context.worktree) !== path.resolve(gitRoot)) {
-    lines.push(`status_context: ${status.context.worktree}`);
-    lines.push(`status_branch: ${status.context.branch || "(detached HEAD)"}`);
-  }
-  if (status.context?.warning) lines.push(`warning: ${status.context.warning}`);
   lines.push(`meta: ${status.metaState}`);
   if (status.reqId) lines.push(`Req_ID: ${status.reqId}`);
   if (status.probId) lines.push(`Problem_ID: ${status.probId}`);
@@ -41,7 +31,9 @@ export async function renderChangeStatusOutput(input, deps) {
   if (status.reviewGates?.summary) {
     const summary = status.reviewGates.summary;
     const missing = summary.finishGateMissingIds.length > 0 ? summary.finishGateMissingIds.join(", ") : "(none)";
-    lines.push(`review_gates: dual_ready=${summary.dualReviewReady} finish_ready=${summary.finishGateReady} missing=${missing}`);
+    lines.push(
+      `review_gates: generic_only=${summary.genericReviewOnly} dual_pending=${summary.dualReviewPending} dual_ready=${summary.dualReviewReady} finish_ready=${summary.finishGateReady} missing=${missing}`,
+    );
     for (const gate of status.reviewGates.gates || []) {
       lines.push(`review_gate:${gate.id} ready=${gate.ready} status=${gate.status}${gate.foundPath ? ` path=${gate.foundPath}` : ""}`);
     }
@@ -100,7 +92,6 @@ export async function renderChangeStatusOutput(input, deps) {
   lines.push(`- ${deps.planVerifyHint(status.changeId)}`);
   if (status.blockersStrict.length > 0) {
     lines.push("- 先修复 Blockers (strict) 后复跑质量门，再进入编码：simple/local 单点修复优先 `$ws-dev-lite`；否则 `$ws-dev`");
-    if (changeWorktreeHint) lines.push(`- 若需要写代码：先切到 change worktree 再改动：\`cd ${changeWorktreeHint}\``);
     return lines.join("\n") + "\n";
   }
 

package/src/commands/change-status-context.js

@@ -5,51 +5,23 @@ import path from "node:path";
  * @param {string} changeId
  * @param {{
  *   currentBranch: (gitRoot: string) => Promise<string>,
- *   listGitWorktrees: (gitRoot: string) => Promise<Array<{ worktree: string, branch: string }>>,
- *   pathExists: (path: string) => Promise<boolean>,
- *   isGitRepository: (path: string) => Promise<boolean>,
  *   inferChangeIdFromBranch: (branch: string) => string
  * }} deps
  */
 export async function resolveChangeStatusContext(gitRoot, changeId, deps) {
   const rootBranch = await deps.currentBranch(gitRoot);
-  /** @type {Array<{ worktree: string, branch: string }>} */
-  let worktrees = [];
-  try {
-    worktrees = await deps.listGitWorktrees(gitRoot);
-  } catch {
-    worktrees = [];
-  }
-
-  const changeRef = `refs/heads/change/${changeId}`;
-  const changeWorktree = worktrees.find((worktree) => String(worktree.branch || "") === changeRef)?.worktree || "";
-  const rootWorktree = path.resolve(gitRoot);
-  let contextWorktree = rootWorktree;
-  let source = "current_worktree";
-  let warning = "";
-  if (changeWorktree && path.resolve(changeWorktree) !== rootWorktree) {
-    const candidate = path.resolve(changeWorktree);
-    const candidateExists = await deps.pathExists(candidate);
-    const candidateReady = candidateExists ? await deps.isGitRepository(candidate) : false;
-    if (candidateReady) {
-      contextWorktree = candidate;
-      source = "change_worktree";
-    } else {
-      warning = `stale change worktree metadata: ${candidate} (run \`git worktree prune\`)`;
-    }
-  }
-  const contextBranch = await deps.currentBranch(contextWorktree);
+  const contextBranch = rootBranch;
   const inferred = deps.inferChangeIdFromBranch(contextBranch);
 
   return {
-    worktree: contextWorktree,
+    worktree: path.resolve(gitRoot),
     branch: contextBranch,
     branchMatchesChange: inferred === changeId,
-    source,
-    warning,
-    currentWorktree: rootWorktree,
+    source: "current_worktree",
+    warning: "",
+    currentWorktree: path.resolve(gitRoot),
     currentBranch: rootBranch,
-    changeWorktree: changeWorktree ? path.resolve(changeWorktree) : "",
+    changeWorktree: "",
   };
 }
 
@@ -72,7 +44,6 @@ export async function readChangeMetrics(changeDir, deps) {
 const FINISH_DONE_COMPLETED_CLEANUPS = new Set([
   "removed",
   "pruned-missing",
-  "skipped:no_separate_change_worktree",
   "skipped:current_worktree",
 ]);