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

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

@@ -31,7 +31,6 @@ import {
   readFlintToml,
   removeShardFromConfig,
   resolveShardMode,
-  stampSynced,
   toKebabCase,
   writeFlintJson,
   writeFlintToml
@@ -2450,12 +2449,12 @@ async function createRepository(flintPath, name, remote) {
   if (await pathExists2(repoPath)) {
     throw new Error(`Repository folder already exists: ${repoPath}`);
   }
+  if (remote) {
+    return cloneRepository(flintPath, name, remote);
+  }
   await mkdir42(repoPath, { recursive: true });
   try {
     await execAsync2("git init", { cwd: repoPath });
-    if (remote) {
-      await execAsync2(`git remote add origin "${remote}"`, { cwd: repoPath });
-    }
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     await rm6(repoPath, { recursive: true, force: true });
@@ -2489,6 +2488,12 @@ async function removeRepositoryFolder(flintPath, name) {
 async function updateRepository(flintPath, name, url) {
   const repoPath = getRepositoryPath(flintPath, name);
   if (await pathExists2(repoPath)) {
+    try {
+      await execAsync2("git rev-parse HEAD", { cwd: repoPath });
+    } catch {
+      await rm6(repoPath, { recursive: true, force: true });
+      return cloneRepository(flintPath, name, url);
+    }
     await execAsync2("git pull", { cwd: repoPath });
     return repoPath;
   }
@@ -4661,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) {
@@ -4713,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;
@@ -5152,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));
@@ -6018,6 +6096,10 @@ export {
   pushTags,
   pushWithTags,
   getCurrentBranch,
+  isRebaseInProgress,
+  getRebaseBranch,
+  getConflictFiles,
+  hasConflictMarkers,
   hasUncommittedChanges,
   hasUnpushedCommits,
   getRemoteUrl,

package/dist/{dist-ONKP44ML.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-S2CPVR65.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-S2CPVR65.js";
+} from "./chunk-TTXIQOT3.js";
 import "./chunk-V7YA5RXL.js";
 import {
   findFlintByName,
@@ -3219,7 +3223,7 @@ Failed to fetch published shards: ${msg}`));
     return cmd;
   })()
 ).addCommand(
-  new Command5("release").description("Tag and publish a version from a dev shard").argument("<name>", "Shard name").argument("<version>", "Version to release (e.g. 0.3.0)").option("-p, --path <dir>", "Path to flint").action(async (name, version, options) => {
+  new Command5("release").description("Tag and publish a version from a dev shard (version derived from shard.yaml)").argument("<name>", "Shard name").argument("[version]", "Version to release (default: read from shard.yaml)").option("-p, --path <dir>", "Path to flint").action(async (name, version, options) => {
     try {
       const flintPath = await resolveFlint(options.path);
       const installed = await getInstalledShardsWithVersions(flintPath);
@@ -3251,12 +3255,13 @@ Shard not found: "${name}"`));
 Could not read version from shard.yaml`));
         process.exit(1);
       }
-      if (manifest.version !== version) {
+      if (version && manifest.version !== version) {
         console.error(pc8.red(`
 Version mismatch: shard.yaml says "${manifest.version}" but you requested "${version}"`));
         console.log(pc8.dim(`  Update shard.yaml version first, then run release again.`));
         process.exit(1);
       }
+      version = manifest.version;
       const dirty = await hasUncommittedChanges(shardPath);
       if (dirty) {
         console.error(pc8.red(`
@@ -3730,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);
@@ -3770,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"]);
@@ -3782,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) {
@@ -3793,15 +3862,15 @@ 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);
-  const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/\.\d{3}Z$/, "");
+  const now = /* @__PURE__ */ new Date();
+  const timestamp = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}-${String(now.getDate()).padStart(2, "0")} ${String(now.getHours()).padStart(2, "0")}:${String(now.getMinutes()).padStart(2, "0")}`;
   let msg = "";
   if (identity?.person) {
-    msg += `${identity.person}: `;
+    const displayName = identity.person.replace(/^@/, "");
+    msg += `${displayName}: `;
   }
   msg += `sync ${timestamp}`;
   if (customMessage) {
@@ -7667,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-ONKP44ML.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.0",
+  "version": "0.4.0-alpha.2",
   "type": "module",
   "description": "Flint cognitive workspace CLI",
   "license": "PROPRIETARY",
@@ -26,12 +26,12 @@
     "tsup": "^8.3.5",
     "tsx": "^4.19.2",
     "typescript": "^5.9.2",
+    "@nuucognition/eslint-config": "0.0.0",
     "@nuucognition/flint": "0.1.0",
     "@nuucognition/flint-migrations": "0.1.0",
     "@nuucognition/flint-server": "0.0.1",
-    "@nuucognition/typescript-config": "0.0.0",
     "@nuucognition/flint-runtime": "0.0.1",
-    "@nuucognition/eslint-config": "0.0.0"
+    "@nuucognition/typescript-config": "0.0.0"
   },
   "scripts": {
     "predev": "pnpm --dir ../../packages/flint build && pnpm --dir ../../packages/flint-migrations build && pnpm --dir ../../packages/flint-runtime build && pnpm --dir ../../packages/flint-server build",