@fugood/bricks-project 2.23.0-beta.51 → 2.23.0-beta.53

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@fugood/bricks-project",
-  "version": "2.23.0-beta.51",
+  "version": "2.23.0-beta.53",
   "main": "index.ts",
   "scripts": {
     "build": "bun scripts/build.js"
   },
   "dependencies": {
+    "@fugood/bricks-cli": "^2.23.0-beta.53",
     "@modelcontextprotocol/sdk": "^1.15.0",
     "@toon-format/toon": "^2.1.0",
     "@types/escodegen": "^0.0.10",
@@ -15,5 +16,5 @@
     "lodash": "^4.17.4",
     "uuid": "^8.3.1"
   },
-  "gitHead": "9af0ee1ec599fe0514448aec3a29b4905eea5c80"
+  "gitHead": "2bb1ff8e2a614e0e82f612a760129ab3233f9fa4"
 }

package/tools/deploy.ts

@@ -1,21 +1,21 @@
 import { $ } from 'bun'
 import { parseArgs } from 'util'
-import { deployApp, deployModule } from '../api'
 
 const cwd = process.cwd()
 
-// Parse command-line arguments
 const {
-  values: { changelogs: changelogsArg, 'changelogs-file': changelogsFile },
+  values: { changelogs: changelogsArg, 'changelogs-file': changelogsFile, yes },
 } = parseArgs({
   args: Bun.argv.slice(2),
   options: {
     changelogs: { type: 'string' },
     'changelogs-file': { type: 'string' },
+    yes: { type: 'boolean', short: 'y' },
   },
   allowPositionals: true,
 })
 
+// Check git status
 const { exitCode } = await $`cd ${cwd} && git status`.nothrow()
 const isGitRepo = exitCode === 0
 
@@ -26,20 +26,20 @@ if (isGitRepo) {
     throw new Error('Unstaged changes found, please commit or stash your changes before deploying')
 
   commitId = (await $`cd ${cwd} && git rev-parse HEAD`.text()).trim()
-} else {
+} else if (!yes) {
   const confirmContinue = prompt('No git repository found, continue? (y/n)')
   if (confirmContinue !== 'y') throw new Error('Deployment cancelled')
 }
 
+// Read application.json
 const app = await Bun.file(`${cwd}/application.json`).json()
-const stage = app.stage || 'production'
 const config = await Bun.file(`${cwd}/.bricks/build/application-config.json`).json()
 
 // Get version from project's package.json
 const pkgFile = Bun.file(`${cwd}/package.json`)
 const version = (await pkgFile.exists()) ? (await pkgFile.json()).version : undefined
 
-// Get changelog from flag, file, or prompt
+// Get changelog from flag or file
 let changelogs = ''
 if (changelogsArg) {
   changelogs = changelogsArg
@@ -49,18 +49,49 @@ if (changelogsArg) {
     throw new Error(`Changelogs file not found: ${changelogsFile}`)
   }
   changelogs = await file.text()
-} else {
+} else if (!yes) {
   changelogs = prompt('Enter changelogs (optional, press Enter to skip):') || ''
 }
 
-// ask for confirmation
-const confirm = prompt('Are you sure you want to deploy? (y/n)')
-if (confirm !== 'y') throw new Error('Deployment cancelled')
+// Ask for confirmation
+if (!yes) {
+  const confirm = prompt('Are you sure you want to deploy? (y/n)')
+  if (confirm !== 'y') throw new Error('Deployment cancelled')
+}
+
+const isModule = app.type === 'module'
+const command = isModule ? 'module' : 'app'
+
+// Add project-specific fields to config and write to temp file
+const releaseConfig = {
+  ...config,
+  title: version || config.title,
+  bricks_project_last_commit_id: commitId || undefined,
+}
+const configPath = `${cwd}/.bricks/build/release-config.json`
+await Bun.write(configPath, JSON.stringify(releaseConfig))
+
+const args = ['bricks', command, 'release', app.id, '-c', configPath, '--json']
+
+if (version) {
+  args.push('--version', version)
+}
+
+if (changelogs) {
+  args.push('--changelogs', changelogs)
+}
 
