@lark-apaas/fullstack-cli 1.1.16-beta.0 → 1.1.16-beta.2

package/dist/gen-dbschema-template/types.ts

@@ -38,6 +38,60 @@ export const fileAttachment = customType<{
   },
 });
 
+/** Escape single quotes in SQL string literals */
+function escapeLiteral(str: string): string {
+  return `'${str.replace(/'/g, "''")}'`;
+}
+
+export const userProfileArray = customType<{
+  data: string[];
+  driverData: string;
+}>({
+  dataType() {
+    return 'user_profile[]';
+  },
+  toDriver(value: string[]) {
+    if (!value || value.length === 0) {
+      return sql`'{}'::user_profile[]`;
+    }
+    const elements = value.map(id => `ROW(${escapeLiteral(id)})::user_profile`).join(',');
+    return sql.raw(`ARRAY[${elements}]::user_profile[]`);
+  },
+  fromDriver(value: string): string[] {
+    if (!value || value === '{}') return [];
+    const inner = value.slice(1, -1);
+    const matches = inner.match(/\([^)]*\)/g) || [];
+    return matches.map(m => m.slice(1, -1).split(',')[0].trim());
+  },
+});
+
+export const fileAttachmentArray = customType<{
+  data: FileAttachment[];
+  driverData: string;
+}>({
+  dataType() {
+    return 'file_attachment[]';
+  },
+  toDriver(value: FileAttachment[]) {
+    if (!value || value.length === 0) {
+      return sql`'{}'::file_attachment[]`;
+    }
+    const elements = value.map(f =>
+      `ROW(${escapeLiteral(f.bucket_id)},${escapeLiteral(f.file_path)})::file_attachment`
+    ).join(',');
+    return sql.raw(`ARRAY[${elements}]::file_attachment[]`);
+  },
+  fromDriver(value: string): FileAttachment[] {
+    if (!value || value === '{}') return [];
+    const inner = value.slice(1, -1);
+    const matches = inner.match(/\([^)]*\)/g) || [];
+    return matches.map(m => {
+      const [bucketId, filePath] = m.slice(1, -1).split(',');
+      return { bucket_id: bucketId.trim(), file_path: filePath.trim() };
+    });
+  },
+});
+
 export const customTimestamptz = customType<{
   data: Date;
   driverData: string;

package/dist/index.js

@@ -472,6 +472,10 @@ var KNOWN_TYPE_FACTORIES = {
   user_profile: "userProfile",
   file_attachment: "fileAttachment"
 };
+var KNOWN_ARRAY_TYPE_FACTORIES = {
+  user_profile: "userProfileArray",
+  file_attachment: "fileAttachmentArray"
+};
 var replaceUnknownTransform = {
   name: "replace-unknown",
   transform(ctx) {
@@ -490,12 +494,17 @@ var replaceUnknownTransform = {
       const lines = textBefore.split("\n");
       let factoryName = "text";
       let foundKnownType = false;
+      let isArrayType = false;
       for (let i = lines.length - 1; i >= Math.max(0, lines.length - 5); i--) {
         const line = lines[i];
         const todoMatch = line.match(/\/\/ TODO: failed to parse database type '(?:\w+\.)?([\w_]+)(\[\])?'/);
         if (todoMatch) {
           const typeName = todoMatch[1];
-          if (KNOWN_TYPE_FACTORIES[typeName]) {
+          isArrayType = todoMatch[2] === "[]";
+          if (isArrayType && KNOWN_ARRAY_TYPE_FACTORIES[typeName]) {
+            factoryName = KNOWN_ARRAY_TYPE_FACTORIES[typeName];
+            foundKnownType = true;
+          } else if (KNOWN_TYPE_FACTORIES[typeName]) {
             factoryName = KNOWN_TYPE_FACTORIES[typeName];
             foundKnownType = true;
           }
@@ -503,6 +512,15 @@ var replaceUnknownTransform = {
         }
       }
       expression.replaceWithText(factoryName);
+      if (isArrayType && foundKnownType) {
+        const parent = node.getParent();
+        if (Node5.isPropertyAccessExpression(parent) && parent.getName() === "array") {
+          const grandParent = parent.getParent();
+          if (Node5.isCallExpression(grandParent)) {
+            grandParent.replaceWithText(node.getText());
+          }
+        }
+      }
       if (foundKnownType) {
         stats.replacedUnknown++;
       } else {
@@ -1005,6 +1023,139 @@ function resolveTemplateTypesPath() {
   return void 0;
 }
 
+// src/commands/db/gen-dbschema/utils/fetch-column-comments.ts
+import postgres from "postgres";
+var DEFAULT_TIMEOUT_MS = 1e4;
+async function fetchColumnComments(connectionString, options = {}) {
+  const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+  const url = new URL(connectionString);
+  const schemaName = url.searchParams.get("schema") ?? "public";
+  const sql = postgres(connectionString, {
+    connect_timeout: Math.ceil(timeoutMs / 1e3),
+    idle_timeout: Math.ceil(timeoutMs / 1e3)
+  });
+  try {
+    const queryPromise = sql`
+      SELECT
+        c.table_name AS "tableName",
+        c.column_name AS "columnName",
+        pgd.description AS "comment"
+      FROM information_schema.columns c
+      JOIN pg_catalog.pg_statio_all_tables st
+        ON c.table_name = st.relname AND c.table_schema = st.schemaname
+      JOIN pg_catalog.pg_description pgd
+        ON pgd.objoid = st.relid AND pgd.objsubid = c.ordinal_position
+      WHERE c.table_schema = ${schemaName}
+        AND pgd.description IS NOT NULL
+        AND pgd.description != ''
+    `;
+    const timeoutPromise = new Promise((_, reject) => {
+      setTimeout(() => reject(new Error(`Timeout after ${timeoutMs}ms`)), timeoutMs);
+    });
+    const result = await Promise.race([queryPromise, timeoutPromise]);
+    const commentMap = /* @__PURE__ */ new Map();
+    for (const row of result) {
+      const key = `${row.tableName}.${row.columnName}`;
+      commentMap.set(key, row.comment);
+    }
+    return commentMap;
+  } finally {
+    await sql.end().catch(() => {
+    });
+  }
+}
+function extractTypeAnnotation(comment) {
+  const typeStart = comment.indexOf("@type");
+  if (typeStart === -1) return null;
+  const afterType = comment.slice(typeStart + 5).trimStart();
+  if (!afterType.startsWith("{")) return null;
+  let depth = 0;
+  let endIndex = 0;
+  for (let i = 0; i < afterType.length; i++) {
+    if (afterType[i] === "{") depth++;
+    if (afterType[i] === "}") depth--;
+    if (depth === 0) {
+      endIndex = i + 1;
+      break;
+    }
+  }
+  if (endIndex === 0) return null;
+  return afterType.slice(0, endIndex);
+}
+function parseColumnComment(comment) {
+  const typeValue = extractTypeAnnotation(comment);
+  if (typeValue) {
+    const descMatch = comment.match(/@description\s+([^@]+)/);
+    return {
+      type: typeValue,
+      description: descMatch?.[1]?.trim()
+    };
+  }
+  return { description: comment.trim() };
+}
+
+// src/commands/db/gen-dbschema/transforms/text/jsonb-comments.ts
+function addJsonbTypeComments(source, columnComments) {
+  if (!columnComments || columnComments.size === 0) {
+    return { text: source, added: 0 };
+  }
+  const lines = source.split("\n");
+  const result = [];
+  let added = 0;
+  let currentTableName = null;
+  const tableDefRegex = /export const\s+\w+\s*=\s*pgTable\(\s*["'`]([^"'`]+)["'`]/;
+  const jsonFieldWithNameRegex = /^\s*(\w+):\s*(?:json|jsonb)\(\s*["'`]([^"'`]+)["'`]\)/;
+  const jsonFieldNoNameRegex = /^\s*(\w+):\s*(?:json|jsonb)\(\s*\)/;
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    const tableMatch = line.match(tableDefRegex);
+    if (tableMatch) {
+      currentTableName = tableMatch[1];
+    }
+    let columnName = null;
+    const jsonMatchWithName = line.match(jsonFieldWithNameRegex);
+    const jsonMatchNoName = line.match(jsonFieldNoNameRegex);
+    if (jsonMatchWithName) {
+      columnName = jsonMatchWithName[2];
+    } else if (jsonMatchNoName) {
+      columnName = jsonMatchNoName[1];
+    }
+    if (columnName && currentTableName) {
+      const commentKey = `${currentTableName}.${columnName}`;
+      const comment = columnComments.get(commentKey);
+      if (comment) {
+        const parsed = parseColumnComment(comment);
+        const indentMatch = line.match(/^\s*/);
+        const indent = indentMatch ? indentMatch[0] : "";
+        const prevLine = result[result.length - 1]?.trim() ?? "";
+        if (!prevLine.startsWith("/**") && !prevLine.startsWith("*") && !prevLine.startsWith("//")) {
+          const commentLines = [];
+          commentLines.push(`${indent}/**`);
+          if (parsed.description) {
+            const safeDesc = parsed.description.replace(/[\r\n]+/g, " ").trim();
+            commentLines.push(`${indent} * ${safeDesc}`);
+          }
+          if (parsed.type) {
+            if (parsed.description) {
+              commentLines.push(`${indent} *`);
+            }
+            const safeType = parsed.type.replace(/[\r\n]+/g, " ").trim();
+            commentLines.push(`${indent} * @type ${safeType}`);
+          }
+          commentLines.push(`${indent} */`);
+          result.push(...commentLines);
+          added++;
+        }
+      }
+    }
+    if (line.match(/^\}\);?\s*$/) || line.match(/^}\s*,\s*\{/)) {
+      currentTableName = null;
+    }
+    result.push(line);
+  }
+  return { text: result.join("\n"), added };
+}
+
 // src/commands/db/gen-dbschema/transforms/text/table-aliases.ts
 var TABLE_ALIAS_MARKER = "// table aliases";
 function generateTableAliases(source) {
@@ -1041,7 +1192,7 @@ function formatSource(source) {
 }
 
 // src/commands/db/gen-dbschema/postprocess.ts
-function postprocessSchema(rawSource) {
+function postprocessSchema(rawSource, options = {}) {
   const patchResult = patchDefects(rawSource);
   let source = patchResult.text;
   const { sourceFile } = parseSource(source);
@@ -1051,12 +1202,15 @@ function postprocessSchema(rawSource) {
   source = ensureHeader(source);
   source = addSystemFieldComments(source);
   source = inlineCustomTypes(source);
+  const jsonbCommentsResult = addJsonbTypeComments(source, options.columnComments);
+  source = jsonbCommentsResult.text;
   source = generateTableAliases(source);
   source = formatSource(source);
   return {
     source,
     astStats,
-    patchedDefects: patchResult.fixed
+    patchedDefects: patchResult.fixed,
+    addedJsonbComments: jsonbCommentsResult.added
   };
 }
 function logStats(result, prefix = "[postprocess]") {
@@ -1103,17 +1257,20 @@ function logStats(result, prefix = "[postprocess]") {
   if (astStats.removedImports.length > 0) {
     console.info(`${prefix} Removed imports: ${astStats.removedImports.join(", ")}`);
   }
+  if (result.addedJsonbComments > 0) {
+    console.info(`${prefix} Added ${result.addedJsonbComments} JSDoc comments for jsonb fields`);
+  }
 }
 
 // src/commands/db/gen-dbschema/index.ts
-function postprocessDrizzleSchema(targetPath) {
+async function postprocessDrizzleSchema(targetPath, options = {}) {
   const resolvedPath = path.resolve(targetPath);
   if (!fs3.existsSync(resolvedPath)) {
     console.warn(`[postprocess-drizzle-schema] File not found: ${resolvedPath}`);
     return void 0;
   }
   const rawSource = fs3.readFileSync(resolvedPath, "utf8");
-  const result = postprocessSchema(rawSource);
+  const result = postprocessSchema(rawSource, { columnComments: options.columnComments });
   fs3.writeFileSync(resolvedPath, result.source, "utf8");
   logStats(result, "[postprocess-drizzle-schema]");
   return {
@@ -1122,7 +1279,8 @@ function postprocessDrizzleSchema(targetPath) {
     unmatchedUnknown: result.astStats.unmatchedUnknown,
     patchedDefects: result.patchedDefects,
     replacedTimestamps: result.astStats.replacedTimestamp,
-    replacedDefaultNow: result.astStats.replacedDefaultNow
+    replacedDefaultNow: result.astStats.replacedDefaultNow,
+    addedJsonbComments: result.addedJsonbComments
   };
 }
 
@@ -1847,6 +2005,16 @@ async function run(options = {}) {
     }
     throw new Error("Unable to locate drizzle-kit package root");
   };
+  let columnComments;
+  try {
+    columnComments = await fetchColumnComments(databaseUrl, { timeoutMs: 1e4 });
+    console.log(`[gen-db-schema] \u2713 Fetched ${columnComments.size} column comments`);
+  } catch (err) {
+    console.warn(
+      "[gen-db-schema] \u26A0 Failed to fetch column comments (skipping):",
+      err instanceof Error ? err.message : String(err)
+    );
+  }
   try {
     const env = {
       ...process.env,
@@ -1870,7 +2038,9 @@ async function run(options = {}) {
       console.error("[gen-db-schema] schema.ts not generated");
       throw new Error("drizzle-kit introspect failed to generate schema.ts");
     }
-    const stats = postprocessDrizzleSchema(generatedSchema);
+    const stats = await postprocessDrizzleSchema(generatedSchema, {
+      columnComments
+    });
     if (stats?.unmatchedUnknown?.length) {
       console.warn("[gen-db-schema] Unmatched custom types detected:", stats.unmatchedUnknown);
     }
@@ -1960,6 +2130,27 @@ var syncConfig = {
       type: "remove-line",
       to: ".gitignore",
       pattern: "package-lock.json"
+    },
+    // 5. 注册 postinstall 脚本，自动恢复 action plugins
+    {
+      type: "add-script",
+      name: "postinstall",
+      command: "fullstack-cli action-plugin init",
+      overwrite: false
+    },
+    // 6. 替换 drizzle.config.ts（仅当文件存在时）
+    {
+      from: "templates/drizzle.config.ts",
+      to: "drizzle.config.ts",
+      type: "file",
+      overwrite: true,
+      onlyIfExists: true
+    },
+    // 7. 确保 .gitignore 包含 .agent/ 目录
+    {
+      type: "add-line",
+      to: ".gitignore",
+      line: ".agent/"
     }
   ],
   // 文件权限设置
@@ -2053,6 +2244,16 @@ async function syncRule(rule, pluginRoot, userProjectRoot) {
     removeLineFromFile(destPath2, rule.pattern);
     return;
   }
+  if (rule.type === "add-script") {
+    const packageJsonPath = path4.join(userProjectRoot, "package.json");
+    addScript(packageJsonPath, rule.name, rule.command, rule.overwrite ?? false);
+    return;
+  }
+  if (rule.type === "add-line") {
+    const destPath2 = path4.join(userProjectRoot, rule.to);
+    addLineToFile(destPath2, rule.line);
+    return;
+  }
   if (!("from" in rule)) {
     return;
   }
@@ -2067,14 +2268,18 @@ async function syncRule(rule, pluginRoot, userProjectRoot) {
       syncDirectory(srcPath, destPath, rule.overwrite ?? true);
       break;
     case "file":
-      syncFile(srcPath, destPath, rule.overwrite ?? true);
+      syncFile(srcPath, destPath, rule.overwrite ?? true, rule.onlyIfExists ?? false);
       break;
     case "append":
       appendToFile(srcPath, destPath);
       break;
   }
 }
-function syncFile(src, dest, overwrite = true) {
+function syncFile(src, dest, overwrite = true, onlyIfExists = false) {
+  if (onlyIfExists && !fs6.existsSync(dest)) {
+    console.log(`[fullstack-cli] \u25CB ${path4.basename(dest)} (skipped, target not exists)`);
+    return;
+  }
   const destDir = path4.dirname(dest);
   if (!fs6.existsSync(destDir)) {
     fs6.mkdirSync(destDir, { recursive: true });
@@ -2155,6 +2360,42 @@ function deleteDirectory(dirPath) {
     console.log(`[fullstack-cli] \u25CB ${path4.basename(dirPath)} (not found)`);
   }
 }
+function addScript(packageJsonPath, name, command, overwrite) {
+  if (!fs6.existsSync(packageJsonPath)) {
+    console.log(`[fullstack-cli] \u25CB package.json (not found)`);
+    return;
+  }
+  const content = fs6.readFileSync(packageJsonPath, "utf-8");
+  const pkg2 = JSON.parse(content);
+  if (!pkg2.scripts) {
+    pkg2.scripts = {};
+  }
+  if (pkg2.scripts[name]) {
+    if (!overwrite) {
+      console.log(`[fullstack-cli] \u25CB scripts.${name} (already exists)`);
+      return;
+    }
+  }
+  pkg2.scripts[name] = command;
+  fs6.writeFileSync(packageJsonPath, JSON.stringify(pkg2, null, 2) + "\n");
+  console.log(`[fullstack-cli] \u2713 scripts.${name}`);
+}
+function addLineToFile(filePath, line) {
+  const fileName = path4.basename(filePath);
+  if (!fs6.existsSync(filePath)) {
+    console.log(`[fullstack-cli] \u25CB ${fileName} (not found, skipped)`);
+    return;
+  }
+  const content = fs6.readFileSync(filePath, "utf-8");
+  const lines = content.split("\n").map((l) => l.trim());
+  if (lines.includes(line)) {
+    console.log(`[fullstack-cli] \u25CB ${fileName} (line already exists: ${line})`);
+    return;
+  }
+  const appendContent = (content.endsWith("\n") ? "" : "\n") + line + "\n";
+  fs6.appendFileSync(filePath, appendContent);
+  console.log(`[fullstack-cli] \u2713 ${fileName} (added: ${line})`);
+}
 
 // src/commands/sync/index.ts
 var syncCommand = {
@@ -2438,9 +2679,24 @@ function ensureCacheDir() {
 function getTempFilePath(pluginKey, version) {
   ensureCacheDir();
   const safeKey = pluginKey.replace(/[/@]/g, "_");
-  const filename = `${safeKey}-${version}.tgz`;
+  const filename = `${safeKey}@${version}.tgz`;
   return path6.join(getPluginCacheDir(), filename);
 }
+var MAX_RETRIES = 2;
+async function withRetry(operation, description, maxRetries = MAX_RETRIES) {
+  let lastError;
+  for (let attempt = 0; attempt <= maxRetries; attempt++) {
+    try {
+      return await operation();
+    } catch (error) {
+      lastError = error instanceof Error ? error : new Error(String(error));
+      if (attempt < maxRetries) {
+        console.log(`[action-plugin] ${description} failed, retrying (${attempt + 1}/${maxRetries})...`);
+      }
+    }
+  }
+  throw lastError;
+}
 async function downloadPlugin(pluginKey, requestedVersion) {
   console.log(`[action-plugin] Fetching plugin info for ${pluginKey}@${requestedVersion}...`);
   const pluginInfo = await getPluginVersion(pluginKey, requestedVersion);
@@ -2449,10 +2705,16 @@ async function downloadPlugin(pluginKey, requestedVersion) {
   let tgzBuffer;
   if (pluginInfo.downloadApproach === "inner") {
     console.log(`[action-plugin] Downloading from inner API...`);
-    tgzBuffer = await downloadFromInner(pluginKey, pluginInfo.version);
+    tgzBuffer = await withRetry(
+      () => downloadFromInner(pluginKey, pluginInfo.version),
+      "Download"
+    );
   } else {
     console.log(`[action-plugin] Downloading from public URL...`);
-    tgzBuffer = await downloadFromPublic(pluginInfo.downloadURL);
+    tgzBuffer = await withRetry(
+      () => downloadFromPublic(pluginInfo.downloadURL),
+      "Download"
+    );
   }
   const tgzPath = getTempFilePath(pluginKey, pluginInfo.version);
   fs8.writeFileSync(tgzPath, tgzBuffer);
@@ -2464,25 +2726,99 @@ async function downloadPlugin(pluginKey, requestedVersion) {
   };
 }
 function cleanupTempFile(tgzPath) {
-  try {
-    if (fs8.existsSync(tgzPath)) {
-      fs8.unlinkSync(tgzPath);
+}
+function getCachePath(pluginKey, version) {
+  ensureCacheDir();
+  const safeKey = pluginKey.replace(/[/@]/g, "_");
+  const filename = `${safeKey}@${version}.tgz`;
+  return path6.join(getPluginCacheDir(), filename);
+}
+function hasCachedPlugin(pluginKey, version) {
+  const cachePath = getCachePath(pluginKey, version);
+  return fs8.existsSync(cachePath);
+}
+function listCachedPlugins() {
+  const cacheDir = getPluginCacheDir();
+  if (!fs8.existsSync(cacheDir)) {
+    return [];
+  }
+  const files = fs8.readdirSync(cacheDir);
+  const result = [];
+  for (const file of files) {
+    if (!file.endsWith(".tgz")) continue;
+    const match = file.match(/^(.+)@(.+)\.tgz$/);
+    if (!match) continue;
+    const [, rawName, version] = match;
+    const name = rawName.replace(/^_/, "@").replace(/_/, "/");
+    const filePath = path6.join(cacheDir, file);
+    const stat = fs8.statSync(filePath);
+    result.push({
+      name,
+      version,
+      filePath,
+      size: stat.size,
+      mtime: stat.mtime
+    });
+  }
+  return result;
+}
+function cleanAllCache() {
+  const cacheDir = getPluginCacheDir();
+  if (!fs8.existsSync(cacheDir)) {
+    return 0;
+  }
+  const files = fs8.readdirSync(cacheDir);
+  let count = 0;
+  for (const file of files) {
+    if (file.endsWith(".tgz")) {
+      fs8.unlinkSync(path6.join(cacheDir, file));
+      count++;
+    }
+  }
+  return count;
+}
+function cleanPluginCache(pluginKey, version) {
+  const cacheDir = getPluginCacheDir();
+  if (!fs8.existsSync(cacheDir)) {
+    return 0;
+  }
+  const safeKey = pluginKey.replace(/[/@]/g, "_");
+  const files = fs8.readdirSync(cacheDir);
+  let count = 0;
+  for (const file of files) {
+    if (version) {
+      if (file === `${safeKey}@${version}.tgz`) {
+        fs8.unlinkSync(path6.join(cacheDir, file));
+        count++;
+      }
+    } else {
+      if (file.startsWith(`${safeKey}@`) && file.endsWith(".tgz")) {
+        fs8.unlinkSync(path6.join(cacheDir, file));
+        count++;
+      }
     }
-  } catch {
   }
+  return count;
 }
 
 // src/commands/action-plugin/init.handler.ts
 async function installOneForInit(name, version) {
-  let tgzPath;
   try {
     const installedVersion = getPackageVersion(name);
     if (installedVersion === version) {
       return { name, version, success: true, skipped: true };
     }
-    console.log(`[action-plugin] Installing ${name}@${version}...`);
-    const downloadResult = await downloadPlugin(name, version);
-    tgzPath = downloadResult.tgzPath;
+    let tgzPath;
+    let fromCache = false;
+    if (hasCachedPlugin(name, version)) {
+      console.log(`[action-plugin] \u21BB Restoring ${name}@${version} from cache...`);
+      tgzPath = getCachePath(name, version);
+      fromCache = true;
+    } else {
+      console.log(`[action-plugin] \u2193 Downloading ${name}@${version}...`);
+      const downloadResult = await downloadPlugin(name, version);
+      tgzPath = downloadResult.tgzPath;
+    }
     const pluginDir = extractTgzToNodeModules(tgzPath, name);
     const pluginPkg = readPluginPackageJson(pluginDir);
     if (pluginPkg?.peerDependencies) {
@@ -2491,16 +2827,13 @@ async function installOneForInit(name, version) {
         installMissingDeps(missingDeps);
       }
     }
-    console.log(`[action-plugin] \u2713 Installed ${name}@${version}`);
+    const source = fromCache ? "from cache" : "downloaded";
+    console.log(`[action-plugin] \u2713 Installed ${name}@${version} (${source})`);
     return { name, version, success: true };
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     console.error(`[action-plugin] \u2717 Failed to install ${name}: ${message}`);
     return { name, version, success: false, error: message };
-  } finally {
-    if (tgzPath) {
-      cleanupTempFile(tgzPath);
-    }
   }
 }
 async function init() {
@@ -2546,7 +2879,6 @@ function syncActionPluginsRecord(name, version) {
   }
 }
 async function installOne(nameWithVersion) {
-  let tgzPath;
   const { name, version: requestedVersion } = parsePluginName(nameWithVersion);
   try {
     console.log(`[action-plugin] Installing ${name}@${requestedVersion}...`);
@@ -2558,17 +2890,28 @@ async function installOne(nameWithVersion) {
         return { name, version: actualVersion, success: true, skipped: true };
       }
     }
-    if (actualVersion && requestedVersion === "latest") {
+    let targetVersion = requestedVersion;
+    if (requestedVersion === "latest") {
       const latestInfo = await getPluginVersion(name, "latest");
-      if (actualVersion === latestInfo.version) {
+      targetVersion = latestInfo.version;
+      if (actualVersion === targetVersion) {
         console.log(`[action-plugin] Plugin ${name} is already up to date (version: ${actualVersion})`);
         syncActionPluginsRecord(name, actualVersion);
         return { name, version: actualVersion, success: true, skipped: true };
       }
-      console.log(`[action-plugin] Found newer version: ${latestInfo.version} (installed: ${actualVersion})`);
+      console.log(`[action-plugin] Found newer version: ${targetVersion} (installed: ${actualVersion || "none"})`);
+    }
+    let tgzPath;
+    let fromCache = false;
+    if (hasCachedPlugin(name, targetVersion)) {
+      console.log(`[action-plugin] \u21BB Using cached ${name}@${targetVersion}...`);
+      tgzPath = getCachePath(name, targetVersion);
+      fromCache = true;
+    } else {
+      console.log(`[action-plugin] \u2193 Downloading ${name}@${targetVersion}...`);
+      const downloadResult = await downloadPlugin(name, requestedVersion);
+      tgzPath = downloadResult.tgzPath;
     }
-    const downloadResult = await downloadPlugin(name, requestedVersion);
-    tgzPath = downloadResult.tgzPath;
     console.log(`[action-plugin] Extracting to node_modules...`);
     const pluginDir = extractTgzToNodeModules(tgzPath, name);
     const pluginPkg = readPluginPackageJson(pluginDir);
@@ -2578,20 +2921,17 @@ async function installOne(nameWithVersion) {
         installMissingDeps(missingDeps);
       }
     }
-    const installedVersion = getPackageVersion(name) || downloadResult.version;
+    const installedVersion = getPackageVersion(name) || targetVersion;
     const plugins = readActionPlugins();
     plugins[name] = installedVersion;
     writeActionPlugins(plugins);
-    console.log(`[action-plugin] Successfully installed ${name}@${installedVersion}`);
+    const source = fromCache ? "from cache" : "downloaded";
+    console.log(`[action-plugin] Successfully installed ${name}@${installedVersion} (${source})`);
     return { name, version: installedVersion, success: true };
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     console.error(`[action-plugin] Failed to install ${name}: ${message}`);
     return { name, version: requestedVersion, success: false, error: message };
-  } finally {
-    if (tgzPath) {
-      cleanupTempFile(tgzPath);
-    }
   }
 }
 async function install(namesWithVersion) {
@@ -2745,6 +3085,58 @@ async function list() {
   }
 }
 
+// src/commands/action-plugin/cache.handler.ts
+async function cacheList() {
+  const cached = listCachedPlugins();
+  if (cached.length === 0) {
+    console.log("[action-plugin] No cached plugins found");
+    return;
+  }
+  console.log("[action-plugin] Cached plugins:\n");
+  console.log("  Name                                  Version     Size       Modified");
+  console.log("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
+  let totalSize = 0;
+  for (const plugin of cached) {
+    const name = plugin.name.padEnd(38);
+    const version = plugin.version.padEnd(10);
+    const size = formatSize(plugin.size).padEnd(9);
+    const mtime = plugin.mtime.toISOString().replace("T", " ").slice(0, 19);
+    console.log(`  ${name}  ${version}  ${size}  ${mtime}`);
+    totalSize += plugin.size;
+  }
+  console.log("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
+  console.log(`  Total: ${cached.length} cached file(s), ${formatSize(totalSize)}`);
+}
+async function cacheClean(pluginName, version) {
+  let count;
+  if (pluginName) {
+    console.log(`[action-plugin] Cleaning cache for ${pluginName}${version ? `@${version}` : ""}...`);
+    count = cleanPluginCache(pluginName, version);
+    if (count === 0) {
+      console.log(`[action-plugin] No cached files found for ${pluginName}${version ? `@${version}` : ""}`);
+    } else {
+      console.log(`[action-plugin] Cleaned ${count} cached file(s)`);
+    }
+  } else {
+    console.log("[action-plugin] Cleaning all cached plugins...");
+    count = cleanAllCache();
+    if (count === 0) {
+      console.log("[action-plugin] No cached files found");
+    } else {
+      console.log(`[action-plugin] Cleaned ${count} cached file(s)`);
+    }
+  }
+}
+function formatSize(bytes) {
+  if (bytes < 1024) {
+    return `${bytes} B`;
+  } else if (bytes < 1024 * 1024) {
+    return `${(bytes / 1024).toFixed(1)} KB`;
+  } else {
+    return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+  }
+}
+
 // src/commands/action-plugin/index.ts
 var initCommand = {
   name: "init",
@@ -2795,14 +3187,33 @@ var listCommand = {
     });
   }
 };
+var cacheListCommand = {
+  name: "cache-list",
+  description: "List all cached plugin packages",
+  register(program) {
+    program.command(this.name).description(this.description).action(async () => {
+      await cacheList();
+    });
+  }
+};
+var cacheCleanCommand = {
+  name: "cache-clean",
+  description: "Clean cached plugin packages",
+  register(program) {
+    program.command(this.name).description(this.description).argument("[name]", "Plugin name to clean (e.g., @office/feishu-create-group). If not provided, clean all cache.").option("-v, --version <version>", "Specific version to clean").action(async (name, options) => {
+      await cacheClean(name, options.version);
+    });
+  }
+};
 var actionPluginCommandGroup = {
   name: "action-plugin",
   description: "Manage action plugins",
-  commands: [initCommand, installCommand, updateCommand, removeCommand, listCommand]
+  commands: [initCommand, installCommand, updateCommand, removeCommand, listCommand, cacheListCommand, cacheCleanCommand]
 };
 
 // src/commands/capability/utils.ts
 import fs9 from "fs";
+import { createRequire as createRequire2 } from "module";
 import path7 from "path";
 var CAPABILITIES_DIR = "server/capabilities";
 function getProjectRoot2() {
@@ -2882,7 +3293,10 @@ function hasValidParamsSchema(paramsSchema) {
 }
 async function loadPlugin(pluginKey) {
   try {
-    const pluginPackage = (await import(pluginKey)).default;
+    const userRequire = createRequire2(path7.join(getProjectRoot2(), "package.json"));
+    const resolvedPath = userRequire.resolve(pluginKey);
+    const pluginModule = await import(resolvedPath);
+    const pluginPackage = pluginModule.default ?? pluginModule;
     if (!pluginPackage || typeof pluginPackage.create !== "function") {
       throw new Error(`Plugin ${pluginKey} does not export a valid create function`);
     }
@@ -5121,6 +5535,28 @@ function extractClientStdSegment(lines, maxLines, offset) {
   };
 }
 
+// src/commands/read-logs/dev.ts
+function readDevSegment(filePath, maxLines, offset) {
+  const marker = (line) => {
+    if (!line) return false;
+    if (line.includes("Dev session started")) return true;
+    return false;
+  };
+  const segment = readStdLinesTailFromLastMarkerPaged(filePath, maxLines, offset, marker);
+  return { lines: segment.lines, totalLinesCount: segment.totalLinesCount };
+}
+
+// src/commands/read-logs/dev-std.ts
+function readDevStdSegment(filePath, maxLines, offset) {
+  const marker = (line) => {
+    if (!line) return false;
+    if (line.includes("Dev session started")) return true;
+    return false;
+  };
+  const segment = readStdLinesTailFromLastMarkerPaged(filePath, maxLines, offset, marker);
+  return { lines: segment.lines, totalLinesCount: segment.totalLinesCount };
+}
+
 // src/commands/read-logs/json-lines.ts
 import fs20 from "fs";
 function normalizePid(value) {
@@ -5445,7 +5881,7 @@ function readJsonLinesTailByLevel(filePath, maxLines, offset, levels) {
 }
 
 // src/commands/read-logs/index.ts
-var LOG_TYPES = ["server", "trace", "server-std", "client-std", "browser"];
+var LOG_TYPES = ["server", "trace", "server-std", "client-std", "dev", "dev-std", "install-dep-std", "browser"];
 function normalizeObjectKey(key) {
   return key.toLowerCase().replace(/_/g, "");
 }
@@ -5607,6 +6043,15 @@ async function readLatestLogLinesMeta(options) {
   if (options.type === "client-std") {
     return readClientStdSegment(filePath, maxLines, offset);
   }
+  if (options.type === "dev") {
+    return readDevSegment(filePath, maxLines, offset);
+  }
+  if (options.type === "dev-std") {
+    return readDevStdSegment(filePath, maxLines, offset);
+  }
+  if (options.type === "install-dep-std") {
+    return readFileTailNonEmptyLinesWithOffset(filePath, maxLines, offset);
+  }
   const traceId = typeof options.traceId === "string" ? options.traceId.trim() : "";
   if (traceId) {
     return readJsonLinesByTraceId(filePath, traceId, maxLines, offset, levels);
@@ -5624,7 +6069,7 @@ async function readLatestLogLinesMeta(options) {
 }
 async function readLogsJsonResult(options) {
   const { lines, totalLinesCount } = await readLatestLogLinesMeta(options);
-  if (options.type === "server-std" || options.type === "client-std") {
+  if (options.type === "server-std" || options.type === "client-std" || options.type === "dev" || options.type === "dev-std" || options.type === "install-dep-std") {
     return {
       hasError: hasErrorInStdLines(lines),
       totalLinesCount,
@@ -5668,6 +6113,15 @@ function resolveLogFilePath(logDir, type) {
   if (type === "client-std") {
     return path16.join(base, "client.std.log");
   }
+  if (type === "dev") {
+    return path16.join(base, "dev.log");
+  }
+  if (type === "dev-std") {
+    return path16.join(base, "dev.std.log");
+  }
+  if (type === "install-dep-std") {
+    return path16.join(base, "install-dep.std.log");
+  }
   if (type === "browser") {
     return path16.join(base, "browser.log");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-cli",
-  "version": "1.1.16-beta.0",
+  "version": "1.1.16-beta.2",
   "description": "CLI tool for fullstack template management",
   "type": "module",
   "main": "dist/index.js",

package/templates/drizzle.config.ts

@@ -0,0 +1,55 @@
+import { defineConfig, Config } from 'drizzle-kit';
+require('dotenv').config();
+
+const outputDir = process.env.__DRIZZLE_OUT_DIR__ || './server/database/.introspect';
+const schemaPath = process.env.__DRIZZLE_SCHEMA_PATH__ || './server/database/schema.ts';
+
+const parsedUrl = new URL(process.env.SUDA_DATABASE_URL || '');
+
+const envSchemaFilter = process.env.DRIZZLE_SCHEMA_FILTER;
+const urlSchemaFilter = parsedUrl.searchParams.get('schema');
+
+const schemaFilter = (envSchemaFilter ?? urlSchemaFilter ?? '')
+  .split(',')
+  .map((s) => s.trim())
+  .filter(Boolean);
+
+parsedUrl.searchParams.delete('schema'); // 移除schema参数，避免 drizzle-kit 解析错误
+
+// 默认排除的系统对象（PostgreSQL 扩展和系统视图）
+// 这些对象在 drizzle-kit introspect 时可能导致无效的 JS 代码生成
+const SYSTEM_OBJECTS_EXCLUSIONS = [
+  '!spatial_ref_sys',       // PostGIS 空间参考系统表
+  '!geography_columns',     // PostGIS 地理列视图
+  '!geometry_columns',      // PostGIS 几何列视图
+  '!raster_columns',        // PostGIS 栅格列视图
+  '!raster_overviews',      // PostGIS 栅格概览视图
+  '!pg_stat_statements',    // pg_stat_statements 扩展
+  '!pg_stat_statements_info', // pg_stat_statements 扩展
+  '!part_config',           // pg_partman 分区配置表
+  '!part_config_sub',       // pg_partman 子分区配置表
+  '!table_privs',           // 系统权限视图
+];
+
+const envTablesFilter = process.env.DRIZZLE_TABLES_FILTER;
+const userTablesFilter = (envTablesFilter ?? '*')
+  .split(',')
+  .map((s) => s.trim())
+  .filter(Boolean);
+
+// 合并用户过滤器和系统对象排除
+// 用户可以通过设置 DRIZZLE_TABLES_FILTER 来覆盖（如果需要包含某些系统对象）
+const tablesFilter = [...userTablesFilter, ...SYSTEM_OBJECTS_EXCLUSIONS];
+
+const config:Config = {
+  schema: schemaPath,
+  out: outputDir,
+  tablesFilter,
+  schemaFilter,
+  dialect: 'postgresql',
+  dbCredentials: {
+    url: parsedUrl.toString(),
+  },
+}
+
+export default defineConfig(config);

package/templates/scripts/dev.sh

@@ -21,6 +21,10 @@ CLEANUP_DONE=false
 
 mkdir -p "${LOG_DIR}"
 
+# Redirect all stdout/stderr to both terminal and log file
+DEV_STD_LOG="${LOG_DIR}/dev.std.log"
+exec > >(tee -a "$DEV_STD_LOG") 2>&1
+
 # Log event to dev.log with timestamp
 log_event() {
   local level=$1
@@ -234,7 +238,7 @@ log_event "INFO" "client" "Supervisor started with PID ${CLIENT_PID}"
 log_event "INFO" "main" "All processes started, monitoring..."
 echo ""
 echo "📋 Dev processes running. Press Ctrl+C to stop."
-echo "📄 Logs: ${DEV_LOG}"
+echo "📄 Logs: ${DEV_STD_LOG}"
 echo ""
 
 # Wait for all background processes