@chrysb/alphaclaw 0.2.0 → 0.2.1

package/bin/alphaclaw.js

@@ -252,13 +252,17 @@ const runGitSync = () => {
   }
 
   const originUrl = `https://github.com/${githubRepo}.git`;
-  const branch =
-    String(
-      execSync("git rev-parse --abbrev-ref HEAD", {
-        cwd: openclawDir,
-        encoding: "utf8",
-      }),
-    ).trim() || "main";
+  let branch = "main";
+  try {
+    branch =
+      String(
+        execSync("git symbolic-ref --short HEAD", {
+          cwd: openclawDir,
+          encoding: "utf8",
+          stdio: ["ignore", "pipe", "ignore"],
+        }),
+      ).trim() || "main";
+  } catch {}
   const askPassPath = path.join(
     os.tmpdir(),
     `alphaclaw-git-askpass-${process.pid}.sh`,
@@ -294,6 +298,8 @@ const runGitSync = () => {
     );
 
     runGit(`remote set-url origin ${quoteArg(originUrl)}`);
+    runGit(`config user.name ${quoteArg("AlphaClaw Agent")}`);
+    runGit(`config user.email ${quoteArg("agent@alphaclaw.md")}`);
     try {
       runGit(`ls-remote --exit-code --heads origin ${quoteArg(branch)}`, {
         withAuth: true,
@@ -316,6 +322,9 @@ const runGitSync = () => {
     runGit(`push origin ${quoteArg(branch)}`, { withAuth: true });
     const hash = String(runGit("rev-parse --short HEAD")).trim();
     console.log(`[alphaclaw] Git sync complete (${hash})`);
+    console.log(
+      `[alphaclaw] Commit URL: https://github.com/${githubRepo}/commit/${hash}`,
+    );
     return 0;
   } catch (e) {
     const details = String(e.stderr || e.stdout || e.message || "").trim();

package/lib/public/js/components/channels.js

@@ -17,7 +17,7 @@ export function Channels({ channels, onSwitchTab, onNavigate }) {
         ${channels ? ALL_CHANNELS.map(ch => {
           const info = channels[ch];
           const channelMeta = kChannelMeta[ch] || { label: ch.charAt(0).toUpperCase() + ch.slice(1), iconSrc: '' };
-          const isClickable = ch === 'telegram' && info && onNavigate;
+          const isClickable = ch === 'telegram' && info?.status === 'paired' && onNavigate;
           let badge;
           if (!info) {
             badge = html`<a

package/lib/public/js/components/onboarding/welcome-form-step.js

@@ -36,6 +36,7 @@ export const WelcomeFormStep = ({
   goBack,
   goNext,
   loading,
+  githubStepLoading,
   allValid,
   handleSubmit,
 }) => {
@@ -276,10 +277,12 @@ export const WelcomeFormStep = ({
               : html`<div class="w-full"></div>`}
             <button
               onclick=${goNext}
-              disabled=${!currentGroupValid}
+              disabled=${!currentGroupValid || githubStepLoading}
               class="w-full text-sm font-medium px-4 py-2 rounded-xl transition-all ac-btn-cyan"
             >
-              Next
+              ${activeGroup.id === "github" && githubStepLoading
+                ? "Checking..."
+                : "Next"}
             </button>
           `
         : html`

package/lib/public/js/components/onboarding/welcome-setup-step.js

@@ -78,7 +78,7 @@ export const WelcomeSetupStep = ({ error, loading, onRetry, onBack }) => {
   const currentTip = kSetupTips[tipIndex];
 
   return html`
-    <div class="min-h-[320px] py-4 flex flex-col">
+    <div class="relative min-h-[320px] pt-4 pb-20 flex">
       <div
         class="flex-1 flex flex-col items-center justify-center text-center gap-4"
       >
@@ -107,7 +107,7 @@ export const WelcomeSetupStep = ({ error, loading, onRetry, onBack }) => {
         <p class="text-sm text-gray-500">This could take 10-15 seconds</p>
       </div>
       <div
-        class="mt-3 bg-black/20 border border-border rounded-lg px-3 py-2 text-xs text-gray-500"
+        class="absolute bottom-3 left-3 right-3 bg-black/20 border border-border rounded-lg px-3 py-2 text-xs text-gray-500"
       >
         <span class="text-gray-400">${currentTip.label}: </span>
         ${currentTip.text}

package/lib/public/js/components/welcome.js

@@ -3,6 +3,7 @@ import { useState, useEffect, useRef } from "https://esm.sh/preact/hooks";
 import htm from "https://esm.sh/htm";
 import {
   runOnboard,
+  verifyGithubOnboardingRepo,
   fetchModels,
   fetchCodexStatus,
   disconnectCodex,
@@ -58,6 +59,7 @@ export const Welcome = ({ onComplete }) => {
   const [codexAuthStarted, setCodexAuthStarted] = useState(false);
   const [codexAuthWaiting, setCodexAuthWaiting] = useState(false);
   const [loading, setLoading] = useState(false);
+  const [githubStepLoading, setGithubStepLoading] = useState(false);
   const [error, setError] = useState(null);
   const codexPopupPollRef = useRef(null);
 
@@ -360,8 +362,27 @@ export const Welcome = ({ onComplete }) => {
     setStep(kWelcomeGroups.length - 1);
   };
 
-  const goNext = () => {
+  const goNext = async () => {
     if (!activeGroup || !currentGroupValid) return;
+    if (activeGroup.id === "github") {
+      setGithubStepLoading(true);
+      setError(null);
+      try {
+        const result = await verifyGithubOnboardingRepo(
+          vals.GITHUB_WORKSPACE_REPO,
+          vals.GITHUB_TOKEN,
+        );
+        if (!result?.ok) {
+          setError(result?.error || "GitHub verification failed");
+          return;
+        }
+      } catch (err) {
+        setError(err?.message || "GitHub verification failed");
+        return;
+      } finally {
+        setGithubStepLoading(false);
+      }
+    }
     setStep((prev) => Math.min(kWelcomeGroups.length - 1, prev + 1));
   };
 
@@ -438,6 +459,7 @@ export const Welcome = ({ onComplete }) => {
                 goBack=${goBack}
                 goNext=${goNext}
                 loading=${loading}
+                githubStepLoading=${githubStepLoading}
                 allValid=${allValid}
                 handleSubmit=${handleSubmit}
               />

package/lib/public/js/lib/api.js

@@ -167,6 +167,15 @@ export async function runOnboard(vars, modelKey) {
   return res.json();
 }
 
+export async function verifyGithubOnboardingRepo(repo, token) {
+  const res = await authFetch('/api/onboard/github/verify', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ repo, token }),
+  });
+  return res.json();
+}
+
 export const fetchModels = async () => {
   const res = await authFetch('/api/models');
   return res.json();

package/lib/server/onboarding/github.js

@@ -1,48 +1,114 @@
-const ensureGithubRepoAccessible = async ({ repoUrl, repoName, githubToken }) => {
-  const ghHeaders = {
-    Authorization: `token ${githubToken}`,
-    "User-Agent": "openclaw-railway",
-    Accept: "application/vnd.github+json",
-  };
+const buildGithubHeaders = (githubToken) => ({
+  Authorization: `token ${githubToken}`,
+  "User-Agent": "openclaw-railway",
+  Accept: "application/vnd.github+json",
+});
 
+const parseGithubErrorMessage = async (response) => {
   try {
-    const checkRes = await fetch(`https://api.github.com/repos/${repoUrl}`, {
+    const payload = await response.json();
+    if (typeof payload?.message === "string" && payload.message.trim()) {
+      return payload.message.trim();
+    }
+  } catch {}
+  return response.statusText || `HTTP ${response.status}`;
+};
+
+const verifyGithubRepoForOnboarding = async ({ repoUrl, githubToken }) => {
+  const ghHeaders = buildGithubHeaders(githubToken);
+  const [repoOwner] = String(repoUrl || "").split("/", 1);
+
+  try {
+    const userRes = await fetch("https://api.github.com/user", {
       headers: ghHeaders,
     });
+    if (!userRes.ok) {
+      const details = await parseGithubErrorMessage(userRes);
+      return {
+        ok: false,
+        status: 400,
+        error: `Cannot verify GitHub token: ${details}`,
+      };
+    }
+    const authedUser = await userRes.json().catch(() => ({}));
+    const authedLogin = String(authedUser?.login || "").trim();
+    if (
+      repoOwner &&
+      authedLogin &&
+      repoOwner.toLowerCase() !== authedLogin.toLowerCase()
+    ) {
+      return {
+        ok: false,
+        status: 400,
+        error: `Workspace repo owner must match your token user "${authedLogin}"`,
+      };
+    }
 
+    const checkRes = await fetch(`https://api.github.com/repos/${repoUrl}`, {
+      headers: ghHeaders,
+    });
     if (checkRes.status === 404) {
-      console.log(`[onboard] Creating repo ${repoUrl}...`);
-      const createRes = await fetch("https://api.github.com/user/repos", {
-        method: "POST",
-        headers: { ...ghHeaders, "Content-Type": "application/json" },
-        body: JSON.stringify({
-          name: repoName,
-          private: true,
-          auto_init: false,
-        }),
-      });
-      if (!createRes.ok) {
-        const err = await createRes.json().catch(() => ({}));
-        return {
-          ok: false,
-          status: 400,
-          error: `Failed to create repo: ${err.message || createRes.statusText}`,
-        };
-      }
-      console.log(`[onboard] Repo ${repoUrl} created`);
       return { ok: true };
     }
+    if (checkRes.ok) {
+      return {
+        ok: false,
+        status: 400,
+        error: `Repository "${repoUrl}" already exists.`,
+      };
+    }
 
-    if (checkRes.ok) return { ok: true };
-
+    const details = await parseGithubErrorMessage(checkRes);
     return {
       ok: false,
       status: 400,
-      error: `Cannot access repo "${repoUrl}" — check your token has the "repo" scope`,
+      error: `Cannot verify repo "${repoUrl}": ${details}`,
     };
+  } catch (e) {
+    return {
+      ok: false,
+      status: 400,
+      error: `GitHub verification error: ${e.message}`,
+    };
+  }
+};
+
+const ensureGithubRepoAccessible = async ({
+  repoUrl,
+  repoName,
+  githubToken,
+}) => {
+  const ghHeaders = buildGithubHeaders(githubToken);
+  const verification = await verifyGithubRepoForOnboarding({
+    repoUrl,
+    githubToken,
+  });
+  if (!verification.ok) return verification;
+
+  try {
+    console.log(`[onboard] Creating repo ${repoUrl}...`);
+    const createRes = await fetch("https://api.github.com/user/repos", {
+      method: "POST",
+      headers: { ...ghHeaders, "Content-Type": "application/json" },
+      body: JSON.stringify({
+        name: repoName,
+        private: true,
+        auto_init: false,
+      }),
+    });
+    if (!createRes.ok) {
+      const details = await parseGithubErrorMessage(createRes);
+      return {
+        ok: false,
+        status: 400,
+        error: `Failed to create repo: ${details}`,
+      };
+    }
+    console.log(`[onboard] Repo ${repoUrl} created`);
+    return { ok: true };
   } catch (e) {
     return { ok: false, status: 400, error: `GitHub error: ${e.message}` };
   }
 };
 
-module.exports = { ensureGithubRepoAccessible };
+module.exports = { ensureGithubRepoAccessible, verifyGithubRepoForOnboarding };

package/lib/server/onboarding/index.js

@@ -1,10 +1,22 @@
 const path = require("path");
 const { kSetupDir, kRootDir } = require("../constants");
 const { validateOnboardingInput } = require("./validation");
-const { ensureGithubRepoAccessible } = require("./github");
-const { buildOnboardArgs, writeSanitizedOpenclawConfig } = require("./openclaw");
-const { installControlUiSkill, syncBootstrapPromptFiles } = require("./workspace");
-const { installHourlyGitSyncScript, installHourlyGitSyncCron } = require("./cron");
+const {
+  ensureGithubRepoAccessible,
+  verifyGithubRepoForOnboarding,
+} = require("./github");
+const {
+  buildOnboardArgs,
+  writeSanitizedOpenclawConfig,
+} = require("./openclaw");
+const {
+  installControlUiSkill,
+  syncBootstrapPromptFiles,
+} = require("./workspace");
+const {
+  installHourlyGitSyncScript,
+  installHourlyGitSyncCron,
+} = require("./cron");
 
 const createOnboardingService = ({
   fs,
@@ -22,6 +34,15 @@ const createOnboardingService = ({
 }) => {
   const { OPENCLAW_DIR, WORKSPACE_DIR } = constants;
 
+  const verifyGithubSetup = async ({
+    githubRepoInput,
+    githubToken,
+    resolveGithubRepoUrl,
+  }) => {
+    const repoUrl = resolveGithubRepoUrl(githubRepoInput);
+    return verifyGithubRepoForOnboarding({ repoUrl, githubToken });
+  };
+
   const completeOnboarding = async ({ req, vars, modelKey }) => {
     const validation = validateOnboardingInput({
       vars,
@@ -30,14 +51,24 @@ const createOnboardingService = ({
       hasCodexOauthProfile,
     });
     if (!validation.ok) {
-      return { status: validation.status, body: { ok: false, error: validation.error } };
+      return {
+        status: validation.status,
+        body: { ok: false, error: validation.error },
+      };
     }
 
-    const { varMap, githubToken, githubRepoInput, selectedProvider, hasCodexOauth } =
-      validation.data;
+    const {
+      varMap,
+      githubToken,
+      githubRepoInput,
+      selectedProvider,
+      hasCodexOauth,
+    } = validation.data;
 
     const repoUrl = resolveGithubRepoUrl(githubRepoInput);
-    const varsToSave = [...vars.filter((v) => v.value && v.key !== "GITHUB_WORKSPACE_REPO")];
+    const varsToSave = [
+      ...vars.filter((v) => v.value && v.key !== "GITHUB_WORKSPACE_REPO"),
+    ];
     varsToSave.push({ key: "GITHUB_WORKSPACE_REPO", value: repoUrl });
     writeEnvFile(varsToSave);
     reloadEnv();
@@ -50,22 +81,32 @@ const createOnboardingService = ({
       githubToken,
     });
     if (!repoCheck.ok) {
-      return { status: repoCheck.status, body: { ok: false, error: repoCheck.error } };
+      return {
+        status: repoCheck.status,
+        body: { ok: false, error: repoCheck.error },
+      };
     }
 
     fs.mkdirSync(OPENCLAW_DIR, { recursive: true });
     fs.mkdirSync(WORKSPACE_DIR, { recursive: true });
-    syncBootstrapPromptFiles({ fs, workspaceDir: WORKSPACE_DIR, baseUrl: getBaseUrl(req) });
+    syncBootstrapPromptFiles({
+      fs,
+      workspaceDir: WORKSPACE_DIR,
+      baseUrl: getBaseUrl(req),
+    });
 
     if (!fs.existsSync(`${OPENCLAW_DIR}/.git`)) {
       await shellCmd(
-        `cd ${OPENCLAW_DIR} && git init -b main && git remote add origin "${remoteUrl}" && git config user.email "agent@openclaw.ai" && git config user.name "OpenClaw Agent"`,
+        `cd ${OPENCLAW_DIR} && git init -b main && git remote add origin "${remoteUrl}" && git config user.email "agent@alphaclaw.md" && git config user.name "AlphaClaw Agent"`,
       );
       console.log("[onboard] Git initialized");
     }
 
     if (!fs.existsSync(`${OPENCLAW_DIR}/.gitignore`)) {
-      fs.copyFileSync(path.join(kSetupDir, "gitignore"), `${OPENCLAW_DIR}/.gitignore`);
+      fs.copyFileSync(
+        path.join(kSetupDir, "gitignore"),
+        `${OPENCLAW_DIR}/.gitignore`,
+      );
     }
 
     const onboardArgs = buildOnboardArgs({
@@ -74,14 +115,17 @@ const createOnboardingService = ({
       hasCodexOauth,
       workspaceDir: WORKSPACE_DIR,
     });
-    await shellCmd(`openclaw onboard ${onboardArgs.map((a) => `"${a}"`).join(" ")}`, {
-      env: {
-        ...process.env,
-        OPENCLAW_HOME: kRootDir,
-        OPENCLAW_CONFIG_PATH: `${OPENCLAW_DIR}/openclaw.json`,
+    await shellCmd(
+      `openclaw onboard ${onboardArgs.map((a) => `"${a}"`).join(" ")}`,
+      {
+        env: {
+          ...process.env,
+          OPENCLAW_HOME: kRootDir,
+          OPENCLAW_CONFIG_PATH: `${OPENCLAW_DIR}/openclaw.json`,
+        },
+        timeout: 120000,
       },
-      timeout: 120000,
-    });
+    );
     console.log("[onboard] Onboard complete");
 
     await shellCmd(`openclaw models set "${modelKey}"`, {
@@ -89,7 +133,9 @@ const createOnboardingService = ({
       timeout: 30000,
     }).catch((e) => {
       console.error("[onboard] Failed to set model:", e.message);
-      throw new Error(`Onboarding completed but failed to set model "${modelKey}"`);
+      throw new Error(
+        `Onboarding completed but failed to set model "${modelKey}"`,
+      );
     });
 
     try {
@@ -99,28 +145,33 @@ const createOnboardingService = ({
     writeSanitizedOpenclawConfig({ fs, openclawDir: OPENCLAW_DIR, varMap });
     ensureGatewayProxyConfig(getBaseUrl(req));
 
-    installControlUiSkill({ fs, openclawDir: OPENCLAW_DIR, baseUrl: getBaseUrl(req) });
+    installControlUiSkill({
+      fs,
+      openclawDir: OPENCLAW_DIR,
+      baseUrl: getBaseUrl(req),
+    });
 
-    await shellCmd(
-      `alphaclaw git-sync -m "initial setup"`,
-      {
+    installHourlyGitSyncScript({ fs, openclawDir: OPENCLAW_DIR });
+    await installHourlyGitSyncCron({ fs, openclawDir: OPENCLAW_DIR });
+
+    try {
+      await shellCmd(`alphaclaw git-sync -m "initial setup"`, {
         timeout: 30000,
         env: {
           ...process.env,
           GITHUB_TOKEN: githubToken,
         },
-      },
-    ).catch((e) => console.error("[onboard] Git push error:", e.message));
-    console.log("[onboard] Initial state committed and pushed");
-
-    installHourlyGitSyncScript({ fs, openclawDir: OPENCLAW_DIR });
-    await installHourlyGitSyncCron({ fs, openclawDir: OPENCLAW_DIR });
+      });
+      console.log("[onboard] Initial state committed and pushed");
+    } catch (e) {
+      console.error("[onboard] Git push error:", e.message);
+    }
 
     startGateway();
     return { status: 200, body: { ok: true } };
   };
 
-  return { completeOnboarding };
+  return { completeOnboarding, verifyGithubSetup };
 };
 
 module.exports = { createOnboardingService };

package/lib/server/routes/onboarding.js

@@ -111,6 +111,42 @@ const registerOnboardingRoutes = ({
       res.status(500).json({ ok: false, error: sanitizeOnboardingError(err) });
     }
   });
+
+  app.post("/api/onboard/github/verify", async (req, res) => {
+    if (isOnboarded()) {
+      return res.json({ ok: false, error: "Already onboarded" });
+    }
+
+    try {
+      const githubRepoInput = String(req.body?.repo || "").trim();
+      const githubToken = String(req.body?.token || "").trim();
+      if (!githubRepoInput || !githubToken) {
+        return res
+          .status(400)
+          .json({
+            ok: false,
+            error: "GitHub token and workspace repo are required",
+          });
+      }
+
+      const result = await onboardingService.verifyGithubSetup({
+        githubRepoInput,
+        githubToken,
+        resolveGithubRepoUrl,
+      });
+      if (!result.ok) {
+        return res
+          .status(result.status || 400)
+          .json({ ok: false, error: result.error });
+      }
+      return res.json({ ok: true });
+    } catch (err) {
+      console.error("[onboard] GitHub verify error:", err);
+      return res
+        .status(500)
+        .json({ ok: false, error: sanitizeOnboardingError(err) });
+    }
+  });
 };
 
 module.exports = { registerOnboardingRoutes };

package/lib/setup/core-prompts/TOOLS.md

@@ -6,11 +6,11 @@ AlphaClaw UI: `{{SETUP_UI_URL}}`
 
 ### Tabs
 
-| Tab     | URL                        | What it manages                                                                                                                                         |
-| ------- | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| General | `{{SETUP_UI_URL}}#general` | Gateway status & restart, channel health (Telegram/Discord), pending pairings, feature health (Embeddings/Audio), Google Workspace connection, repo auto-sync schedule, OpenClaw dashboard |
-| Providers | `{{SETUP_UI_URL}}#providers` | AI provider credentials (Anthropic, OpenAI, Gemini, Mistral, Voyage, Groq, Deepgram), feature capabilities, Codex OAuth |
-| Envars  | `{{SETUP_UI_URL}}#envars`  | View/edit/add environment variables (saved to `/data/.env`), gateway restart to apply changes                                                           |
+| Tab       | URL                          | What it manages                                                                                                                                                                            |
+| --------- | ---------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| General   | `{{SETUP_UI_URL}}#general`   | Gateway status & restart, channel health (Telegram/Discord), pending pairings, feature health (Embeddings/Audio), Google Workspace connection, repo auto-sync schedule, OpenClaw dashboard |
+| Providers | `{{SETUP_UI_URL}}#providers` | AI provider credentials (Anthropic, OpenAI, Gemini, Mistral, Voyage, Groq, Deepgram), feature capabilities, Codex OAuth                                                                    |
+| Envars    | `{{SETUP_UI_URL}}#envars`    | View/edit/add environment variables (saved to `/data/.env`), gateway restart to apply changes                                                                                              |
 
 ### Environment variables
 

package/lib/setup/gitignore

@@ -4,6 +4,8 @@
 # Whitelist specific files/dirs.
 !workspace/
 !workspace/**
+workspace/.openclaw/
+workspace/.openclaw/**
 !skills/
 !skills/**
 !cron/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrysb/alphaclaw",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "publishConfig": {
     "access": "public"
   },