@andyqiu/codeforge 0.6.0 → 0.6.2

package/bin/codeforge.mjs

@@ -95,20 +95,42 @@ function parseArgs(argv) {
 // ────────────────────────────────────────────────────────────────────
 // opencode installer：薄壳，统一调 install.mjs（Node ESM 跨平台）
 // ADR:unify-install-to-node-mjs
+// 自举兼容：优先找 install.mjs（v0.6+），fallback 到 install.sh（v0.5 过渡期）
+// 用于 upgrade 命令：旧版 CLI 调新包时，新包里只有 install.mjs
 // ────────────────────────────────────────────────────────────────────
+function resolveInstallerScript() {
+  const mjsScript = path.join(REPO_ROOT, "install.mjs")
+  if (existsSync(mjsScript)) return { script: mjsScript, useNode: true }
+  const shScript = path.join(REPO_ROOT, "install.sh")
+  if (existsSync(shScript)) return { script: shScript, useNode: false }
+  return null
+}
+
 function installOpencode({ scope, dryRun, extraArgs, quiet = false, verbose = false }) {
-  const script = path.join(REPO_ROOT, "install.mjs")
-  if (!existsSync(script)) {
-    err(`installer 脚本不存在：${script}`)
+  const resolved = resolveInstallerScript()
+  if (!resolved) {
+    err(`installer 脚本不存在：${path.join(REPO_ROOT, "install.mjs")}`)
     return 2
   }
-  const args = [script]
-  if (scope === "global") args.push("--global")
-  if (dryRun) args.push("--dry-run")
-  if (verbose) args.push("--verbose")
-  if (extraArgs) args.push(...extraArgs)
-  if (!quiet) log(`opencode: node ${args.join(" ")}`)
-  const r = spawnSync(process.execPath, args, { stdio: quiet ? "pipe" : "inherit", cwd: REPO_ROOT })
+  const { script, useNode } = resolved
+  let cmd, args
+  if (useNode) {
+    cmd = process.execPath
+    args = [script]
+    if (scope === "global") args.push("--global")
+    if (dryRun) args.push("--dry-run")
+    if (verbose) args.push("--verbose")
+    if (extraArgs) args.push(...extraArgs)
+  } else {
+    // fallback：旧版包里只有 install.sh（v0.5 过渡期）
+    cmd = "bash"
+    args = [script]
+    if (scope === "global") args.push("--global")
+    if (dryRun) args.push("--dry-run")
+    if (extraArgs) args.push(...extraArgs)
+  }
+  if (!quiet) log(`opencode: ${useNode ? "node" : "bash"} ${args.join(" ")}`)
+  const r = spawnSync(cmd, args, { stdio: quiet ? "pipe" : "inherit", cwd: REPO_ROOT })
   if (quiet && r.status !== 0) {
     if (r.stderr) process.stderr.write(r.stderr)
     if (r.stdout) process.stderr.write(r.stdout)
@@ -117,11 +139,21 @@ function installOpencode({ scope, dryRun, extraArgs, quiet = false, verbose = fa
 }
 
 function uninstallOpencode({ scope }) {
-  const script = path.join(REPO_ROOT, "install.mjs")
+  const resolved = resolveInstallerScript()
+  if (!resolved) {
+    err(`installer 脚本不存在：${path.join(REPO_ROOT, "install.mjs")}`)
+    return 2
+  }
+  const { script, useNode } = resolved
+  if (!useNode && process.platform === "win32") {
+    err("Windows 下旧版 install.sh 不支持，请重新安装：npm install -g @andyqiu/codeforge")
+    return 2
+  }
+  const cmd = useNode ? process.execPath : "bash"
   const args = [script, "--uninstall"]
   if (scope === "global") args.push("--global")
-  log(`opencode uninstall: node ${args.join(" ")}`)
-  const r = spawnSync(process.execPath, args, { stdio: "inherit", cwd: REPO_ROOT })
+  log(`opencode uninstall: ${useNode ? "node" : "bash"} ${args.join(" ")}`)
+  const r = spawnSync(cmd, args, { stdio: "inherit", cwd: REPO_ROOT })
   return r.status ?? 1
 }
 
@@ -146,12 +178,6 @@ function cmdInstall(args) {
   if (args.flags["enable-legacy-tools"]) extraArgs.push("--enable-legacy-tools")
   if (args.flags["skip-build"] || autoSkipBuild) extraArgs.push("--skip-build")
 
-  log(`CodeForge installer v${getVersion()}`)
-  log(`  scope    : ${scope}`)
-  log(`  source   : ${fromNpm ? "npm (prebuilt)" : "git clone (will build)"}`)
-  log(`  dry-run  : ${dryRun}`)
-  hr()
-
   // npm 场景：dist/index.js 必须已经被 prepack 打好；找不到就直接报错并提示
   if (fromNpm && !dryRun) {
     const distEntry = path.join(REPO_ROOT, "dist", "index.js")
@@ -164,12 +190,10 @@ function cmdInstall(args) {
   }
 
   const code = installOpencode({ scope, dryRun, extraArgs, verbose })
-  hr()
   if (code !== 0) {
     err(`opencode 安装失败 (exit=${code})`)
     return 1
   }
-  ok(`opencode 安装完成`)
   return 0
 }
 
@@ -178,12 +202,7 @@ function cmdInstall(args) {
 // ────────────────────────────────────────────────────────────────────
 function cmdUninstall(args) {
   const scope = "global"
-  log(`CodeForge uninstaller`)
-  log(`  scope   : ${scope}`)
-  hr()
   uninstallOpencode({ scope })
-  hr()
-  ok("卸载流程完成")
   return 0
 }
 
@@ -324,9 +343,6 @@ async function cmdUpgrade(args) {
     log(`当前版本：${currentVersion} → 最新版本：${latestVersion}`)
   }
 
-  hr()
-  log(`正在升级...`)
-
   const npmCmd = "npm"
   // 有明确版本号时用精确版本，绕过 @latest dist-tag 缓存
   const installTarget = latestVersion

package/dist/index.js

@@ -19759,7 +19759,7 @@ import * as zlib from "node:zlib";
 // lib/version-injected.ts
 function getInjectedVersion() {
   try {
-    const v = "0.6.0";
+    const v = "0.6.2";
     if (typeof v === "string" && /^\d+\.\d+\.\d+/.test(v)) {
       return v;
     }

package/install.mjs

@@ -155,7 +155,10 @@ function shouldCopyMd(base) {
 // B. 路径 / 常量（照搬两脚本并集）
 // ────────────────────────────────────────────────────────────────────
 function xdgConfigHome() {
-  return process.env.XDG_CONFIG_HOME || path.join(os.homedir(), ".config")
+  if (process.env.XDG_CONFIG_HOME) return process.env.XDG_CONFIG_HOME
+  // Windows：opencode 默认用 %APPDATA%\opencode（与 XDG 不同）
+  if (IS_WIN && process.env.APPDATA) return process.env.APPDATA
+  return path.join(os.homedir(), ".config")
 }
 
 function resolvePaths({ mode }) {
@@ -452,7 +455,7 @@ function installMdDirs({ targetRoot }) {
     const srcPath = path.join(SOURCE_ROOT, srcName)
     const dstPath = path.join(targetRoot, dstName)
     if (!fs.existsSync(srcPath) || !fs.statSync(srcPath).isDirectory()) {
-      addWarn(`源目录不存在，跳过: ${srcPath}`)
+      vlog(`源目录不存在，跳过: ${srcPath}`)
       continue
     }
     if (fs.existsSync(dstPath) || isSymlink(dstPath)) rmrf(dstPath)
@@ -487,7 +490,7 @@ function installCopyDirs({ targetRoot }) {
     const srcPath = path.join(SOURCE_ROOT, srcName)
     const dstPath = path.join(targetRoot, dstName)
     if (!fs.existsSync(srcPath) || !fs.statSync(srcPath).isDirectory()) {
-      addWarn(`源目录不存在，跳过: ${srcPath}`)
+      vlog(`源目录不存在，跳过: ${srcPath}`)
       continue
     }
     ensureDir(dstPath)
@@ -500,7 +503,7 @@ function installSkills({ targetRoot }) {
   const skillsSrc = path.join(SOURCE_ROOT, "skills")
   const skillsDst = path.join(targetRoot, "skills")
   if (!fs.existsSync(skillsSrc) || !fs.statSync(skillsSrc).isDirectory()) {
-    addWarn(`skills/ 目录不存在，跳过（发布包未含 skills）`)
+    vlog(`skills/ 目录不存在，跳过（发布包未含 skills）`)
     return
   }
   ensureDir(skillsDst)
@@ -525,7 +528,7 @@ function installAssets({ targetRoot }) {
   const assetsSrc = path.join(SOURCE_ROOT, "assets")
   const assetsDst = path.join(targetRoot, "assets")
   if (!fs.existsSync(assetsSrc) || !fs.statSync(assetsSrc).isDirectory()) {
-    addWarn(`assets/ 目录不存在，跳过（发布包未含 assets）`)
+    vlog(`assets/ 目录不存在，跳过（发布包未含 assets）`)
     return
   }
   ensureDir(assetsDst)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andyqiu/codeforge",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "CodeForge — opencode 的零侵入扩展包",
   "type": "module",
   "private": false,