larkway 0.3.7 → 0.3.8

package/dist/main.js

@@ -111527,20 +111527,6 @@ var ChatEntry = external_exports.object({
   purpose: external_exports.enum(["production", "test", "staging"]).default("production"),
   description: external_exports.string().optional()
 });
-var CentralConfig = external_exports.object({
-  /**
-   * Git URL or local path of the central config repo (where `bots/` lives).
-   * e.g. "git@gitlab.company.com:ops/larkway-bots.git" or a bare repo path.
-   */
-  repo: external_exports.string().min(1, "centralConfig.repo is required (git url or path)"),
-  /** Branch to track on the central repo. @default "main" */
-  branch: external_exports.string().min(1).default("main"),
-  /**
-   * Path INSIDE the central repo that holds the bot files (<id>.yaml +
-   * <id>.memory.md). @default "bots"
-   */
-  path: external_exports.string().min(1).default("bots")
-});
 var ConfigJson = external_exports.object({
   conventions: ConventionsConfig,
   permissions: PermissionsConfig,
@@ -111548,12 +111534,7 @@ var ConfigJson = external_exports.object({
    * List of allowed chats with labels. If empty/missing, bridge falls back
    * to the legacy `LARK_ALLOWED_CHAT_IDS` env var (deprecated).
    */
-  chats: external_exports.array(ChatEntry).default([]),
-  /**
-   * Central config repo (V2.2 §7 A.2). Optional — when present, `larkway sync`
-   * pulls bots/ from it. Absent = local self-management.
-   */
-  centralConfig: CentralConfig.optional()
+  chats: external_exports.array(ChatEntry).default([])
 });
 var DEFAULT_CONFIG_PATH = path2.join(larkwayHome(), "config.json");
 function getLanIp() {
@@ -111577,8 +111558,7 @@ function defaultConfigJson() {
       portRangeEnd: 3050
     },
     permissions: { allowExtra: [] },
-    chats: [],
-    centralConfig: void 0
+    chats: []
   };
 }
 async function loadConfigJson(configPath = DEFAULT_CONFIG_PATH) {
@@ -113555,7 +113535,7 @@ function renderPrompt(input) {
       `    lark-cli docs +get <doc-url>${profileFlag}`,
       "- \u53D6\u672C\u6761\u6D88\u606F\u7684\u9644\u4EF6/\u5185\u8054\u56FE(post \u5185\u8054\u56FE\u4E0D\u5728\u4E0A\u9762 attachments/images \u91CC)\u3001\u62C9\u8BDD\u9898\u5386\u53F2:",
       attachmentHelpLine,
-      "- glab / git / gitlab API",
+      "- glab / gh / git API",
       "- pnpm / npm",
       "",
       "**\u91CD\u8981**:`thread_id` \u5C31\u662F\u8BDD\u9898\u9996\u697C\u7684 message_id\u3002\u5982\u679C\u5F53\u524D\u6D88\u606F attachments/feishu_doc_links \u4E3A\u7A7A,\u8BF4\u660E\u8FD0\u8425\u628A\u7D20\u6750\u653E\u5728\u9996\u697C,**\u5148\u62C9\u9996\u697C\u770B\u8FD0\u8425\u539F\u59CB\u9700\u6C42**,\u518D\u51B3\u5B9A\u4E0B\u4E00\u6B65\u3002",
@@ -113850,7 +113830,7 @@ function renderPermissionsRequest(input) {
     "## Repo Pointers",
     "",
     ...repoLines,
-    input.bot.gitlab_token_env ? `- GitLab token env name available after human setup: ${input.bot.gitlab_token_env}` : "- GitLab token env name: pending human confirmation",
+    input.bot.gitlab_token_env ? `- Git token env name available after human setup: ${input.bot.gitlab_token_env}` : "- Git token env name: pending human confirmation",
     "",
     "## Human Gate",
     "",
@@ -113876,11 +113856,11 @@ function defaultWorkspacePermissionItems(input) {
   }
   if (input.repos && input.repos.length > 0) {
     for (const repo of input.repos) {
-      capabilities.push(`GitLab repo pointer: ${repo.slug} (${repo.branch ?? "master"})`);
+      capabilities.push(`Git repo pointer: ${repo.slug} (${repo.branch ?? "master"})`);
     }
   }
   if (input.bot.gitlab_token_env) {
-    capabilities.push(`GitLab token env name: ${input.bot.gitlab_token_env}`);
+    capabilities.push(`Git token env name: ${input.bot.gitlab_token_env}`);
   }
   capabilities.push("Local shell inside the Agent Workspace for task execution and verification");
   return permissionItemsFromCapabilities(capabilities);
@@ -113936,10 +113916,10 @@ function renderDefaultPermissionGrantLines(input) {
     lines.push(`- type=read Feishu chat allowlist: ${chats.join(", ")} source=saved-agent-config`);
   }
   for (const repo of input.repos ?? []) {
-    lines.push(`- type=read GitLab repo pointer: ${repo.slug} (${repo.branch ?? "master"}) source=saved-agent-config`);
+    lines.push(`- type=read Git repo pointer: ${repo.slug} (${repo.branch ?? "master"}) source=saved-agent-config`);
   }
   if (input.bot.gitlab_token_env) {
-    lines.push(`- type=write GitLab write/MR env=${input.bot.gitlab_token_env} source=saved-agent-config`);
+    lines.push(`- type=write Git write/MR env=${input.bot.gitlab_token_env} source=saved-agent-config`);
   }
   const humanGates = input.humanGates && input.humanGates.length > 0 ? input.humanGates : ["Deploy/restart and production-impact actions require explicit human confirmation."];
   for (const gate of humanGates) {
@@ -114596,7 +114576,7 @@ var BridgeHandler = class {
           bot: {
             name: this.deps.botConfig?.name ?? "Larkway Agent",
             description: this.deps.botConfig?.description ?? "Local agent served through Larkway.",
-            gitlab_token_env: this.deps.botConfig?.gitlab_token_env
+            gitlab_token_env: this.deps.botConfig?.git_token_env ?? this.deps.botConfig?.gitlab_token_env
           },
           agentMemory: this.deps.agentMemory,
           repos: [
@@ -117977,13 +117957,23 @@ var BotConfigSchema = external_exports.object({
    */
   lark_cli_profile: external_exports.string().min(1).optional(),
   /**
-   * Env-var *name* (not value) that holds this bot's GitLab PAT.
+   * Env-var *name* (not value) that holds this bot's Git PAT.
    * Read from process.env at startup and injected as GITLAB_TOKEN into the
-   * claude subprocess env, so MRs/git ops use the bot's own GitLab account.
-   * When absent, the claude subprocess inherits process.env.GITLAB_TOKEN
+   * agent subprocess env, so MRs/git ops use the bot's own account.
+   * When absent, the subprocess inherits process.env.GITLAB_TOKEN
    * (V1 single-bot behavior — one global token).
+   *
+   * Preferred field name; `gitlab_token_env` below is the backward-compat alias.
+   */
+  git_token_env: external_exports.string().min(1).optional(),
+  // preferred: generic git PAT env-var name
+  /**
+   * @deprecated Backward-compat alias for `git_token_env`. If both are present,
+   * main.ts prefers `git_token_env`. Old bot yamls with this field continue to
+   * work without changes.
    */
   gitlab_token_env: external_exports.string().min(1).optional(),
+  // compat alias (legacy)
   /**
    * L2 Agent Memory (职能定义) — filename relative to the bots/ directory,
    * pointing at this bot's `*.memory.md`. Loaded at startup and injected into
@@ -119057,17 +119047,18 @@ async function runV2Mode({
       continue;
     }
     if (bot.runtime === "agent_workspace") {
-      if (bot.repos.length > 0 && !bot.gitlab_token_env) {
+      const _agentTokenEnvName = bot.git_token_env ?? bot.gitlab_token_env;
+      if (bot.repos.length > 0 && !_agentTokenEnvName) {
         console.error(
-          `[larkway] SKIPPING bot "${bot.id}": runtime=agent_workspace has repo pointers but no gitlab_token_env. v0.3 workspace repo bots must reference an explicit per-agent token env name; they do not inherit global GITLAB_TOKEN.`
+          `[larkway] SKIPPING bot "${bot.id}": runtime=agent_workspace has repo pointers but no git_token_env (or gitlab_token_env). v0.3 workspace repo bots must reference an explicit per-agent token env name; they do not inherit global GITLAB_TOKEN.`
         );
         continue;
       }
-      if (bot.gitlab_token_env) {
-        const gitlabToken = process.env[bot.gitlab_token_env];
-        if (gitlabToken == null || gitlabToken === "") {
+      if (_agentTokenEnvName) {
+        const agentToken = process.env[_agentTokenEnvName];
+        if (agentToken == null || agentToken === "") {
           console.error(
-            `[larkway] SKIPPING bot "${bot.id}": runtime=agent_workspace declares gitlab_token_env="${bot.gitlab_token_env}", but that env var is unset/empty. Set the real token in ~/.larkway/.env; v0.3 workspace bots do not fall back to global GITLAB_TOKEN.`
+            `[larkway] SKIPPING bot "${bot.id}": runtime=agent_workspace declares token env "${_agentTokenEnvName}", but that env var is unset/empty. Set the real token in ~/.larkway/.env; v0.3 workspace bots do not fall back to global GITLAB_TOKEN.`
           );
           continue;
         }
@@ -119096,10 +119087,11 @@ async function runV2Mode({
   const instances = [];
   for (const bot of healthyBots) {
     const appSecret = process.env[bot.app_secret_env];
-    const gitlabToken = bot.gitlab_token_env != null ? process.env[bot.gitlab_token_env] : void 0;
-    if (bot.gitlab_token_env != null && (gitlabToken == null || gitlabToken === "")) {
+    const tokenEnvName = bot.git_token_env ?? bot.gitlab_token_env;
+    const gitlabToken = tokenEnvName != null ? process.env[tokenEnvName] : void 0;
+    if (tokenEnvName != null && (gitlabToken == null || gitlabToken === "")) {
       console.warn(
-        `[larkway] bot "${bot.id}" declares gitlab_token_env="${bot.gitlab_token_env}" but that env var is unset/empty \u2014 falling back to global GITLAB_TOKEN.`
+        `[larkway] bot "${bot.id}" declares token env "${tokenEnvName}" but that env var is unset/empty \u2014 falling back to global GITLAB_TOKEN.`
       );
     }
     const larkCliProfile = deriveLarkCliProfile(bot.lark_cli_profile, bot.app_id);
@@ -119168,7 +119160,7 @@ async function runV2Mode({
       portRangeStart: configJson.conventions.portRangeStart,
       portRangeEnd: configJson.conventions.portRangeEnd,
       readOnly: bot.read_only,
-      gitlabTokenEnvName: bot.gitlab_token_env
+      gitlabTokenEnvName: tokenEnvName
     };
     const effectiveGitlabToken = bot.runtime === "agent_workspace" ? gitlabToken ?? "" : gitlabToken;
     const resolvedPeers = bot.peers.flatMap((peerId) => {
@@ -119191,6 +119183,7 @@ async function runV2Mode({
         git_identity: bot.git_identity,
         backend: bot.backend,
         runtime: bot.runtime,
+        git_token_env: bot.git_token_env,
         gitlab_token_env: bot.gitlab_token_env
       },
       gitlabToken: effectiveGitlabToken,