-if (!app.type || app.type === 'application') {
-  await deployApp(stage, app.id, config, commitId, changelogs, version)
-  console.log('App deployed')
-} else if (app.type === 'module') {
-  await deployModule(stage, app.id, config, commitId, changelogs, version)
-  console.log('Module deployed')
+const result = await $`${args}`.quiet().nothrow()
+
+if (result.exitCode !== 0) {
+  const output = result.stderr.toString() || result.stdout.toString()
+  try {
+    const json = JSON.parse(output)
+    throw new Error(json.error || 'Release failed')
+  } catch {
+    throw new Error(output || 'Release failed')
+  }
 }
+
+const output = JSON.parse(result.stdout.toString())
+console.log(`${isModule ? 'Module' : 'App'} deployed: ${output.name}`)

package/tools/pull.ts

@@ -1,24 +1,43 @@
 import { $ } from 'bun'
 import { format } from 'prettier'
-import { pullApplicationProject, pullModuleProject } from '../api'
 
 const cwd = process.cwd()
 
+// Check git status
 const { exitCode } = await $`cd ${cwd} && git status`.nothrow()
 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 deploying')
+    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)',
+  )
+  if (confirmContinue !== 'y') throw new Error('Pull cancelled')
 }
 
+// Read application.json
 const app = await Bun.file(`${cwd}/application.json`).json()
-const stage = app.stage || 'production'
-const { files, lastCommitId } =
-  app.type === 'module'
-    ? await pullModuleProject(stage, app.id)
-    : await pullApplicationProject(stage, app.id)
+
+const isModule = app.type === 'module'
+const command = isModule ? 'module' : 'app'
+
+// Fetch project files using CLI
+const result = await $`bricks ${command} project-pull ${app.id} --json`.quiet().nothrow()
+
+if (result.exitCode !== 0) {
+  const output = result.stderr.toString() || result.stdout.toString()
+  try {
+    const json = JSON.parse(output)
+    throw new Error(json.error || 'Pull failed')
+  } catch {
+    throw new Error(output || 'Pull failed')
+  }
+}
+
+const { files, lastCommitId } = JSON.parse(result.stdout.toString())
 
 let useMain = false
 if (isGitRepo) {
@@ -30,7 +49,9 @@ if (isGitRepo) {
 
   if (commitId === lastCommitId) throw new Error('Commit not changed')
 
-  const branchName = 'BRICKS_PROJECT_try-pull-application'
+  const branchName = isModule
+    ? 'BRICKS_PROJECT_try-pull-module'
+    : 'BRICKS_PROJECT_try-pull-application'
 
   await $`cd ${cwd} && git branch -D ${branchName}`.nothrow()
 
@@ -40,11 +61,6 @@ if (isGitRepo) {
     await $`cd ${cwd} && git checkout -b ${branchName}`
     useMain = true
   }
-} else {
-  const confirmContinue = prompt(
-    'No git repository found, so it will not be safe to pull, continue? (y/n)',
-  )
-  if (confirmContinue !== 'y') throw new Error('Pull cancelled')
 }
 
 const prettierConfig = await Bun.file(`${cwd}/.prettierrc`)
@@ -58,7 +74,7 @@ const prettierConfig = await Bun.file(`${cwd}/.prettierrc`)
   }))
 
 await Promise.all(
-  files.map(async (file) =>
+  files.map(async (file: { name: string; input: string; formatable?: boolean }) =>
     Bun.write(
       `${cwd}/${file.name}`,
       file.formatable
@@ -70,8 +86,13 @@ await Promise.all(
 
 if (isGitRepo) {
   await $`cd ${cwd} && git add .`
-  await $`cd ${cwd} && git commit -m 'chore(project): apply file changes from BRICKS application'`
+  const commitMsg = 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) {
     await $`cd ${cwd} && git merge main`
   }
 }
+
+console.log(`${isModule ? 'Module' : 'App'} project pulled: ${files.length} files`)

package/types/generators/LlmGgml.ts

@@ -477,6 +477,12 @@ Default property:
     mmprojHashType?: 'md5' | 'sha256' | 'sha1' | DataLink
     /* Hash of mmproj file (PREVIEW FEATURE) */
     mmprojHash?: string | DataLink
+    /* Minimum tokens for image encoding in multimodal (PREVIEW FEATURE)  
+ Useful for dynamic resolution models (e.g. Qwen-VL). Default: -1 (auto) */
+    imageMinTokens?: number | DataLink
+    /* Maximum tokens for image encoding in multimodal (PREVIEW FEATURE)  
+ Limit tokens for dynamic resolution models to balance speed vs. detail. Default: -1 (auto) */
+    imageMaxTokens?: number | DataLink
     /* Chat Template (Jinja format) to override the default template from model */
     chatTemplate?: string | DataLink
     /* Context size (0 ~ 4096) (Default to 512) */