@staff0rd/assist 0.146.0 → 0.147.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.146.0",
+  version: "0.147.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -2608,7 +2608,7 @@ async function list2(options2) {
 
 // src/commands/backlog/next.ts
 import chalk36 from "chalk";
-import enquirer6 from "enquirer";
+import enquirer7 from "enquirer";
 
 // src/commands/backlog/run.ts
 import chalk35 from "chalk";
@@ -2717,7 +2717,21 @@ import chalk34 from "chalk";
 import { spawnSync as spawnSync2 } from "child_process";
 import { existsSync as existsSync16, unlinkSync as unlinkSync3 } from "fs";
 import chalk33 from "chalk";
+import enquirer6 from "enquirer";
+
+// src/commands/backlog/handleIncompletePhase.ts
 import enquirer5 from "enquirer";
+async function handleIncompletePhase() {
+  const { action } = await enquirer5.prompt({
+    type: "select",
+    name: "action",
+    message: "Phase was not marked complete. What would you like to do?",
+    choices: ["Retry this phase", "Skip to next phase", "Abort"]
+  });
+  if (action === "Retry this phase") return "retry";
+  if (action === "Skip to next phase") return "skip";
+  return "abort";
+}
 
 // src/commands/backlog/phaseDone.ts
 import { writeFileSync as writeFileSync13 } from "fs";
@@ -2780,7 +2794,7 @@ Phase ${phaseIndex + 1} completed. Running verify...`)
     return true;
   }
   while (true) {
-    const { action } = await enquirer5.prompt({
+    const { action } = await enquirer6.prompt({
       type: "select",
       name: "action",
       message: "Verification failed. What would you like to do?",
@@ -2800,25 +2814,18 @@ Phase ${phaseIndex + 1} completed. Running verify...`)
     return action === "Continue to next phase";
   }
 }
