@nuucognition/flint-cli 0.4.0-alpha.1 → 0.4.0-alpha.2

package/dist/{chunk-JYXX4EHB.js → chunk-TTXIQOT3.js}

@@ -31,7 +31,6 @@ import {
   readFlintToml,
   removeShardFromConfig,
   resolveShardMode,
-  stampSynced,
   toKebabCase,
   writeFlintJson,
   writeFlintToml
@@ -4667,13 +4666,14 @@ async function getGitStatus(flintPath) {
     };
   }
 }
-async function runGit(flintPath, args) {
+async function runGit(flintPath, args, options) {
   try {
     const quotedArgs = args.map(
       (arg) => arg.includes(" ") ? `"${arg}"` : arg
     );
     const { stdout, stderr } = await execAsync4(`git ${quotedArgs.join(" ")}`, {
-      cwd: flintPath
+      cwd: flintPath,
+      env: options?.env ? { ...process.env, ...options.env } : void 0
     });
     return { success: true, output: stdout || stderr };
   } catch (err) {
@@ -4719,6 +4719,82 @@ async function getCurrentBranch(cwd) {
   const result = await runGit(cwd, ["branch", "--show-current"]);
   return result.success ? result.output.trim() || null : null;
 }
+async function isRebaseInProgress(cwd) {
+  const result = await runGit(cwd, ["rev-parse", "--git-path", "rebase-merge"]);
+  if (result.success) {
+    const { access: access5 } = await import("fs/promises");
+    const path = await import("path");
+    const rebasePath = path.resolve(cwd, result.output.trim());
+    try {
+      await access5(rebasePath);
+      return true;
+    } catch {
+    }
+  }
+  const result2 = await runGit(cwd, ["rev-parse", "--git-path", "rebase-apply"]);
+  if (result2.success) {
+    const { access: access5 } = await import("fs/promises");
+    const path = await import("path");
+    const rebasePath = path.resolve(cwd, result2.output.trim());
+    try {
+      await access5(rebasePath);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  return false;
+}
+async function getRebaseBranch(cwd) {
+  const result = await runGit(cwd, ["rev-parse", "--git-path", "rebase-merge/head-name"]);
+  if (result.success) {
+    const { readFile: readFile9 } = await import("fs/promises");
+    const path = await import("path");
+    const headNamePath = path.resolve(cwd, result.output.trim());
+    try {
+      const ref = (await readFile9(headNamePath, "utf-8")).trim();
+      return ref.replace(/^refs\/heads\//, "");
+    } catch {
+    }
+  }
+  return null;
+}
+async function getConflictFiles(cwd) {
+  const result = await runGit(cwd, ["diff", "--name-only", "--diff-filter=U"]);
+  if (result.success && result.output.trim()) {
+    return result.output.trim().split("\n").filter(Boolean);
+  }
+  return [];
+}
+async function hasConflictMarkers(cwd, files) {
+  const { readFile: readFile9 } = await import("fs/promises");
+  const path = await import("path");
+  let filesToCheck = files;
+  if (!filesToCheck || filesToCheck.length === 0) {
+    const result = await runGit(cwd, ["diff", "--name-only", "HEAD"]);
+    if (result.success && result.output.trim()) {
+      filesToCheck = result.output.trim().split("\n").filter(Boolean);
+    } else {
+      const staged = await runGit(cwd, ["diff", "--name-only", "--cached"]);
+      if (staged.success && staged.output.trim()) {
+        filesToCheck = staged.output.trim().split("\n").filter(Boolean);
+      } else {
+        return [];
+      }
+    }
+  }
+  const conflicted = [];
+  for (const file of filesToCheck) {
+    try {
+      const content = await readFile9(path.resolve(cwd, file), "utf-8");
+      if (content.includes("<<<<<<<") && content.includes("=======") && content.includes(">>>>>>>")) {
+        conflicted.push(file);
+      }
+    } catch {
+    }
+  }
+  return conflicted;
+}
 async function hasUncommittedChanges(cwd) {
   const result = await runGit(cwd, ["status", "--porcelain"]);
   return result.success && result.output.trim().length > 0;
@@ -5158,10 +5234,6 @@ async function syncFlint(flintPath, progress) {
       error: `Failed to update .gitignore: ${err instanceof Error ? err.message : String(err)}`
     });
   }
-  try {
-    await stampSynced(currentFlintPath);
-  } catch {
-  }
   return result;
 }
 var __dirname = dirname5(fileURLToPath(import.meta.url));
@@ -6024,6 +6096,10 @@ export {
   pushTags,
   pushWithTags,
   getCurrentBranch,
+  isRebaseInProgress,
+  getRebaseBranch,
+  getConflictFiles,
+  hasConflictMarkers,
   hasUncommittedChanges,
   hasUnpushedCommits,
   getRemoteUrl,

package/dist/{dist-DN2YMDQ2.js → dist-JRUBIV33.js}

@@ -42,6 +42,7 @@ import {
   getCodebaseMetadataDir,
   getCodebaseMetadataPath,
   getConfigValue,
+  getConflictFiles,
   getCurrentBranch,
   getFlintConfigDir,
   getFlintDeclarations,
@@ -57,6 +58,7 @@ import {
   getOpenApps,
   getPersonFilePath,
   getPreset,
+  getRebaseBranch,
   getReferencesMetadataDir,
   getRemoteUrl,
   getRepositoryPath,
@@ -75,6 +77,7 @@ import {
   getUnfulfilledFlints,
   getWorkspaceRepositoriesDir,
   groupIntoTurns,
+  hasConflictMarkers,
   hasPreset,
   hasShardScripts,
   hasUncommittedChanges,
@@ -88,6 +91,7 @@ import {
   isInsideFlint,
   isInsideMesh,
   isOwnerRepo,
+  isRebaseInProgress,
   isShardInstalled,
   isValidFlint,
   isValidStatus,
@@ -147,7 +151,7 @@ import {
   writeIdentityState,
   writeReferencesState,
   writeSession
-} from "./chunk-JYXX4EHB.js";
+} from "./chunk-TTXIQOT3.js";
 import {
   runConcurrent
 } from "./chunk-V7YA5RXL.js";
@@ -311,6 +315,7 @@ export {
   getCodebaseMetadataDir,
   getCodebaseMetadataPath,
   getConfigValue,
+  getConflictFiles,
   getCurrentBranch,
   getExportDeclarations,
   getFlintConfigDir,
@@ -340,6 +345,7 @@ export {
   getOpenApps,
   getPersonFilePath,
   getPreset,
+  getRebaseBranch,
   getRemoteUrl,
   getRepositoryPath,
   getRepositoryStatus,
@@ -369,6 +375,7 @@ export {
   getWorkspaceRepositoriesDir,
   getWorkspaceRepository,
   groupIntoTurns,
+  hasConflictMarkers,
   hasFlintJson,
   hasFlintToml,
   hasMigration,
@@ -389,6 +396,7 @@ export {
   isLocalShard,
   isOwnerRepo,
   isPathRegistered,
+  isRebaseInProgress,
   isShardInstalled,
   isValidFlint,
   isValidStatus,

package/dist/index.js

@@ -20,11 +20,13 @@ import {
   freezeShard,
   fulfillCodebase,
   getCodebaseDeclarations,
+  getConflictFiles,
   getCurrentBranch,
   getGitStatus,
   getIdentity,
   getInstalledShardsWithVersions,
   getPreset,
+  getRebaseBranch,
   getRemoteUrl,
   getRepositoryStatus,
   getSessionPath,
@@ -33,6 +35,7 @@ import {
   getStatus,
   getTypePrefix,
   getUnfulfilledCodebases,
+  hasConflictMarkers,
   hasUncommittedChanges,
   hasUnpushedCommits,
   healAllShards,
@@ -42,6 +45,7 @@ import {
   isGitHubSourceSpecifier,
   isGitInitialized,
   isOwnerRepo,
+  isRebaseInProgress,
   isValidStatus,
   listPresets,
   listRemoteVersionTags,
@@ -77,7 +81,7 @@ import {
   updateSession,
   updateShards,
   updateSourceRepository
-} from "./chunk-JYXX4EHB.js";
+} from "./chunk-TTXIQOT3.js";
 import "./chunk-V7YA5RXL.js";
 import {
   findFlintByName,
@@ -3731,6 +3735,11 @@ async function handleSync(flintPath, customMessage) {
     console.error(pc10.red("Git not initialized. Run `flint git init` first."));
     process.exit(1);
   }
+  const rebasing = await isRebaseInProgress(flintPath);
+  if (rebasing) {
+    await handleRebaseContinue(flintPath);
+    return;
+  }
   try {
     console.log(pc10.dim("Running flint sync..."));
     await syncFlint(flintPath);
@@ -3771,7 +3780,15 @@ async function handleSync(flintPath, customMessage) {
   const pull = await runGit(flintPath, ["pull", "--rebase", "origin", branch]);
   if (!pull.success) {
     if (pull.error?.includes("CONFLICT") || pull.error?.includes("conflict")) {
-      console.error(pc10.red("Merge conflict detected. Resolve conflicts manually, then run `flint git sync` again."));
+      const conflicts = await getConflictFiles(flintPath);
+      console.error(pc10.red("\nMerge conflict detected. Resolve these files:"));
+      console.log();
+      for (const file of conflicts) {
+        console.log(pc10.yellow(`  ${file}`));
+      }
+      console.log();
+      console.log(pc10.dim("Edit the files above to remove conflict markers (<<<<<<< / ======= / >>>>>>>)"));
+      console.log(pc10.dim("Then run `flint git sync` again to continue."));
       process.exit(1);
     }
     const pullRetry = await runGit(flintPath, ["pull", "--rebase"]);
@@ -3783,6 +3800,57 @@ async function handleSync(flintPath, customMessage) {
     }
   }
   console.log(pc10.green("\u2713 Pulled"));
+  await pushToRemote(flintPath, branch);
+  console.log();
+  console.log(pc10.bold("Sync complete."));
+}
+async function handleRebaseContinue(flintPath) {
+  console.log(pc10.dim("Rebase in progress \u2014 continuing..."));
+  const markerFiles = await hasConflictMarkers(flintPath);
+  if (markerFiles.length > 0) {
+    console.error(pc10.red("\nFiles still contain conflict markers:"));
+    console.log();
+    for (const file of markerFiles) {
+      console.log(pc10.yellow(`  ${file}`));
+    }
+    console.log();
+    console.log(pc10.dim("Remove all <<<<<<< / ======= / >>>>>>> markers, then run `flint git sync` again."));
+    process.exit(1);
+  }
+  const branch = await getRebaseBranch(flintPath);
+  if (!branch) {
+    console.error(pc10.red("Could not determine branch from rebase state."));
+    console.log(pc10.dim("You can manually run: git rebase --abort"));
+    process.exit(1);
+  }
+  const add = await runGit(flintPath, ["add", "-A"]);
+  if (!add.success) {
+    console.error(pc10.red(`Failed to stage changes: ${add.error}`));
+    process.exit(1);
+  }
+  const cont = await runGit(flintPath, ["rebase", "--continue"], { env: { GIT_EDITOR: "true" } });
+  if (!cont.success) {
+    if (cont.error?.includes("CONFLICT") || cont.error?.includes("conflict")) {
+      const conflicts = await getConflictFiles(flintPath);
+      console.error(pc10.red("\nAnother conflict during rebase. Resolve these files:"));
+      console.log();
+      for (const file of conflicts) {
+        console.log(pc10.yellow(`  ${file}`));
+      }
+      console.log();
+      console.log(pc10.dim("Then run `flint git sync` again."));
+      process.exit(1);
+    }
+    console.error(pc10.red(`Rebase continue failed: ${cont.error}`));
+    console.log(pc10.dim("You can manually run: git rebase --abort"));
+    process.exit(1);
+  }
+  console.log(pc10.green("\u2713 Rebase completed"));
+  await pushToRemote(flintPath, branch);
+  console.log();
+  console.log(pc10.bold("Sync complete."));
+}
+async function pushToRemote(flintPath, branch) {
   console.log(pc10.dim("Pushing to remote..."));
   const push = await runGit(flintPath, ["push", "origin", branch]);
   if (!push.success) {
@@ -3794,8 +3862,6 @@ async function handleSync(flintPath, customMessage) {
     }
   }
   console.log(pc10.green("\u2713 Pushed"));
-  console.log();
-  console.log(pc10.bold("Sync complete."));
 }
 async function buildSyncCommitMessage(flintPath, customMessage) {
   const identity = await getIdentity(flintPath);
@@ -7670,7 +7736,7 @@ var sendCommand = new Command29("send").description("Send files to another Flint
     console.log();
     let sourceFlintName = "Unknown";
     try {
-      const { readFlintToml: readFlintToml3 } = await import("./dist-DN2YMDQ2.js");
+      const { readFlintToml: readFlintToml3 } = await import("./dist-JRUBIV33.js");
       const toml = await readFlintToml3(flintPath);
       if (toml?.flint?.name) {
         sourceFlintName = toml.flint.name;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuucognition/flint-cli",
-  "version": "0.4.0-alpha.1",
+  "version": "0.4.0-alpha.2",
   "type": "module",
   "description": "Flint cognitive workspace CLI",
   "license": "PROPRIETARY",