@chrysb/alphaclaw 0.9.17 → 0.9.19

package/README.md

@@ -157,7 +157,35 @@ The built-in watchdog monitors gateway health and recovers from failures automat
 | `WATCHDOG_NOTIFICATIONS_DISABLED` | Optional | Disable watchdog notifications (`true`/`false`)    |
 | `PORT`                            | Optional | Server port (default `3000`)                       |
 | `ALPHACLAW_ROOT_DIR`              | Optional | Data directory (default `/data`)                   |
+| `ALPHACLAW_SKIP_SYSTEM_CRON_INSTALL` | Optional | Skip writes to `/etc/cron.d` while keeping cron config (`true`/`false`); the managed hourly script still exits when sync is disabled |
+| `ALPHACLAW_GIT_SHIM_PATH`         | Optional | Install the managed git auth shim at this path and prepend its directory to runtime `PATH` (default `/usr/local/bin/git`) |
+| `ALPHACLAW_GIT_ASKPASS_PATH`      | Optional | Install the git askpass helper at this path (default `$TMPDIR/alphaclaw-git-askpass.sh`) |
 | `TRUST_PROXY_HOPS`                | Optional | Trust proxy hop count for correct client IP        |
+| `REMOTE_MCP_URL`                  | Optional | Upstream remote MCP server URL. When set together with `REMOTE_MCP_API_TOKEN`, AlphaClaw writes a managed `mcp.servers.<name>` entry to `openclaw.json` on every gateway start. |
+| `REMOTE_MCP_API_TOKEN`            | Optional | Bearer token for the remote MCP server. Persisted in `openclaw.json` as the `${REMOTE_MCP_API_TOKEN}` reference, never as plaintext. |
+| `REMOTE_MCP_NAME`                 | Optional | Key under `mcp.servers.<name>`. Defaults to `remote`. Set it to label the entry (e.g. `sure`, `notion`). |
+| `REMOTE_MCP_PROXY_URL`            | Optional | When set, OpenClaw connects here instead of `REMOTE_MCP_URL`. Intended for a same-host scanning proxy (e.g. `pipelock mcp proxy --listen <REMOTE_MCP_PROXY_URL> --upstream <REMOTE_MCP_URL>`). Implementation is proxy-agnostic. |
+
+## OpenAI-compatible `/v1` proxy
+
+AlphaClaw can expose an OpenAI-compatible API surface on the same public port as the Setup UI. It is disabled by default. Enable it from the Setup UI under General -> Features -> API; the setting is persisted in `alphaclaw.json` in the OpenClaw repo so workspace sync can commit the change.
+
+| Path                            | Method  | Notes                                                              |
+| ------------------------------- | ------- | ------------------------------------------------------------------ |
+| `/v1/chat/completions`          | POST    | Streams when `stream: true`. Use `model: "openclaw/default"` or `openclaw/<agentId>`. |
+| `/v1/responses`                 | POST    | OpenClaw's `/v1/responses` surface (enabled together with chat completions). |
+| `/v1/embeddings`                | POST    | Routes to OpenClaw's embeddings endpoint.                          |
+| `/v1/models`, `/v1/models/<id>` | GET     | Lists OpenClaw agent targets.                                      |
+
+When enabled, the proxy forwards requests to the loopback OpenClaw gateway. AlphaClaw requires `Authorization: Bearer <OPENCLAW_GATEWAY_TOKEN>` and rejects requests when the gateway token is missing or does not match before forwarding to OpenClaw. Failed bearer-token attempts are rate-limited before proxying. The setup-UI cookie is stripped before forwarding, hop-by-hop response headers are not passed through, and `/v1` JSON request bodies are accepted up to 50 MB. When disabled or missing from `alphaclaw.json`, `/v1` requests return 404.
+
+**Security boundary (important).** OpenClaw treats `/v1/chat/completions` as a full operator-access surface. A caller with a valid `OPENCLAW_GATEWAY_TOKEN` can run any tool the configured agent profile allows. Treat this token like an owner credential:
+
+- Use this surface only for trusted server-to-server callers (for example, a self-hosted app that needs OpenClaw as its external assistant).
+- Do not hand the gateway token to end-user clients.
+- If your front door is public (Render, Fly, fly-style PaaS), make sure `SETUP_PASSWORD` is strong and that the gateway token is held by exactly one trusted backend.
+
+When `REMOTE_MCP_URL` + `REMOTE_MCP_API_TOKEN` are set, AlphaClaw also registers an `mcp.servers.<REMOTE_MCP_NAME>` block (default key `remote`) in `openclaw.json` so the agent can call back into that remote MCP server. Set `REMOTE_MCP_PROXY_URL` to route those callbacks through a same-host scanning proxy (for example a Pipelock MCP reverse proxy running in the same container).
 
 ## Security Notes
 