-async function handleIncompletePhase() {
-  const { action } = await enquirer5.prompt({
-    type: "select",
-    name: "action",
-    message: "Phase was not marked complete. What would you like to do?",
-    choices: ["Retry this phase", "Skip to next phase", "Abort"]
-  });
-  if (action === "Retry this phase") return "retry";
-  if (action === "Skip to next phase") return "skip";
-  return "abort";
-}
-async function resolvePhaseResult(phaseIndex) {
-  if (existsSync16(getPhaseStatusPath())) {
-    const shouldContinue = await handleCompletedPhase(phaseIndex);
-    return shouldContinue ? 1 : -1;
+async function resolvePhaseResult(phaseIndex, options2) {
+  if (!existsSync16(getPhaseStatusPath())) {
+    const action = await handleIncompletePhase();
+    if (action === "abort") return -1;
+    return action === "skip" ? 1 : 0;
+  }
+  if (options2?.skipVerify) {
+    cleanupMarker();
+    return 1;
   }
-  const action = await handleIncompletePhase();
-  if (action === "abort") return -1;
-  return action === "skip" ? 1 : 0;
+  const shouldContinue = await handleCompletedPhase(phaseIndex);
+  return shouldContinue ? 1 : -1;
 }
 
 // src/commands/backlog/watchForMarker.ts
@@ -2837,7 +2844,7 @@ function stopWatching() {
 }
 
 // src/commands/backlog/executePhase.ts
-async function executePhase(item, phaseIndex, phases) {
+async function executePhase(item, phaseIndex, phases, options2) {
   const phase = phases[phaseIndex];
   console.log(
     chalk34.bold(
@@ -2852,7 +2859,9 @@ async function executePhase(item, phaseIndex, phases) {
   watchForMarker(child);
   await done2;
   stopWatching();
-  const delta = await resolvePhaseResult(phaseIndex);
+  const delta = await resolvePhaseResult(phaseIndex, {
+    skipVerify: options2?.skipVerify
+  });
   return delta < 0 ? -1 : phaseIndex + delta;
 }
 
@@ -2902,7 +2911,9 @@ async function run2(id) {
   const reviewPhase = buildReviewPhase();
   const allPhases = [...plan2, reviewPhase];
   const reviewIndex = plan2.length;
-  const reviewResult = await executePhase(item, reviewIndex, allPhases);
+  const reviewResult = await executePhase(item, reviewIndex, allPhases, {
+    skipVerify: true
+  });
   if (reviewResult < 0) return;
   if (item.status !== "done") setStatus(id, "done");
   console.log(chalk35.green(`
@@ -2932,7 +2943,7 @@ async function next() {
     name: `${typeLabel(i.type)} #${i.id}: ${i.name}`,
     value: String(i.id)
   }));
-  const { selected } = await enquirer6.prompt({
+  const { selected } = await enquirer7.prompt({
     type: "select",
     name: "selected",
     message: "Choose a backlog item to start:",
@@ -5744,10 +5755,10 @@ function registerJira(program2) {
 
 // src/commands/news/add/index.ts
 import chalk68 from "chalk";
-import enquirer7 from "enquirer";
+import enquirer8 from "enquirer";
 async function add2(url) {
   if (!url) {
-    const response = await enquirer7.prompt({
+    const response = await enquirer8.prompt({
       type: "input",
       name: "url",
       message: "RSS feed URL:",
@@ -6383,7 +6394,7 @@ async function listComments() {
 import { execSync as execSync30 } from "child_process";
 
 // src/commands/prs/prs/displayPaginated/index.ts
-import enquirer8 from "enquirer";
+import enquirer9 from "enquirer";
 
 // src/commands/prs/prs/displayPaginated/printPr.ts
 import chalk71 from "chalk";
@@ -6453,7 +6464,7 @@ function parseAction(action) {
 }
 async function promptNavigation(currentPage, totalPages) {
   const choices = buildNavChoices(currentPage, totalPages);
-  const { action } = await enquirer8.prompt({
+  const { action } = await enquirer9.prompt({
     type: "select",
     name: "action",
     message: "Navigate",
@@ -7279,6 +7290,18 @@ async function applyExtraction(functionName, sourceFile, destPath, plan2, projec
   }
   updateImporters(functionName, sourceFile, plan2.importersToUpdate);
   if (plan2.barrel) {
+    for (const decl of plan2.barrel.getExportDeclarations()) {
+      const named = decl.getNamedExports();
+      const match = named.find((n) => n.getName() === functionName);
+      if (match) {
+        if (named.length === 1) {
+          decl.remove();
+        } else {
+          match.remove();
+        }
+        break;
+      }
+    }
     plan2.barrel.addExportDeclaration({
       moduleSpecifier: plan2.barrelRelPath,
       namedExports: [functionName]
@@ -7287,9 +7310,6 @@ async function applyExtraction(functionName, sourceFile, destPath, plan2, projec
   await project.save();
 }
 
-// src/commands/refactor/extract/buildPlan.ts
-import path29 from "path";
-
 // src/commands/refactor/extract/collectDependencies.ts
 import {
   SyntaxKind as SyntaxKind5
@@ -7617,6 +7637,26 @@ function findImporters(functionName, sourceFile, destPath, project) {
   return result;
 }
 
+// src/commands/refactor/extract/resolveBarrel.ts
+import path29 from "path";
+function resolveBarrel(functionName, sourcePath, destPath, project) {
+  const indexPath = path29.join(path29.dirname(destPath), "index.ts");
+  const barrel = project.getSourceFile(indexPath);
+  if (!barrel) return { barrel: void 0, barrelRelPath: "" };
+  const sourceRelFromBarrel = getRelativeImportPath(indexPath, sourcePath);
+  const alreadyExported = barrel.getExportDeclarations().some((decl) => {
+    const specifier = decl.getModuleSpecifierValue();
+    if (specifier !== sourceRelFromBarrel) return false;
+    const named = decl.getNamedExports();
+    return named.some((n) => n.getName() === functionName);
+  });
+  if (!alreadyExported) return { barrel: void 0, barrelRelPath: "" };
+  return {
+    barrel,
+    barrelRelPath: getRelativeImportPath(indexPath, destPath)
+  };
+}
+
 // src/commands/refactor/extract/sourceReferencesName.ts
 import { SyntaxKind as SyntaxKind10 } from "ts-morph";
 var DECLARATION_KINDS = /* @__PURE__ */ new Set([
@@ -7649,13 +7689,6 @@ function sourceReferencesName(sourceFile, functionName, extractedNames) {
 }
 
 // src/commands/refactor/extract/buildPlan.ts
-function resolveBarrel(destPath, project) {
-  const indexPath = path29.join(path29.dirname(destPath), "index.ts");
-  return {
-    barrel: project.getSourceFile(indexPath),
-    barrelRelPath: getRelativeImportPath(indexPath, destPath)
-  };
-}
 function buildPlan(functionName, sourceFile, sourcePath, destPath, project) {
   const analysis = analyseTarget(sourceFile, functionName);
   const sourceRelPath = getRelativeImportPath(destPath, sourcePath);
@@ -7676,7 +7709,7 @@ function buildPlan(functionName, sourceFile, sourcePath, destPath, project) {
       analysis.extractedNames
     ),
     importersToUpdate: analysis.target.isExported() ? findImporters(functionName, sourceFile, destPath, project) : [],
-    ...resolveBarrel(destPath, project)
+    ...resolveBarrel(functionName, sourcePath, destPath, project)
   };
 }
 
@@ -9711,7 +9744,7 @@ async function exchangeToken(params) {
 }
 
 // src/commands/roam/promptCredentials.ts
-import enquirer9 from "enquirer";
+import enquirer10 from "enquirer";
 function censor(value) {
   const visible = value.slice(-4);
   return `${"*".repeat(value.length - 4)}${visible}`;
@@ -9720,7 +9753,7 @@ function label(name, existing) {
   return existing ? `${name} (${censor(existing)})` : name;
 }
 async function promptField(name, existing) {
-  const { value } = await enquirer9.prompt({
+  const { value } = await enquirer10.prompt({
     type: "input",
     name: "value",
     message: `${label(name, existing)}:`,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.146.0",
+	"version": "0.147.1",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {