larkway 0.3.8 → 0.3.10

package/README.md

@@ -8,7 +8,7 @@
 
 You @ the bot in a Feishu thread. It runs on your machine — reading your real codebase, executing commands, opening MRs — and posts the result back. You define what the agent knows and what it can do. Larkway just carries the messages.
 
-**Current release: v0.3.6**
+**Current release: v0.3.10**
 
 ---
 

package/README.zh.md

@@ -8,7 +8,7 @@
 
 你在飞书话题里 @ bot，它在你的机器上运行——读真实代码库、执行命令、开 MR——把结果贴回飞书。你定义 agent 知道什么、能做什么。Larkway 只负责传递消息。
 
-**当前版本：v0.3.6**
+**当前版本：v0.3.10**
 
 ---
 

package/dist/cli/index.js

@@ -119646,6 +119646,14 @@ var GitIdentitySchema = external_exports.object({
   name: external_exports.string().min(1),
   email: external_exports.string().email()
 });
+var GitCloneUrlSchema = external_exports.string().min(1).refine(
+  (value) => {
+    if (/^https?:\/\/\S+$/i.test(value)) return true;
+    if (/^ssh:\/\/\S+$/i.test(value)) return true;
+    return /^[A-Za-z0-9_.-]+@[^:\s]+:[^ \t\r\n]+$/.test(value);
+  },
+  "url must be an http(s), ssh://, or scp-like Git clone URL"
+);
 var BotConfigSchema = external_exports.object({
   /** Unique identifier, kebab-case. Used as key in sessionStore. */
   id: external_exports.string().regex(/^[a-z0-9]+(-[a-z0-9]+)*$/, "id must be kebab-case"),
@@ -119720,7 +119728,7 @@ var BotConfigSchema = external_exports.object({
        * Agent workspace runtime: URL is a pointer only; the Agent decides clone
        * timing and destination.
        */
-      url: external_exports.string().url().optional()
+      url: GitCloneUrlSchema.optional()
     })
   ).default([]),
   /**
@@ -120016,7 +120024,7 @@ function renderBotYaml(config) {
   const header = [
     "# Larkway bot config (L1) \u2014 generated/edited via `larkway` CLI.",
     "# Credentials are env-var NAMES, never values:",
-    "#   app_secret_env / gitlab_token_env reference keys in ~/.larkway/.env (chmod 0600).",
+    "#   app_secret_env / git_token_env reference keys in ~/.larkway/.env (chmod 0600).",
     "# L2 \u804C\u80FD memory lives alongside in <id>.memory.md (memory_file points at it).",
     ""
   ].join("\n");
@@ -122196,14 +122204,14 @@ async function runAdd(ctx, args) {
     });
     if (repoSlug) {
       const repoBranch = await ui.prompt("\u9ED8\u8BA4\u5206\u652F:", {
-        default: setMap.get("repo_branch") ?? "master",
+        default: setMap.get("repo_branch") ?? "main",
         nonInteractive: flags.nonInteractive
       });
-      const repoUrl = await ui.prompt("clone URL (\u53EF\u9009,\u7559\u7A7A=\u7528\u9ED8\u8BA4 remote \u63A8\u5BFC):", {
+      const repoUrl = await ui.prompt("clone URL (\u5EFA\u8BAE\u586B\u5199;agent \u7528\u5B83 clone):", {
         default: setMap.get("repo_url") ?? "",
         nonInteractive: flags.nonInteractive
       });
-      const repoEntry = { slug: repoSlug, branch: repoBranch || "master" };
+      const repoEntry = { slug: repoSlug, branch: repoBranch || "main" };
       if (repoUrl) repoEntry.url = repoUrl;
       repos.push(repoEntry);
     }
@@ -122212,7 +122220,7 @@ async function runAdd(ctx, args) {
     if (repoSlug) {
       const repoEntry = {
         slug: repoSlug,
-        branch: setMap.get("repo_branch") ?? "master"
+        branch: setMap.get("repo_branch") ?? "main"
       };
       const repoUrl = setMap.get("repo_url");
       if (repoUrl) repoEntry.url = repoUrl;
@@ -122220,12 +122228,11 @@ async function runAdd(ctx, args) {
     }
   }
   let gitlab_token_env;
-  const defaultGitlabTokenEnv2 = repos.length > 0 ? `LARKWAY_${id.toUpperCase().replace(/-/g, "_")}_GITLAB_TOKEN` : "";
-  if (flags.advanced || setMap.has("gitlab_token_env") || repos.length > 0) {
+  if (flags.advanced || setMap.has("gitlab_token_env")) {
     const rawGitlab = await ui.prompt(
-      "Git access token \u73AF\u5883\u53D8\u91CF\u540D(\u4EC5\u8BB0\u5F55 KEY,\u771F\u503C\u5199 ~/.larkway/.env):",
+      "Git access token \u73AF\u5883\u53D8\u91CF\u540D(\u53EF\u9009;\u79C1\u6709\u5E93/push/MR \u624D\u9700\u8981):",
       {
-        default: setMap.get("gitlab_token_env") ?? defaultGitlabTokenEnv2,
+        default: setMap.get("gitlab_token_env") ?? "",
         nonInteractive: flags.nonInteractive
       }
     );
@@ -122236,10 +122243,6 @@ async function runAdd(ctx, args) {
       return 1;
     }
   }
-  if (repos.length > 0 && !gitlab_token_env) {
-    ui.failure("agent_workspace repo bot \u5FC5\u987B\u58F0\u660E git_token_env(\u6216 gitlab_token_env);v0.3 \u4E0D\u7EE7\u627F\u5168\u5C40 GITLAB_TOKEN\u3002");
-    return 1;
-  }
   let lark_cli_profile;
   if (flags.advanced || setMap.has("lark_cli_profile")) {
     const rawProfile = await ui.prompt(
@@ -124003,24 +124006,16 @@ import { spawn as spawn4 } from "node:child_process";
 import { readFile as readFile10, access as access9 } from "node:fs/promises";
 import "node:module";
 import path17 from "node:path";
-var DEFAULT_GITLAB_HOST = "github.com";
-var DEFAULT_RELEASE_REPO = "chuckwu0/larkway";
-var LATEST_TGZ_NAME = "larkway-latest.tgz";
-function buildLatestUrl(gitlabHost, repo) {
-  return `https://${gitlabHost}/git/${repo}/-/releases/permalink/latest/downloads/${LATEST_TGZ_NAME}`;
+var DEFAULT_NPM_PACKAGE_SPEC = "larkway@latest";
+function resolveNpmPackageSpec() {
+  return process.env["LARKWAY_UPDATE_URL"] ?? DEFAULT_NPM_PACKAGE_SPEC;
 }
-function resolveReleaseCoords() {
-  const gitlabHost = process.env["GITLAB_HOST"] ?? DEFAULT_GITLAB_HOST;
-  const repo = process.env["LARKWAY_RELEASE_REPO"] ?? DEFAULT_RELEASE_REPO;
-  const latestUrl = process.env["LARKWAY_UPDATE_URL"] ?? buildLatestUrl(gitlabHost, repo);
-  return { gitlabHost, repo, latestUrl };
-}
-function buildReleaseSteps(latestUrl, cwd) {
+function buildNpmSteps(packageSpec, cwd) {
   return [
     {
-      label: `npm i -g ${latestUrl}`,
+      label: `npm i -g ${packageSpec}`,
       cmd: "npm",
-      args: ["i", "-g", latestUrl],
+      args: ["i", "-g", packageSpec],
       cwd
     },
     {
@@ -124174,24 +124169,24 @@ async function run7(ctx, args) {
   const { ui, flags, cwd } = ctx;
   const isDryRun = args.includes("--dry-run");
   const forceGitPull = args.includes("--git-pull");
-  const { latestUrl } = resolveReleaseCoords();
+  const packageSpec = resolveNpmPackageSpec();
   if (!forceGitPull) {
-    const releaseSteps = buildReleaseSteps(latestUrl, cwd);
+    const npmSteps = buildNpmSteps(packageSpec, cwd);
     const lifecycleLabels2 = /* @__PURE__ */ new Set(["larkway stop (bridge lifecycle)", "larkway start (bridge lifecycle)"]);
     if (isDryRun) {
       if (flags.json) {
         ui.emitJson({
           ok: true,
           dryRun: true,
-          mode: "release",
-          latestUrl,
-          steps: releaseSteps.map((s) => ({ label: s.label, cmd: s.cmd, args: s.args, cwd: s.cwd }))
+          mode: "npm",
+          packageSpec,
+          steps: npmSteps.map((s) => ({ label: s.label, cmd: s.cmd, args: s.args, cwd: s.cwd }))
         });
       } else {
-        ui.print(ui.bold("larkway update --dry-run  (release \u6E90\u6A21\u5F0F)"));
-        ui.print(ui.dim(`  latest url: ${latestUrl}`));
+        ui.print(ui.bold("larkway update --dry-run  (npm \u6E90\u6A21\u5F0F)"));
+        ui.print(ui.dim(`  package: ${packageSpec}`));
         ui.print("");
-        releaseSteps.forEach((s, i) => {
+        npmSteps.forEach((s, i) => {
           ui.print(`  ${ui.cyan(String(i + 1) + ".")} ${s.label}`);
           ui.print(ui.dim(`     $ ${s.cmd} ${s.args.join(" ")}`));
         });
@@ -124202,14 +124197,14 @@ async function run7(ctx, args) {
       return 0;
     }
     if (flags.json) {
-      ui.emitJson({ ok: true, status: "starting", mode: "release", latestUrl, stepCount: releaseSteps.length });
+      ui.emitJson({ ok: true, status: "starting", mode: "npm", packageSpec, stepCount: npmSteps.length });
     } else {
-      ui.print(ui.bold("larkway update  (release \u6E90)"));
-      ui.print(ui.dim(`  latest: ${latestUrl}`));
+      ui.print(ui.bold("larkway update  (npm \u6E90)"));
+      ui.print(ui.dim(`  package: ${packageSpec}`));
     }
-    const { ok: ok3, lifecycleWarnings: lifecycleWarnings2 } = await runSteps(releaseSteps, lifecycleLabels2, flags, ui);
+    const { ok: ok3, lifecycleWarnings: lifecycleWarnings2 } = await runSteps(npmSteps, lifecycleLabels2, flags, ui);
     if (!ok3) {
-      const fallbackMsg = "release \u5347\u7EA7\u5931\u8D25\u3002\u82E5\u7F51\u7EDC\u4E0D\u901A\u6216 latest \u94FE\u63A5\u672A\u5C31\u7EEA,\u53EF\u6539\u7528 `larkway update --git-pull` \u8D70 git pull + build \u8DEF\u5F84\u3002";
+      const fallbackMsg = "npm \u5347\u7EA7\u5931\u8D25\u3002\u82E5\u7F51\u7EDC\u4E0D\u901A\u3001npm \u6743\u9650\u4E0D\u8DB3\u6216\u6E90\u4E0D\u53EF\u7528,\u53EF\u6539\u7528 `larkway update --git-pull` \u8D70 git pull + build \u8DEF\u5F84\u3002";
       if (flags.json) {
         ui.emitJson({ ok: false, hint: fallbackMsg });
       } else {
@@ -124223,14 +124218,14 @@ async function run7(ctx, args) {
       if (hadWarning2) {
         ui.emitJson({ ok: true, status: "complete_with_warnings", warning: lifecycleWarnings2.join("; ") });
       } else {
-        ui.emitJson({ ok: true, status: "complete", mode: "release" });
+        ui.emitJson({ ok: true, status: "complete", mode: "npm" });
       }
     } else {
       ui.print("");
       if (hadWarning2) {
         ui.success("larkway update \u5B8C\u6210,\u4F46 bridge \u9700\u624B\u52A8\u91CD\u542F(\u8BF7\u8FD0\u884C `larkway start`)\u3002");
       } else {
-        ui.success("larkway update \u5B8C\u6210\u3002\u5DF2\u5347\u7EA7\u5230\u6700\u65B0 release,bridge \u5DF2\u91CD\u542F\u3002");
+        ui.success("larkway update \u5B8C\u6210\u3002\u5DF2\u5347\u7EA7\u5230\u6700\u65B0 npm \u7248\u672C,bridge \u5DF2\u91CD\u542F\u3002");
       }
     }
     return 0;
@@ -124556,10 +124551,10 @@ function defaultOnboardPermissionRequests(input) {
     items.push(`Feishu chat allowlist: ${input.chats.join(", ")}`);
   }
   for (const repo of input.repos) {
-    items.push(`GitLab repo pointer: ${repo.slug} (${repo.branch})`);
+    items.push(`Git repo pointer: ${repo.slug} (${repo.branch})`);
   }
   if (input.gitlab_token_env) {
-    items.push(`GitLab token env name: ${input.gitlab_token_env}`);
+    items.push(`Agent-level Git token env name: ${input.gitlab_token_env}`);
   }
   items.push("Local shell inside the Agent Workspace for task execution and verification");
   return items;
@@ -124706,6 +124701,128 @@ async function cancelOnboard(sessionId) {
   return { cancelled: true };
 }
 
+// src/runtimeRequirements.ts
+import { execFileSync } from "node:child_process";
+function checkCli(command) {
+  try {
+    execFileSync("which", [command], { stdio: ["pipe", "pipe", "pipe"] });
+  } catch {
+    return { ok: false };
+  }
+  try {
+    const version = execFileSync(command, ["--version"], { stdio: ["pipe", "pipe", "pipe"] }).toString().trim().split("\n")[0];
+    return { ok: true, ...version ? { version } : {} };
+  } catch {
+    return { ok: true };
+  }
+}
+function repoLooksGitLab(urlOrSlug) {
+  return /(^|[./:@-])gitlab([./:@-]|$)/i.test(urlOrSlug);
+}
+function botUsesGitLab(bot) {
+  return bot.repos.some((repo) => repoLooksGitLab(repo.url ?? repo.slug));
+}
+function addCliRequirement(requirements, input) {
+  const existing = requirements.get(`cli:${input.command}`);
+  if (existing) {
+    existing.botIds = Array.from(/* @__PURE__ */ new Set([...existing.botIds, ...input.botIds])).sort();
+    if (existing.severity === "optional" && input.severity === "required") {
+      existing.severity = "required";
+    }
+    return;
+  }
+  const probe = checkCli(input.command);
+  requirements.set(`cli:${input.command}`, {
+    id: `cli:${input.command}`,
+    label: input.label ?? input.command,
+    command: input.command,
+    kind: "cli",
+    severity: input.severity,
+    ok: probe.ok,
+    ...probe.version ? { version: probe.version } : {},
+    reason: input.reason,
+    ...input.installHint ? { installHint: input.installHint } : {},
+    botIds: Array.from(new Set(input.botIds)).sort()
+  });
+}
+function addSecretRequirement(requirements, input) {
+  const id = `secret:${input.envName}`;
+  const existing = requirements.get(id);
+  if (existing) {
+    existing.botIds = Array.from(/* @__PURE__ */ new Set([...existing.botIds, ...input.botIds])).sort();
+    return;
+  }
+  const value = process.env[input.envName];
+  requirements.set(id, {
+    id,
+    label: input.envName,
+    kind: "secret",
+    severity: input.severity ?? "required",
+    ok: value != null && value !== "",
+    reason: input.reason,
+    installHint: `Set ${input.envName} in ~/.larkway/.env and restart Larkway.`,
+    botIds: Array.from(new Set(input.botIds)).sort()
+  });
+}
+function runtimeRequirementsForBots(bots) {
+  const requirements = /* @__PURE__ */ new Map();
+  if (bots.length > 0) {
+    addCliRequirement(requirements, {
+      command: "lark-cli",
+      label: "Feishu CLI",
+      severity: "required",
+      botIds: bots.map((bot) => bot.id),
+      reason: "Required for agents to read Feishu topic history, attachments, docs, and other context.",
+      installHint: "Install and configure lark-cli, then restart Larkway."
+    });
+  }
+  for (const bot of bots) {
+    addCliRequirement(requirements, {
+      command: bot.backend ?? "claude",
+      severity: "required",
+      botIds: [bot.id],
+      reason: `Required to run this bot's ${bot.backend ?? "claude"} backend.`
+    });
+    if (bot.runtime === "agent_workspace" && bot.repos.length > 0) {
+      const tokenEnvName = bot.git_token_env ?? bot.gitlab_token_env;
+      if (tokenEnvName) {
+        addSecretRequirement(requirements, {
+          envName: tokenEnvName,
+          botIds: [bot.id],
+          severity: "optional",
+          reason: "Optional Git identity material. When absent, agents use the host's normal Git auth."
+        });
+      } else {
+        requirements.set(`secret:missing-git-token:${bot.id}`, {
+          id: `secret:missing-git-token:${bot.id}`,
+          label: "Git access token env",
+          kind: "secret",
+          severity: "optional",
+          ok: false,
+          reason: `Bot "${bot.id}" has repo pointers but no git_token_env. It will use the host's normal Git auth.`,
+          installHint: "Add a Git access token only when you want this agent to use a specific GitHub/GitLab identity.",
+          botIds: [bot.id]
+        });
+      }
+    }
+    if (botUsesGitLab(bot)) {
+      addCliRequirement(requirements, {
+        command: "glab",
+        label: "GitLab CLI",
+        severity: "optional",
+        botIds: [bot.id],
+        reason: "Only needed when an agent uses GitLab-specific actions such as MRs, pipelines, or releases.",
+        installHint: "Install glab only for bots that need GitLab-specific workflow commands."
+      });
+    }
+  }
+  return [...requirements.values()].sort((a, b) => {
+    if (a.severity !== b.severity) return a.severity === "required" ? -1 : 1;
+    if (a.kind !== b.kind) return a.kind === "cli" ? -1 : 1;
+    return a.label.localeCompare(b.label);
+  });
+}
+
 // src/web/api.ts
 var execFileAsync7 = promisify8(execFileCallback2);
 var CHAT_NAME_CACHE_MS = 5 * 60 * 1e3;
@@ -125395,6 +125512,22 @@ var getBridgeLogs = async (req) => {
     json: result
   };
 };
+var getRuntimeRequirements = async (req) => {
+  const { ctx } = req;
+  const ids = await ctx.stores.botsStore.listBots();
+  const bots = await Promise.all(
+    ids.map(async (id) => ctx.stores.botsStore.readBot(id))
+  );
+  const requirements = runtimeRequirementsForBots(bots);
+  return {
+    status: 200,
+    json: {
+      requirements,
+      missingRequired: requirements.filter((req2) => req2.severity === "required" && !req2.ok),
+      missingOptional: requirements.filter((req2) => req2.severity === "optional" && !req2.ok)
+    }
+  };
+};
 var BACKEND_META = {
   claude: { id: "claude", name: "Claude Code", short: "Claude", vendor: "Anthropic \u8BA2\u9605", mono: "CC" },
   codex: { id: "codex", name: "Codex", short: "Codex", vendor: "OpenAI \u8BA2\u9605", mono: "CX" }
@@ -125436,6 +125569,7 @@ var ROUTES = {
   "GET /api/bridge": getBridge,
   "POST /api/bridge/restart": postBridgeRestart,
   "GET /api/bridge/logs": getBridgeLogs,
+  "GET /api/runtime/requirements": getRuntimeRequirements,
   "GET /api/backends": getBackends
 };
 function matchRoute(method, pathname, routes = ROUTES) {