gsd-pi 2.35.0-dev.30eec3f → 2.35.0-dev.640d5c7

package/src/resources/extensions/gsd/tests/worktree-sync-milestones.test.ts

@@ -19,7 +19,6 @@ import { join } from 'node:path';
 import { tmpdir } from 'node:os';
 
 import { syncProjectRootToWorktree } from '../auto-worktree-sync.ts';
-import { syncGsdStateToWorktree } from '../auto-worktree.ts';
 import { createTestContext } from './test-helpers.ts';
 
 const { assertTrue, report } = createTestContext();
@@ -149,37 +148,6 @@ async function main(): Promise<void> {
     assertTrue(true, 'no crash on missing directories');
   }
 
-  // ─── 7. milestones/ directory created in worktree when missing ────────
-  console.log('\n=== 7. milestones/ directory created in worktree when missing ===');
-  {
-    const mainBase = createBase('main');
-    const wtBase = mkdtempSync(join(tmpdir(), 'gsd-wt-sync-wt-'));
-
-    try {
-      // Worktree has .gsd/ but NO milestones/ subdirectory
-      mkdirSync(join(wtBase, '.gsd'), { recursive: true });
-
-      // Main repo has M001
-      const m001Dir = join(mainBase, '.gsd', 'milestones', 'M001');
-      mkdirSync(m001Dir, { recursive: true });
-      writeFileSync(join(m001Dir, 'M001-CONTEXT.md'), '# M001 Context');
-      writeFileSync(join(m001Dir, 'M001-ROADMAP.md'), '# M001 Roadmap');
-
-      assertTrue(!existsSync(join(wtBase, '.gsd', 'milestones')), 'milestones/ missing before sync');
-
-      const result = syncGsdStateToWorktree(mainBase, wtBase);
-
-      assertTrue(existsSync(join(wtBase, '.gsd', 'milestones')), 'milestones/ created in worktree');
-      assertTrue(existsSync(join(wtBase, '.gsd', 'milestones', 'M001')), 'M001 synced to worktree');
-      assertTrue(existsSync(join(wtBase, '.gsd', 'milestones', 'M001', 'M001-CONTEXT.md')), 'M001 CONTEXT synced');
-      assertTrue(existsSync(join(wtBase, '.gsd', 'milestones', 'M001', 'M001-ROADMAP.md')), 'M001 ROADMAP synced');
-      assertTrue(result.synced.length > 0, 'sync reported files');
-    } finally {
-      cleanup(mainBase);
-      rmSync(wtBase, { recursive: true, force: true });
-    }
-  }
-
   report();
 }
 

package/src/resources/extensions/gsd/worktree-resolver.ts

@@ -13,8 +13,6 @@
  * `process.chdir()` internally — this class MUST NOT double-chdir.
  */
 
-import { existsSync, unlinkSync } from "node:fs";
-import { join } from "node:path";
 import type { AutoSession } from "./auto/session.js";
 import { debugLog } from "./debug-logger.js";
 
@@ -374,15 +372,6 @@ export class WorktreeResolver {
       });
       ctx.notify(`Milestone merge failed: ${msg}`, "warning");
 
