@adep/cli 0.1.5 → 0.1.7

package/dist/index.js

@@ -6708,6 +6708,15 @@ async function projectsCreate(paths, options) {
   const name = options.name ?? slug;
   const body = { slug, name };
   if (options.spaceId !== void 0) body.spaceId = options.spaceId;
+  if (options.gitRepoUrl !== void 0 && options.gitBranch !== void 0) {
+    body.git = {
+      repoUrl: options.gitRepoUrl,
+      branch: options.gitBranch,
+      ...options.gitFunctionRoot === void 0 ? {} : { functionRoot: options.gitFunctionRoot },
+      ...options.gitUsername === void 0 ? {} : { authUsername: options.gitUsername },
+      ...options.gitToken === void 0 ? {} : { authToken: options.gitToken }
+    };
+  }
   const created = await client.request(
     "/api/v1/projects",
     { body },
@@ -6750,6 +6759,70 @@ var init_projects = __esm({
   }
 });
 
+// packages/cli/src/git.ts
+var git_exports = {};
+__export(git_exports, {
+  gitBind: () => gitBind,
+  gitStatus: () => gitStatus,
+  gitSync: () => gitSync
+});
+async function resolveProjectId3(client, cwd, slug) {
+  const resolvedSlug = await resolveSlug(cwd, slug);
+  const listed = await client.request("/api/v1/projects", {}, "PROJECT_LIST_FAILED");
+  const match = listed.projects.find((project2) => project2.slug === resolvedSlug);
+  if (match === void 0) {
+    throw new CliError(
+      "PROJECT_NOT_FOUND",
+      `\u5E73\u53F0\u9879\u76EE "${resolvedSlug}" \u4E0D\u5B58\u5728\u6216\u4F60\u6CA1\u6709\u8BBF\u95EE\u6743\u9650\uFF1A\u5148\u6267\u884C adep projects create ${resolvedSlug}`
+    );
+  }
+  return { id: match.id, slug: match.slug };
+}
+async function gitBind(paths, options) {
+  const client = await createClient(paths);
+  const { id } = await resolveProjectId3(client, options.cwd, options.slug);
+  const body = {
+    repoUrl: options.repoUrl,
+    branch: options.branch
+  };
+  if (options.functionRoot !== void 0) body.functionRoot = options.functionRoot;
+  if (options.syncEnabled !== void 0) body.syncEnabled = options.syncEnabled;
+  if (options.username !== void 0) body.authUsername = options.username;
+  if (options.token !== void 0) body.authToken = options.token;
+  const view = await client.request(
+    `/api/v1/projects/${id}/gitsync/bind`,
+    { body },
+    "GIT_BIND_FAILED"
+  );
+  return view;
+}
+async function gitSync(paths, options) {
+  const client = await createClient(paths);
+  const { id } = await resolveProjectId3(client, options.cwd, options.slug);
+  const result = await client.request(
+    `/api/v1/projects/${id}/gitsync/sync`,
+    { body: {} },
+    "GIT_SYNC_FAILED"
+  );
+  return { jobId: result.jobId };
+}
+async function gitStatus(paths, options) {
+  const client = await createClient(paths);
+  const { id } = await resolveProjectId3(client, options.cwd, options.slug);
+  return client.request(
+    `/api/v1/projects/${id}/gitsync`,
+    {},
+    "GIT_STATUS_FAILED"
+  );
+}
+var init_git = __esm({
+  "packages/cli/src/git.ts"() {
+    "use strict";
+    init_auth();
+    init_client();
+  }
+});
+
 // packages/cli/src/functions.ts
 var functions_exports = {};
 __export(functions_exports, {
@@ -9199,18 +9272,25 @@ function registerMcp(program2, ctx) {
 // packages/cli/src/commands/projects.ts
 function registerProjects(program2, ctx) {
   const projects = program2.command("projects").description("\u9879\u76EE\uFF1A\u521B\u5EFA / \u5217\u51FA / \u67E5\u770B\uFF08\u5B50\u57DF\u5730\u5740\u7531\u5E73\u53F0\u56DE\u663E\uFF0C\u4E0D\u5728 CLI \u4FA7\u62FC\uFF09");
-  projects.command("create").description("\u521B\u5EFA\u9879\u76EE\u5E76\u8F93\u51FA\u5B50\u57DF\u5730\u5740").argument("<slug>", "\u9879\u76EE slug\uFF08\u5168\u5C40\u552F\u4E00\uFF0C\u5373\u5B50\u57DF\u540D\uFF09").option("-n, --name <name>", "\u9879\u76EE\u5C55\u793A\u540D\uFF08\u7F3A\u7701\u53D6 slug\uFF09").option("--space <spaceId>", "\u5F52\u5C5E\u7A7A\u95F4\uFF08\u7F3A\u7701\u4E2A\u4EBA\u7A7A\u95F4\uFF09").action(async (slug, flags) => {
-    const command = ctx.io("projects create");
-    await command.run(async () => {
-      const { projectsCreate: projectsCreate2 } = await Promise.resolve().then(() => (init_projects(), projects_exports));
-      const created = await projectsCreate2(ctx.paths, {
-        slug,
-        ...flags.name === void 0 ? {} : { name: flags.name },
-        ...flags.space === void 0 ? {} : { spaceId: flags.space }
+  projects.command("create").description("\u521B\u5EFA\u9879\u76EE\u5E76\u8F93\u51FA\u5B50\u57DF\u5730\u5740").argument("<slug>", "\u9879\u76EE slug\uFF08\u5168\u5C40\u552F\u4E00\uFF0C\u5373\u5B50\u57DF\u540D\uFF09").option("-n, --name <name>", "\u9879\u76EE\u5C55\u793A\u540D\uFF08\u7F3A\u7701\u53D6 slug\uFF09").option("--space <spaceId>", "\u5F52\u5C5E\u7A7A\u95F4\uFF08\u7F3A\u7701\u4E2A\u4EBA\u7A7A\u95F4\uFF09").option("--git <repoUrl>", "\u4ECE Git \u4ED3\u5E93\u521B\u5EFA\uFF08\u521B\u5EFA\u540E\u7ED1\u5B9A + \u9996\u6B21\u540C\u6B65/\u90E8\u7F72\uFF09").option("-b, --branch <branch>", "Git \u5206\u652F\uFF08\u914D\u5408 --git\uFF0C\u7F3A\u7701 main\uFF09").option("--username <username>", "Git \u79C1\u6709\u4ED3\u5E93\u7528\u6237\u540D\uFF08\u914D\u5408 --git\uFF09").option("--token <token>", "Git \u79C1\u6709\u4ED3\u5E93\u8BBF\u95EE\u4EE4\u724C\uFF08\u914D\u5408 --git\uFF0C\u5E73\u53F0\u52A0\u5BC6\u843D\u5E93\uFF09").option("--function-root <root>", "legacy \u5E03\u5C40\u51FD\u6570\u6839\u76EE\u5F55\uFF08\u914D\u5408 --git\uFF0C\u7F3A\u7701\u5E94\u7528\u5E03\u5C40\u81EA\u52A8\u63A2\u6D4B\uFF09").action(
+    async (slug, flags) => {
+      const command = ctx.io("projects create");
+      await command.run(async () => {
+        const { projectsCreate: projectsCreate2 } = await Promise.resolve().then(() => (init_projects(), projects_exports));
+        const created = await projectsCreate2(ctx.paths, {
+          slug,
+          ...flags.name === void 0 ? {} : { name: flags.name },
+          ...flags.space === void 0 ? {} : { spaceId: flags.space },
+          ...flags.git === void 0 ? {} : { gitRepoUrl: flags.git },
+          ...flags.git === void 0 ? {} : { gitBranch: flags.branch ?? "main" },
+          ...flags.username === void 0 ? {} : { gitUsername: flags.username },
+          ...flags.token === void 0 ? {} : { gitToken: flags.token },
+          ...flags.functionRoot === void 0 ? {} : { gitFunctionRoot: flags.functionRoot }
+        });
+        command.ok(created, (data) => `\u2713 Project created \xB7 ${data.url}`);
       });
-      command.ok(created, (data) => `\u2713 Project created \xB7 ${data.url}`);
-    });
-  });
+    }
+  );
   projects.command("list").description("\u5217\u51FA\u5F53\u524D\u7528\u6237\u53EF\u8BBF\u95EE\u7684\u9879\u76EE").action(async () => {
     const command = ctx.io("projects list");
     await command.run(async () => {
@@ -9236,6 +9316,80 @@ function registerProjects(program2, ctx) {
   });
 }
 
+// packages/cli/src/commands/git.ts
+function registerGit(program2, ctx) {
+  const git = program2.command("git").description("Git \u4ED3\u5E93\u7ED1\u5B9A\uFF1A\u7ED1\u5B9A / \u624B\u52A8\u540C\u6B65 / \u67E5\u770B\u72B6\u6001\uFF08push \u5230 main \u81EA\u52A8\u90E8\u7F72\uFF09");
+  git.command("bind").description("\u7ED1\u5B9A/\u66F4\u65B0\u9879\u76EE Git \u4ED3\u5E93\uFF08\u6D45\u5C42 clone \u6821\u9A8C\u8FDE\u901A\u6027\uFF0C\u652F\u6301\u79C1\u6709\u4ED3\u5E93\u51ED\u636E\uFF09").argument("<repoUrl>", "\u4ED3\u5E93\u5730\u5740\uFF08https://\u2026\uFF0C\u79C1\u6709\u4ED3\u5E93\u4F20 --username/--token\uFF09").requiredOption("-b, --branch <branch>", "\u7ED1\u5B9A\u5206\u652F\uFF08\u7F3A\u7701 main\uFF09").option("--slug <slug>", "\u5E73\u53F0\u9879\u76EE slug\uFF08\u7F3A\u7701\u8BFB adep.config.ts / \u5F53\u524D\u76EE\u5F55\u540D\uFF09").option("--function-root <dir>", "legacy \u5E03\u5C40\u51FD\u6570\u6839\u76EE\u5F55\uFF08\u5E94\u7528\u5E03\u5C40\u65E0\u9700\u4F20\uFF09").option("--no-sync", "\u7ED1\u5B9A\u4F46\u4E0D\u542F\u7528\u81EA\u52A8\u540C\u6B65").option("-u, --username <username>", "\u79C1\u6709\u4ED3\u5E93\u7528\u6237\u540D").option("-t, --token <token>", "\u79C1\u6709\u4ED3\u5E93\u8BBF\u95EE\u4EE4\u724C\uFF08\u660E\u6587\u53EA\u5728\u8BF7\u6C42\u5185\u4F20\u8F93\uFF0C\u670D\u52A1\u7AEF\u52A0\u5BC6\u843D\u5E93\uFF09").action(
+    async (repoUrl, flags) => {
+      const command = ctx.io("git bind");
+      await command.run(async () => {
+        const { gitBind: gitBind2 } = await Promise.resolve().then(() => (init_git(), git_exports));
+        const view = await gitBind2(ctx.paths, {
+          cwd: ctx.cwd,
+          repoUrl,
+          branch: flags.branch,
+          ...flags.slug === void 0 ? {} : { slug: flags.slug },
+          ...flags.functionRoot === void 0 ? {} : { functionRoot: flags.functionRoot },
+          ...flags.sync === void 0 ? {} : { syncEnabled: flags.sync },
+          ...flags.username === void 0 ? {} : { username: flags.username },
+          ...flags.token === void 0 ? {} : { token: flags.token }
+        });
+        command.ok(view, (data) => {
+          const v = data;
+          const auth = v.hasAuth ? "\u79C1\u6709\u51ED\u636E" : "\u516C\u5F00";
+          const last = v.lastStatus === null ? "\u672A\u540C\u6B65" : `${v.lastStatus.state} \xB7 ${v.lastStatus.description}`;
+          return [
+            `\u2713 Git \u5DF2\u7ED1\u5B9A \xB7 ${v.repoUrl} \u2192 ${v.branch}\uFF08${auth}\uFF09`,
+            `  \u81EA\u52A8\u540C\u6B65\uFF1A${v.syncEnabled ? "\u5F00\uFF08push \u540E \u226460s \u81EA\u52A8\u90E8\u7F72\uFF09" : "\u5173"}`,
+            `  \u6700\u8FD1\u72B6\u6001\uFF1A${last}`
+          ].join("\n");
+        });
+      });
+    }
+  );
+  git.command("sync").description("\u624B\u52A8\u89E6\u53D1\u4E00\u6B21 Git \u540C\u6B65 + \u81EA\u52A8\u90E8\u7F72\uFF08\u672C\u5730\u5E73\u53F0\u65E0 webhook \u53EF\u8FBE\u65F6\u7528\uFF09").option("--slug <slug>", "\u5E73\u53F0\u9879\u76EE slug\uFF08\u7F3A\u7701\u8BFB adep.config.ts / \u5F53\u524D\u76EE\u5F55\u540D\uFF09").action(async (flags) => {
+    const command = ctx.io("git sync");
+    await command.run(async () => {
+      const { gitSync: gitSync2 } = await Promise.resolve().then(() => (init_git(), git_exports));
+      const result = await gitSync2(ctx.paths, {
+        cwd: ctx.cwd,
+        ...flags.slug === void 0 ? {} : { slug: flags.slug }
+      });
+      command.ok(
+        result,
+        (data) => `\u2713 \u5DF2\u89E6\u53D1 Git \u540C\u6B65 + \u90E8\u7F72\uFF08job ${data.jobId}\uFF09`
+      );
+    });
+  });
+  git.command("status").description("\u67E5\u770B\u7ED1\u5B9A\u4E0E\u6700\u8FD1\u4E00\u6B21\u540C\u6B65/\u90E8\u7F72\u72B6\u6001").option("--slug <slug>", "\u5E73\u53F0\u9879\u76EE slug\uFF08\u7F3A\u7701\u8BFB adep.config.ts / \u5F53\u524D\u76EE\u5F55\u540D\uFF09").action(async (flags) => {
+    const command = ctx.io("git status");
+    await command.run(async () => {
+      const { gitStatus: gitStatus2 } = await Promise.resolve().then(() => (init_git(), git_exports));
+      const view = await gitStatus2(ctx.paths, {
+        cwd: ctx.cwd,
+        ...flags.slug === void 0 ? {} : { slug: flags.slug }
+      });
+      if (view === null) {
+        command.ok(null, () => "\u672A\u7ED1\u5B9A Git \u4ED3\u5E93\uFF1Aadep git bind <repoUrl> -b main");
+        return;
+      }
+      command.ok(view, (data) => {
+        const v = data;
+        const auth = v.hasAuth ? "\u79C1\u6709\u51ED\u636E" : "\u516C\u5F00";
+        const last = v.lastStatus === null ? "\u672A\u540C\u6B65" : `${v.lastStatus.state} \xB7 ${v.lastStatus.description}`;
+        const commit = v.lastSyncedCommit === null ? "\u2014" : v.lastSyncedCommit.slice(0, 8);
+        return [
+          `\u4ED3\u5E93	${v.repoUrl}`,
+          `\u5206\u652F	${v.branch}\uFF08${auth}\uFF09`,
+          `\u81EA\u52A8\u540C\u6B65	${v.syncEnabled ? "\u5F00" : "\u5173"}`,
+          `\u6700\u8FD1\u540C\u6B65	${commit}`,
+          `\u6700\u8FD1\u72B6\u6001	${last}`
+        ].join("\n");
+      });
+    });
+  });
+}
+
 // packages/cli/src/commands/functions.ts
 init_auth();
 function registerFunctions(program2, ctx) {
@@ -9401,6 +9555,7 @@ function buildProgram(options = {}) {
   registerDoctor(program2, ctx);
   registerAuth(program2, ctx);
   registerMcp(program2, ctx);
+  registerGit(program2, ctx);
   registerDeploy(program2, ctx);
   registerProjects(program2, ctx);
   registerFunctions(program2, ctx);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adep/cli",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "type": "module",
   "description": "`adep` 命令行工具包位：登录 / 初始化 / 本地调试 / 部署 / 数据库维护 / 云存储 / 静态托管 / 微前端组件（widget），实现见任务单 CLI-001 ~ CLI-003 与 FE-002；子路径 `@adep/cli/vite` 提供云函数 vite 插件（CLI-014）",
   "bin": {