@carllee1983/dbcli 1.29.0 → 1.30.0

package/dist/cli.mjs

@@ -7136,9 +7136,11 @@ async function writeV2Config(path, config) {
   DbcliConfigV2Schema.parse(config);
   const storagePath = await resolveConfigStoragePath(path);
   const configPath = join2(storagePath, "config.json");
+  const tmpPath = `${configPath}.tmp`;
   await Bun.$`mkdir -p ${storagePath}`;
   const json = JSON.stringify(config, null, 2);
-  await Bun.write(configPath, json);
+  await Bun.write(tmpPath, json);
+  await Bun.$`mv -f ${tmpPath} ${configPath}`;
 }
 async function patchConnectionSchema(dbcliPath, connectionName, schema, metadataUpdate) {
   const storagePath = await resolveConfigStoragePath(dbcliPath);
@@ -81222,7 +81224,7 @@ var {
 // package.json
 var package_default = {
   name: "@carllee1983/dbcli",
-  version: "1.29.0",
+  version: "1.30.0",
   description: "Database CLI for AI agents",
   type: "module",
   publishConfig: {

package/dist/core.d.ts

@@ -2769,6 +2769,12 @@ export declare function loadConnectionEnv(resolved: ResolvedConnection, basePath
  * Read and validate a v2 config from disk
  */
 export declare function readV2Config(path: string): Promise<DbcliConfigV2>;
+/**
+ * Write a v2 config to disk atomically (temp file + rename).
+ * Writing to a temp file then renaming over the target is an atomic operation
+ * on the same filesystem, so a crash mid-write can never leave a corrupt config.
+ */
+export declare function writeV2Config(path: string, config: DbcliConfigV2): Promise<void>;
 /**
  * List all connection names in a v2 config
  */
@@ -2789,7 +2795,47 @@ export declare function listConnections(config: DbcliConfigV2): Array<{
 	};
 	isDefault: boolean;
 }>;
+export type SqlSystem = "postgresql" | "mysql" | "mariadb";
+/**
+ * `$env` 變數名。per-connection 命名空間化:常駐 sidecar 共用 process.env,
+ * 且 loadEnvFile 不覆寫既有 key——若兩連線都用 DB_PASSWORD 會撞名取到對方的值。
+ */
+export declare function envVarNameFor(connName: string, field: "password"): string;
+/** 把 secret 寫進該連線的 envFile(KEY=VALUE);既有同名 key 就地覆寫,否則追加。 */
+export declare function writeConnectionSecret(projectPath: string, connName: string, field: "password", value: string): Promise<void>;
+export interface ConnectionInput {
+	name: string;
+	system: SqlSystem;
+	host: string;
+	port: number;
+	user: string;
+	database: string;
+}
+/** 刪除連線(immutable)。刪預設則改派為剩餘第一條;刪最後一條則擋下(v2 需至少一條)。 */
+export declare function removeConnection(config: DbcliConfigV2, name: string): DbcliConfigV2;
+/** 設定預設連線(immutable)。 */
+export declare function setDefaultConnection(config: DbcliConfigV2, name: string): DbcliConfigV2;
+/**
+ * v1 單連線 → v2,產生唯一 'default' 連線。沿用 v1 既有密碼慣例:legacy
+ * `.env.local` 的 `DB_PASSWORD`,故 default 連線 envFile 指向 '.env.local'、
+ * password 設 {$env:'DB_PASSWORD'},不搬動既有 secret。blacklist/audit/metadata 原樣帶過。
+ */
+export declare function migrateV1ToV2(v1: DbcliConfig$1): DbcliConfigV2;
+/** 新增或就地覆寫同名連線(immutable)。非機密欄存字面值,password 存 {$env} 參照 +
+ *  per-connection envFile。編輯時保留既有 permission;新建預設 'query-only'。 */
+export declare function upsertConnection(config: DbcliConfigV2, input: ConnectionInput): DbcliConfigV2;
+interface ProjectConfigBinding {
+	version: 3;
+	binding: {
+		type: "home-storage";
+		storagePath: string;
+		projectPath: string;
+		createdAt: string;
+	};
+}
+export declare function getProjectStoragePath(projectPath: string): string;
 export declare function resolveConfigStoragePath(path: string): Promise<string>;
+export declare function writeProjectBinding(projectPath: string, storagePath?: string): Promise<ProjectConfigBinding>;
 /**
  * Read and fully resolve a `.dbcli` project config: handles project-binding
  * indirection, v1/v2 formats, per-connection `.env` loading and `{$env}`

package/dist/core.mjs

@@ -5085,6 +5085,7 @@ class SessionIdService {
 }
 
 // src/core/config-binding.ts
+import { createHash } from "crypto";
 import { homedir } from "os";
 import { basename, join as join3, resolve } from "path";
 var BINDING_FILE_NAME = "config.json";
@@ -5095,6 +5096,15 @@ function isProjectConfigBinding(raw) {
   const candidate = raw;
   return candidate.version === 3 && typeof candidate.binding === "object" && candidate.binding !== null && candidate.binding.type === "home-storage" && typeof candidate.binding.storagePath === "string" && candidate.binding.storagePath.length > 0 && typeof candidate.binding.projectPath === "string" && candidate.binding.projectPath.length > 0 && typeof candidate.binding.createdAt === "string" && candidate.binding.createdAt.length > 0;
 }
+function getDbcliHomeRoot() {
+  return DBCLI_HOME_ROOT;
+}
+function getProjectStoragePath(projectPath) {
+  const normalizedProjectPath = resolve(projectPath);
+  const projectName = basename(normalizedProjectPath) || "project";
+  const hash = createHash("sha1").update(normalizedProjectPath).digest("hex").slice(0, 12);
+  return join3(getDbcliHomeRoot(), "projects", `${projectName}-${hash}`);
+}
 async function readProjectBinding(projectPath) {
   const configFile = Bun.file(join3(projectPath, BINDING_FILE_NAME));
   if (!await configFile.exists())
@@ -5110,6 +5120,21 @@ async function resolveConfigStoragePath(path) {
   const binding = await readProjectBinding(path);
   return binding?.binding.storagePath ?? path;
 }
+async function writeProjectBinding(projectPath, storagePath = getProjectStoragePath(projectPath)) {
+  const binding = {
+    version: 3,
+    binding: {
+      type: "home-storage",
+      storagePath,
+      projectPath: resolve(projectPath),
+      createdAt: new Date().toISOString()
+    }
+  };
+  await Bun.$`mkdir -p ${projectPath}`;
+  await Bun.$`mkdir -p ${storagePath}`;
+  await Bun.file(join3(projectPath, BINDING_FILE_NAME)).write(JSON.stringify(binding, null, 2));
+  return binding;
+}
 
 // node_modules/zod/v3/external.js
 var exports_external = {};
@@ -9300,6 +9325,16 @@ async function readV2Config(path) {
   const raw = JSON.parse(content);
   return DbcliConfigV2Schema.parse(raw);
 }
+async function writeV2Config(path, config) {
+  DbcliConfigV2Schema.parse(config);
+  const storagePath = await resolveConfigStoragePath(path);
+  const configPath = join4(storagePath, "config.json");
+  const tmpPath = `${configPath}.tmp`;
+  await Bun.$`mkdir -p ${storagePath}`;
+  const json = JSON.stringify(config, null, 2);
+  await Bun.write(tmpPath, json);
+  await Bun.$`mv -f ${tmpPath} ${configPath}`;
+}
 function listConnections(config) {
   return Object.entries(config.connections).map(([name, conn]) => {
     const c = conn;
@@ -9819,6 +9854,105 @@ function inferColumnType(value) {
 
 // src/core/public.ts
 init_schema_loader();
+
+// src/core/config-v2-mutations.ts
+import { join as join10 } from "path";
+var SQL_SYSTEMS = ["postgresql", "mysql", "mariadb"];
+function envVarNameFor(connName, field) {
+  const slug = connName.toUpperCase().replace(/[^A-Z0-9]+/g, "_").replace(/^_+|_+$/g, "");
+  return `DBCLI_${slug}_${field.toUpperCase()}`;
+}
+async function writeConnectionSecret(projectPath, connName, field, value) {
+  if (value.includes(`
+`) || value.includes("\r")) {
+    throw new Error("secret value \u4E0D\u53EF\u5305\u542B\u63DB\u884C\u5B57\u5143");
+  }
+  const config = await readV2Config(projectPath);
+  const conn = config.connections[connName];
+  if (!conn)
+    throw new Error(`\u9023\u7DDA '${connName}' \u4E0D\u5B58\u5728`);
+  const storagePath = await resolveConfigStoragePath(projectPath);
+  const envFile = conn.envFile ?? `.env.${connName}`;
+  const envPath = join10(storagePath, envFile);
+  const varName = envVarNameFor(connName, field);
+  let content = "";
+  const file = Bun.file(envPath);
+  if (await file.exists())
+    content = await file.text();
+  const line = `${varName}=${value}`;
+  const re = new RegExp(`^${varName}=.*$`, "m");
+  if (re.test(content)) {
+    content = content.replace(re, line);
+  } else {
+    content = content.length && !content.endsWith(`
+`) ? `${content}
+${line}
+` : `${content}${line}
+`;
+  }
+  await Bun.write(envPath, content);
+}
+function removeConnection(config, name) {
+  if (!(name in config.connections))
+    throw new Error(`\u9023\u7DDA '${name}' \u4E0D\u5B58\u5728`);
+  const rest = { ...config.connections };
+  delete rest[name];
+  const remaining = Object.keys(rest);
+  if (remaining.length === 0)
+    throw new Error("\u7121\u6CD5\u522A\u9664\u6700\u5F8C\u4E00\u689D\u9023\u7DDA");
+  const nextDefault = config.default === name ? remaining[0] : config.default;
+  return { ...config, connections: rest, default: nextDefault };
+}
+function setDefaultConnection(config, name) {
+  if (!(name in config.connections))
+    throw new Error(`\u9023\u7DDA '${name}' \u4E0D\u5B58\u5728`);
+  return { ...config, default: name };
+}
+function migrateV1ToV2(v1) {
+  const system = v1.connection.system;
+  if (!SQL_SYSTEMS.includes(system)) {
+    throw new Error(`v1\u2192v2 \u81EA\u52D5\u5347\u7D1A\u76EE\u524D\u50C5\u652F\u63F4 SQL \u9023\u7DDA(mysql/postgresql/mariadb),\u4E0D\u652F\u63F4 '${system}'`);
+  }
+  const c = v1.connection;
+  return {
+    version: 2,
+    default: "default",
+    connections: {
+      default: {
+        system: c.system,
+        host: c.host,
+        port: c.port,
+        user: c.user,
+        database: c.database,
+        password: { $env: "DB_PASSWORD" },
+        permission: v1.permission ?? "query-only",
+        envFile: ".env.local"
+      }
+    },
+    schema: {},
+    schemas: {},
+    metadata: v1.metadata ?? { version: "2.0" },
+    blacklist: v1.blacklist ?? { tables: [], columns: {} },
+    audit: v1.audit ?? { enabled: true, rotation: { max_bytes: 10485760, max_entries: 1000 } }
+  };
+}
+function upsertConnection(config, input) {
+  const existing = config.connections[input.name];
+  const connection = {
+    system: input.system,
+    host: input.host,
+    port: input.port,
+    user: input.user,
+    database: input.database,
+    password: { $env: envVarNameFor(input.name, "password") },
+    permission: existing?.permission ?? "query-only",
+    envFile: `.env.${input.name}`
+  };
+  return {
+    ...config,
+    connections: { ...config.connections, [input.name]: connection }
+  };
+}
 // src/core/blacklist-manager.ts
 class BlacklistManager {
   config;
@@ -9990,12 +10124,21 @@ class BlacklistValidator {
 // src/core/public.ts
 var readConfig = (path, connectionName) => configModule.read(path, connectionName);
 export {
+  writeV2Config,
+  writeProjectBinding,
+  writeConnectionSecret,
+  upsertConnection,
+  setDefaultConnection,
   resolveConnection,
   resolveConfigStoragePath,
+  removeConnection,
   readV2Config,
   readConfig,
+  migrateV1ToV2,
   loadConnectionEnv,
   listConnections,
+  getProjectStoragePath,
+  envVarNameFor,
   detectConfigVersion,
   SchemaLayeredLoader,
   QueryExecutor,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carllee1983/dbcli",
-  "version": "1.29.0",
+  "version": "1.30.0",
   "description": "Database CLI for AI agents",
   "type": "module",
   "publishConfig": {