-      // Clean up stale merge state left by failed squash-merge (#1389)
-      try {
-        const gitDir = join(originalBase || this.s.basePath, ".git");
-        for (const f of ["SQUASH_MSG", "MERGE_HEAD", "MERGE_MSG"]) {
-          const p = join(gitDir, f);
-          if (existsSync(p)) unlinkSync(p);
-        }
-      } catch { /* best-effort */ }
-
       // Error recovery: always restore to project root
       if (originalBase) {
         try {

package/src/resources/extensions/remote-questions/remote-command.ts

@@ -4,12 +4,12 @@
 
 import type { ExtensionAPI, ExtensionCommandContext } from "@gsd/pi-coding-agent";
 import { AuthStorage } from "@gsd/pi-coding-agent";
-import { Editor, type EditorTheme, Key, matchesKey, truncateToWidth } from "@gsd/pi-tui";
+import { CURSOR_MARKER, Editor, type EditorTheme, Key, matchesKey, truncateToWidth } from "@gsd/pi-tui";
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { getGlobalGSDPreferencesPath, loadEffectiveGSDPreferences } from "../gsd/preferences.js";
 import { getRemoteConfigStatus, isValidChannelId, resolveRemoteConfig } from "./config.js";
-import { maskEditorLine, sanitizeError } from "../shared/mod.js";
+import { sanitizeError } from "../shared/sanitize.js";
 import { getLatestPromptSummary } from "./status.js";
 
 export async function handleRemote(
@@ -353,6 +353,27 @@ function removeRemoteQuestionsConfig(): void {
   writeFileSync(prefsPath, next, "utf-8");
 }
 
+function maskEditorLine(line: string): string {
+  let output = "";
+  let i = 0;
+  while (i < line.length) {
+    if (line.startsWith(CURSOR_MARKER, i)) {
+      output += CURSOR_MARKER;
+      i += CURSOR_MARKER.length;
+      continue;
+    }
+    const ansiMatch = /^\x1b\[[0-9;]*m/.exec(line.slice(i));
+    if (ansiMatch) {
+      output += ansiMatch[0];
+      i += ansiMatch[0].length;
+      continue;
+    }
+    output += line[i] === " " ? " " : "*";
+    i += 1;
+  }
+  return output;
+}
+
 async function promptMaskedInput(ctx: ExtensionCommandContext, label: string, hint: string): Promise<string | null> {
   if (!ctx.hasUI) return null;
   return ctx.ui.custom<string | null>((tui: any, theme: any, _kb: any, done: (r: string | null) => void) => {

package/src/resources/extensions/shared/mod.ts

@@ -28,6 +28,6 @@ export { showInterviewRound } from "./interview-ui.js";
 export type { Question, QuestionOption, RoundResult } from "./interview-ui.js";
 export { showNextAction } from "./next-action-ui.js";
 export { showConfirm } from "./confirm-ui.js";
-export { sanitizeError, maskEditorLine } from "./sanitize.js";
+export { sanitizeError } from "./sanitize.js";
 export { formatDateShort, truncateWithEllipsis } from "./format-utils.js";
 export { splitFrontmatter, parseFrontmatterMap } from "./frontmatter.js";

package/src/resources/extensions/shared/sanitize.ts

@@ -1,10 +1,7 @@
 /**
  * Sanitize error messages by redacting token-like strings before surfacing.
- * Also provides maskEditorLine for masking sensitive TUI editor input.
  */
 
-import { CURSOR_MARKER } from "@gsd/pi-tui";
-
 const TOKEN_PATTERNS = [
   /xoxb-[A-Za-z0-9\-]+/g,    // Slack bot tokens
   /xoxp-[A-Za-z0-9\-]+/g,    // Slack user tokens
@@ -20,36 +17,3 @@ export function sanitizeError(msg: string): string {
   }
   return sanitized;
 }
-
-/**
- * Replace editor visible text with masked characters while preserving
- * ANSI cursor/sequencer codes. Keeps border/metadata lines readable.
- */
-export function maskEditorLine(line: string): string {
-  if (line.startsWith("─")) {
-    return line;
-  }
-
-  let output = "";
-  let i = 0;
-  while (i < line.length) {
-    if (line.startsWith(CURSOR_MARKER, i)) {
-      output += CURSOR_MARKER;
-      i += CURSOR_MARKER.length;
-      continue;
-    }
-
-    const ansiMatch = /^\x1b\[[0-9;]*m/.exec(line.slice(i));
-    if (ansiMatch) {
-      output += ansiMatch[0];
-      i += ansiMatch[0].length;
-      continue;
-    }
-
-    const ch = line[i] as string;
-    output += ch === " " ? " " : "*";
-    i += 1;
-  }
-
-  return output;
-}