package/bin/alphaclaw.js

@@ -6,6 +6,10 @@ const os = require("os");
 const path = require("path");
 const { execSync } = require("child_process");
 const {
+  shouldSkipSystemCronInstall,
+  resolveGitAskPassPath,
+  resolveGitShimPath,
+  prependGitShimDirToPath,
   normalizeGitSyncFilePath,
   validateGitSyncFilePath,
   resolveRealGitPath,
@@ -16,6 +20,9 @@ const {
   restoreMissingOpenclawConfigFromRemote,
 } = require("../lib/cli/openclaw-config-restore");
 const { buildSecretReplacements } = require("../lib/server/helpers");
+const {
+  migrateLegacyTelegramStreamingConfig,
+} = require("../lib/server/openclaw-config-migrations");
 const {
   migrateManagedInternalFiles,
 } = require("../lib/server/internal-files-migration");
@@ -278,7 +285,7 @@ const runGitSync = () => {
   }
 
   const realGitPath = resolveRealGitPath({
-    shimPath: "/usr/local/bin/git",
+    shimPath: resolveGitShimPath(),
   });
   if (!realGitPath) {
     console.error(
@@ -631,7 +638,11 @@ if (fs.existsSync(hourlyGitSyncPath)) {
     }
 
     const cronFilePath = "/etc/cron.d/openclaw-hourly-sync";
-    if (cronEnabled) {
+    if (shouldSkipSystemCronInstall()) {
+      console.log(
+        "[alphaclaw] System cron setup skipped by ALPHACLAW_SKIP_SYSTEM_CRON_INSTALL",
+      );
+    } else if (cronEnabled) {
       const cronContent = [
         "SHELL=/bin/bash",
         "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
@@ -732,7 +743,10 @@ if (fs.existsSync(configPath)) {
     if (!cfg.plugins.load) cfg.plugins.load = {};
     if (!Array.isArray(cfg.plugins.load.paths)) cfg.plugins.load.paths = [];
     if (!cfg.plugins.entries) cfg.plugins.entries = {};
-    let changed = false;
+    let changed = migrateLegacyTelegramStreamingConfig(cfg);
+    if (changed) {
+      console.log("[alphaclaw] Migrated legacy Telegram streaming config");
+    }
 
     if (process.env.TELEGRAM_BOT_TOKEN && !cfg.channels.telegram) {
       cfg.channels.telegram = {
@@ -819,11 +833,17 @@ try {
 
 try {
   const gitAskPassSrc = path.join(__dirname, "..", "lib", "scripts", "git-askpass");
-  const gitAskPassDest = "/tmp/alphaclaw-git-askpass.sh";
+  const gitAskPassDest = resolveGitAskPassPath({
+    tmpDir: os.tmpdir(),
+  });
   const gitShimTemplatePath = path.join(__dirname, "..", "lib", "scripts", "git");
-  const gitShimDest = "/usr/local/bin/git";
+  const gitShimDest = resolveGitShimPath();
+  process.env.PATH = prependGitShimDirToPath({
+    shimPath: gitShimDest,
+  });
 
   if (fs.existsSync(gitAskPassSrc)) {
+    fs.mkdirSync(path.dirname(gitAskPassDest), { recursive: true });
     fs.copyFileSync(gitAskPassSrc, gitAskPassDest);
     fs.chmodSync(gitAskPassDest, 0o755);
   }
@@ -837,7 +857,9 @@ try {
     const gitShimTemplate = fs.readFileSync(gitShimTemplatePath, "utf8");
     const gitShimContent = gitShimTemplate
       .replace("@@REAL_GIT@@", realGitPath)
-      .replace("@@OPENCLAW_REPO_ROOT@@", openclawDir);
+      .replace("@@OPENCLAW_REPO_ROOT@@", openclawDir)
+      .replace("@@ASKPASS_PATH@@", gitAskPassDest);
+    fs.mkdirSync(path.dirname(gitShimDest), { recursive: true });
     fs.writeFileSync(gitShimDest, gitShimContent, { mode: 0o755 });
     console.log("[alphaclaw] git auth shim installed");
   }

package/lib/cli/git-runtime.js

@@ -2,6 +2,43 @@ const fs = require("fs");
 const path = require("path");
 const { execSync } = require("child_process");
 
+const isEnabledEnvFlag = (value) =>
+  ["1", "true", "yes", "on"].includes(
+    String(value || "").trim().toLowerCase(),
+  );
+
+const shouldSkipSystemCronInstall = ({ env = process.env } = {}) =>
+  isEnabledEnvFlag(env.ALPHACLAW_SKIP_SYSTEM_CRON_INSTALL);
+
+const resolveGitAskPassPath = ({ env = process.env, tmpDir = "/tmp" } = {}) => {
+  const explicitPath = String(env.ALPHACLAW_GIT_ASKPASS_PATH || "").trim();
+  if (explicitPath) return explicitPath;
+
+  const runtimeTmpDir =
+    String(env.TMPDIR || "").trim() || String(tmpDir || "").trim() || "/tmp";
+  return path.join(runtimeTmpDir, "alphaclaw-git-askpass.sh");
+};
+
+const resolveGitShimPath = ({ env = process.env } = {}) => {
+  const explicitPath = String(env.ALPHACLAW_GIT_SHIM_PATH || "").trim();
+  return explicitPath || "/usr/local/bin/git";
+};
+
+const prependGitShimDirToPath = ({
+  env = process.env,
+  shimPath = resolveGitShimPath({ env }),
+} = {}) => {
+  if (!String(env.ALPHACLAW_GIT_SHIM_PATH || "").trim()) {
+    return env.PATH || process.env.PATH || "";
+  }
+  const shimDir = path.dirname(String(shimPath || "").trim());
+  if (!shimDir || shimDir === ".") return env.PATH || process.env.PATH || "";
+  const pathEntries = String(env.PATH || process.env.PATH || "")
+    .split(path.delimiter)
+    .filter((entry) => entry && entry !== shimDir);
+  return [shimDir, ...pathEntries].join(path.delimiter);
+};
+
 const normalizeGitSyncFilePath = (requestedFilePath) => {
   const rawPath = String(requestedFilePath || "").trim();
   if (!rawPath) return "";
@@ -90,6 +127,10 @@ const shouldRefreshHourlyGitSyncScript = ({
 };
 
 module.exports = {
+  shouldSkipSystemCronInstall,
+  resolveGitAskPassPath,
+  resolveGitShimPath,
+  prependGitShimDirToPath,
   normalizeGitSyncFilePath,
   validateGitSyncFilePath,
   resolveRealGitPath,

package/lib/cli/openclaw-config-restore.js

@@ -27,7 +27,7 @@ const resolveCurrentBranch = ({ execSyncImpl, openclawDir }) => {
 
 const createGitEnv = ({ fsModule, osModule, env, processId }) => {
   const githubToken = String(env.GITHUB_TOKEN || "").trim();
-  const gitEnv = { ...env };
+  const gitEnv = { ...env, PATH: env.PATH || process.env.PATH };
   if (!githubToken) {
     return { gitEnv, askPassPath: "" };
   }