@fugood/bricks-project 2.24.0-beta.10 → 2.24.0-beta.12

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@fugood/bricks-project",
-  "version": "2.24.0-beta.10",
+  "version": "2.24.0-beta.12",
   "main": "index.ts",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "build": "bun scripts/build.js"
   },
   "dependencies": {
-    "@fugood/bricks-cli": "^2.24.0-beta.10",
+    "@fugood/bricks-cli": "^2.24.0-beta.12",
     "@huggingface/gguf": "^0.3.2",
     "@iarna/toml": "^3.0.0",
     "@modelcontextprotocol/sdk": "^1.15.0",
@@ -21,5 +21,5 @@
     "lodash": "^4.17.4",
     "uuid": "^8.3.1"
   },
-  "gitHead": "e7e78be88106a537bdfce71415b3fa8cad45aac3"
+  "gitHead": "7c1dbd88ecddb12dba27ddb78147d208488f9c81"
 }

package/tools/pull.ts

@@ -2,6 +2,8 @@ import { $ } from 'bun'
 import { format } from 'prettier'
 
 const cwd = process.cwd()
+const args = process.argv.slice(2)
+const force = args.includes('--force') || args.includes('-f')
 
 // Check git status
 const { exitCode } = await $`cd ${cwd} && git status`.nothrow()
@@ -9,8 +11,15 @@ const isGitRepo = exitCode === 0
 
 if (isGitRepo) {
   const unstagedChanges = await $`cd ${cwd} && git diff --name-only --diff-filter=ACMR`.text()
-  if (unstagedChanges)
-    throw new Error('Unstaged changes found, please commit or stash your changes before pulling')
+  if (unstagedChanges) {
+    if (force) {
+      console.log('Force mode: committing unstaged changes before pull...')
+      await $`cd ${cwd} && git add .`
+      await $`cd ${cwd} && git commit -m ${'chore(force-pull): saved unstaged changes before pull'}`
+    } else {
+      throw new Error('Unstaged changes found, please commit or stash your changes before pulling')
+    }
+  }
 } else {
   const confirmContinue = prompt(
     'No git repository found, so it will not be safe to pull, continue? (y/n)',
@@ -25,6 +34,7 @@ const isModule = app.type === 'module'
 const command = isModule ? 'module' : 'app'
 
 // Fetch project files using CLI
+console.log(`Pulling ${command} project (${app.id})...`)
 const result = await $`bricks ${command} project-pull ${app.id} --json`.quiet().nothrow()
 
 if (result.exitCode !== 0) {
@@ -40,7 +50,8 @@ if (result.exitCode !== 0) {
 const { files, lastCommitId } = JSON.parse(result.stdout.toString())
 
 let useMain = false
-if (isGitRepo) {
+if (isGitRepo && !force) {
+  console.log(`Checking commit ${lastCommitId}...`)
   const found = (await $`cd ${cwd} && git rev-list -1 ${lastCommitId}`.nothrow().text())
     .trim()
     .match(/^[\da-f]{40}$/)
@@ -86,13 +97,17 @@ await Promise.all(
 
 if (isGitRepo) {
   await $`cd ${cwd} && git add .`
-  const commitMsg = isModule
-    ? 'chore(project): apply file changes from BRICKS module'
-    : 'chore(project): apply file changes from BRICKS application'
+  const commitMsg = force
+    ? `chore(force-pull): apply force pull-${command}`
+    : isModule
+      ? 'chore(project): apply file changes from BRICKS module'
+      : 'chore(project): apply file changes from BRICKS application'
   await $`cd ${cwd} && git commit -m ${commitMsg}`
-  if (!useMain) {
+  if (!force && !useMain) {
     await $`cd ${cwd} && git merge main`
   }
 }
 
-console.log(`${isModule ? 'Module' : 'App'} project pulled: ${files.length} files`)
+console.log(
+  `${isModule ? 'Module' : 'App'} project pulled: ${files.length} files${force ? ' (force)' : ''}`,
+)