@chrysb/alphaclaw 0.4.6-beta.8 → 0.4.6-beta.9

package/bin/alphaclaw.js

@@ -216,21 +216,7 @@ try {
 }
 
 // ---------------------------------------------------------------------------
-// 5. Symlink <rootDir>/.openclaw/.env -> <rootDir>/.env
-// ---------------------------------------------------------------------------
-
-const openclawEnvLink = path.join(openclawDir, ".env");
-try {
-  if (!fs.existsSync(openclawEnvLink)) {
-    fs.symlinkSync(envFilePath, openclawEnvLink);
-    console.log(`[alphaclaw] Symlinked ${openclawEnvLink} -> ${envFilePath}`);
-  }
-} catch (e) {
-  console.log(`[alphaclaw] .env symlink skipped: ${e.message}`);
-}
-
-// ---------------------------------------------------------------------------
-// 6. Load .env into process.env
+// 5. Load .env into process.env
 // ---------------------------------------------------------------------------
 
 if (fs.existsSync(envFilePath)) {
@@ -530,23 +516,7 @@ if (!gogInstalled) {
 }
 
 // ---------------------------------------------------------------------------
-// 7. Configure gog keyring (file backend for headless environments)
-// ---------------------------------------------------------------------------
-
-process.env.GOG_KEYRING_PASSWORD =
-  process.env.GOG_KEYRING_PASSWORD || "alphaclaw";
-const gogConfigFile = path.join(openclawDir, "gogcli", "config.json");
-
-if (!fs.existsSync(gogConfigFile)) {
-  fs.mkdirSync(path.join(openclawDir, "gogcli"), { recursive: true });
-  try {
-    execSync("gog auth keyring file", { stdio: "ignore" });
-    console.log("[alphaclaw] gog keyring configured (file backend)");
-  } catch {}
-}
-
-// ---------------------------------------------------------------------------
-// 8. Install/reconcile system cron entry
+// 7. Install/reconcile system cron entry
 // ---------------------------------------------------------------------------
 
 const packagedHourlyGitSyncPath = path.join(setupDir, "hourly-git-sync.sh");

package/lib/public/css/theme.css

@@ -513,6 +513,11 @@ textarea:focus {
   height: 28px;
 }
 
+.ac-segmented-control-full {
+  display: flex;
+  width: 100%;
+}
+
 .ac-segmented-control-button {
   border: 0;
   background: transparent;
@@ -527,6 +532,20 @@ textarea:focus {
   transition: color 0.12s, background 0.12s;
 }
 
+.ac-segmented-control-full .ac-segmented-control-button {
+  flex: 1 1 0%;
+}
+
+.ac-segmented-control-lg {
+  height: 36px;
+  border-radius: 12px;
+}
+
+.ac-segmented-control-lg .ac-segmented-control-button {
+  font-size: 14px;
+  padding: 0 16px;
+}
+
 .ac-segmented-control-button:hover {
   color: var(--text);
   background: rgba(255, 255, 255, 0.03);

package/lib/public/js/app.js

@@ -3,7 +3,7 @@ import { useState, useEffect } from "https://esm.sh/preact/hooks";
 import htm from "https://esm.sh/htm";
 import { Router, Route, Switch, useLocation } from "https://esm.sh/wouter-preact";
 import { logout } from "./lib/api.js";
-import { Welcome } from "./components/welcome.js";
+import { Welcome } from "./components/welcome/index.js";
 import { ToastContainer } from "./components/toast.js";
 import { GlobalRestartBanner } from "./components/global-restart-banner.js";
 import { LoadingSpinner } from "./components/loading-spinner.js";

package/lib/public/js/components/envars.js

@@ -86,7 +86,6 @@ const kHintByKey = {
   OPENAI_API_KEY: html`from <a href="https://platform.openai.com" target="_blank" class="hover:underline" style="color: var(--accent-link)">platform.openai.com</a>`,
   GEMINI_API_KEY: html`from <a href="https://aistudio.google.com" target="_blank" class="hover:underline" style="color: var(--accent-link)">aistudio.google.com</a>`,
   ELEVENLABS_API_KEY: html`from <a href="https://elevenlabs.io" target="_blank" class="hover:underline" style="color: var(--accent-link)">elevenlabs.io</a> · <code class="text-xs bg-black/30 px-1 rounded">XI_API_KEY</code> also supported`,
-  GITHUB_TOKEN: html`classic PAT · <code class="text-xs bg-black/30 px-1 rounded">repo</code> scope · <a href="https://github.com/settings/tokens" target="_blank" class="hover:underline" style="color: var(--accent-link)">github settings</a>`,
   GITHUB_WORKSPACE_REPO: html`use <code class="text-xs bg-black/30 px-1 rounded">owner/repo</code> or <code class="text-xs bg-black/30 px-1 rounded">https://github.com/owner/repo</code>`,
   TELEGRAM_BOT_TOKEN: html`from <a href="https://t.me/BotFather" target="_blank" class="hover:underline" style="color: var(--accent-link)">@BotFather</a> · <a href="https://docs.openclaw.ai/channels/telegram" target="_blank" class="hover:underline" style="color: var(--accent-link)">full guide</a>`,
   DISCORD_BOT_TOKEN: html`from <a href="https://discord.com/developers/applications" target="_blank" class="hover:underline" style="color: var(--accent-link)">developer portal</a> · <a href="https://docs.openclaw.ai/channels/discord" target="_blank" class="hover:underline" style="color: var(--accent-link)">full guide</a>`,

package/lib/public/js/components/onboarding/welcome-config.js

@@ -4,6 +4,13 @@ import { kAllAiAuthFields } from "../../lib/model-config.js";
 
 const html = htm.bind(h);
 
+export const kRepoModeNew = "new";
+export const kRepoModeExisting = "existing";
+export const kGithubFlowFresh = "fresh";
+export const kGithubFlowImport = "import";
+export const kGithubTargetRepoModeCreate = "create";
+export const kGithubTargetRepoModeExistingEmpty = "existing-empty";
+
 export const normalizeGithubRepoInput = (repoInput) =>
   String(repoInput || "")
     .trim()
@@ -19,44 +26,59 @@ export const isValidGithubRepoInput = (repoInput) => {
 };
 
 export const kWelcomeGroups = [
-  {
-    id: "ai",
-    title: "Primary Agent Model",
-    description: "Choose your main model and authenticate its provider",
-    fields: kAllAiAuthFields,
-    validate: (vals, ctx = {}) => !!(vals.MODEL_KEY && ctx.hasAi),
-  },
   {
     id: "github",
     title: "GitHub",
     description: "Backs up your agent's config and workspace",
     fields: [
+      {
+        key: "_GITHUB_SOURCE_REPO",
+        label: "Source Repo",
+        placeholder: "username/existing-openclaw",
+        isText: true,
+      },
       {
         key: "GITHUB_WORKSPACE_REPO",
-        label: "Workspace Repo",
-        hint: "A new private repo will be created for you",
+        label: "New Workspace Repo",
         placeholder: "username/my-agent",
         isText: true,
       },
       {
         key: "GITHUB_TOKEN",
         label: "Personal Access Token",
-        hint: html`Create a classic PAT on${" "}<a
+        hint: html`Create a${" "}<a
             href="https://github.com/settings/tokens"
             target="_blank"
             class="hover:underline"
             style="color: var(--accent-link)"
-            >GitHub settings</a
+            >classic PAT</a
           >${" "}with${" "}<code class="text-xs bg-black/30 px-1 rounded"
             >repo</code
-          >${" "}scope`,
-        placeholder: "ghp_...",
+          >${" "}scope, or a${" "}<a
+            href="https://github.com/settings/personal-access-tokens/new"
+            target="_blank"
+            class="hover:underline"
+            style="color: var(--accent-link)"
+            >fine-grained token</a
+          >${" "}with Contents + Metadata access`,
+        placeholder: "ghp_... or github_pat_...",
       },
     ],
-    validate: (vals) =>
-      !!(
-        vals.GITHUB_TOKEN && isValidGithubRepoInput(vals.GITHUB_WORKSPACE_REPO)
-      ),
+    validate: (vals) => {
+      const githubFlow = vals._GITHUB_FLOW || kGithubFlowFresh;
+      const hasTarget = isValidGithubRepoInput(vals.GITHUB_WORKSPACE_REPO);
+      const hasSource =
+        githubFlow !== kGithubFlowImport ||
+        isValidGithubRepoInput(vals._GITHUB_SOURCE_REPO);
+      return !!(vals.GITHUB_TOKEN && hasTarget && hasSource);
+    },
+  },
+  {
+    id: "ai",
+    title: "Primary Agent Model",
+    description: "Choose your main model and authenticate its provider",
+    fields: kAllAiAuthFields,
+    validate: (vals, ctx = {}) => !!(vals.MODEL_KEY && ctx.hasAi),
   },
   {
     id: "channels",

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

@@ -4,7 +4,14 @@ import htm from "https://esm.sh/htm";
 import { SecretInput } from "../secret-input.js";
 import { ActionButton } from "../action-button.js";
 import { Badge } from "../badge.js";
-import { isValidGithubRepoInput } from "./welcome-config.js";
+import { SegmentedControl } from "../segmented-control.js";
+import {
+  isValidGithubRepoInput,
+  kGithubFlowFresh,
+  kGithubFlowImport,
+  kGithubTargetRepoModeCreate,
+  kGithubTargetRepoModeExistingEmpty,
+} from "./welcome-config.js";
 
 const html = htm.bind(h);
 
@@ -42,14 +49,16 @@ export const WelcomeFormStep = ({
   allValid,
   handleSubmit,
 }) => {
-  const [repoTouched, setRepoTouched] = useState(false);
   const [showOptionalOpenai, setShowOptionalOpenai] = useState(false);
   const [showOptionalGemini, setShowOptionalGemini] = useState(false);
+  const githubFlow = vals._GITHUB_FLOW || kGithubFlowFresh;
+  const freshRepoMode =
+    githubFlow === kGithubFlowImport
+      ? kGithubTargetRepoModeCreate
+      : vals._GITHUB_TARGET_REPO_MODE || kGithubTargetRepoModeCreate;
 
   useEffect(() => {
-    if (activeGroup.id !== "github") {
-      setRepoTouched(false);
-    }
+    if (activeGroup.id !== "github") return;
   }, [activeGroup.id]);
 
   useEffect(() => {
@@ -183,9 +192,62 @@ export const WelcomeFormStep = ({
         `}
       </div>
     `}
+    ${activeGroup.id === "github" &&
+    html`
+      <div class="space-y-3">
+        <div class="space-y-1 pt-1">
+          <div>
+            <label class="text-xs font-medium text-gray-400">Setup mode</label>
+          </div>
+          <${SegmentedControl}
+            options=${[
+              { label: "Start fresh", value: kGithubFlowFresh },
+              { label: "Import existing setup", value: kGithubFlowImport },
+            ]}
+            value=${githubFlow}
+            onChange=${(value) => setValue("_GITHUB_FLOW", value)}
+            size="md"
+            fullWidth=${true}
+          />
+        </div>
+        ${githubFlow === kGithubFlowFresh
+          ? html`
+              <div class="space-y-1">
+                <div>
+                  <label class="text-xs font-medium text-gray-400"
+                    >Repository setup</label
+                  >
+                </div>
+                <${SegmentedControl}
+                  options=${[
+                    {
+                      label: "Create new repo",
+                      value: kGithubTargetRepoModeCreate,
+                    },
+                    {
+                      label: "Use existing empty repo",
+                      value: kGithubTargetRepoModeExistingEmpty,
+                    },
+                  ]}
+                  value=${freshRepoMode}
+                  onChange=${(value) =>
+                    setValue("_GITHUB_TARGET_REPO_MODE", value)}
+                  fullWidth=${true}
+                />
+              </div>
+            `
+          : null}
+      </div>
+    `}
     ${(activeGroup.id === "ai"
       ? activeGroup.fields.filter((field) => visibleAiFieldKeys.has(field.key))
-      : activeGroup.fields
+      : activeGroup.id === "github"
+        ? activeGroup.fields.filter((field) =>
+            githubFlow === kGithubFlowImport
+              ? true
+              : field.key !== "_GITHUB_SOURCE_REPO",
+          )
+        : activeGroup.fields
     ).map(
       (field) => html`
         <div class="space-y-1" key=${field.key}>
@@ -196,27 +258,51 @@ export const WelcomeFormStep = ({
             key=${field.key}
             value=${vals[field.key] || ""}
             onInput=${(e) => setValue(field.key, e.target.value)}
-            onBlur=${field.key === "GITHUB_WORKSPACE_REPO"
-              ? () => setRepoTouched(true)
-              : undefined}
             placeholder=${field.placeholder || ""}
             isSecret=${!field.isText}
             inputClass="flex-1 bg-black/30 border border-border rounded-lg px-3 py-2 text-sm text-gray-200 outline-none focus:border-gray-500 font-mono"
           />
-          <p class="text-xs text-gray-600">${field.hint}</p>
+          <p class="text-xs text-gray-600">
+            ${activeGroup.id === "github" &&
+            field.key === "GITHUB_WORKSPACE_REPO"
+              ? githubFlow === kGithubFlowImport
+                ? "Your new project will live here"
+                : freshRepoMode === kGithubTargetRepoModeExistingEmpty
+                  ? "Enter the owner/repo of an existing empty repository"
+                  : "A new private repo will be created for you"
+              : activeGroup.id === "github" &&
+                  field.key === "_GITHUB_SOURCE_REPO"
+                ? "The repo to import from"
+                : activeGroup.id === "github" && field.key === "GITHUB_TOKEN"
+                  ? githubFlow === kGithubFlowImport
+                    ? freshRepoMode === kGithubTargetRepoModeCreate
+                      ? html`Use a classic PAT with${" "}<code
+                            class="text-xs bg-black/30 px-1 rounded"
+                            >repo</code
+                          >${" "}scope to create the target repo. Fine-grained
+                          works if the target already exists and can access both
+                          repos.`
+                      : html`Use a classic PAT with${" "}<code
+                            class="text-xs bg-black/30 px-1 rounded"
+                            >repo</code
+                          >${" "}scope, or a fine-grained token with Contents +
+                          Metadata access to both the source repo and target
+                          repo`
+                    : freshRepoMode === kGithubTargetRepoModeExistingEmpty
+                      ? html`Use a classic PAT with${" "}<code
+                            class="text-xs bg-black/30 px-1 rounded"
+                            >repo</code
+                          >${" "}scope, or a fine-grained token with Contents +
+                          Metadata access to this repo`
+                      : html`Use a classic PAT with${" "}<code
+                            class="text-xs bg-black/30 px-1 rounded"
+                            >repo</code
+                          >${" "}scope to create a new private repository`
+                  : field.hint}
+          </p>
         </div>
       `,
     )}
-    ${activeGroup.id === "github" &&
-    repoTouched &&
-    vals.GITHUB_WORKSPACE_REPO &&
-    !isValidGithubRepoInput(vals.GITHUB_WORKSPACE_REPO)
-      ? html`<div class="text-xs text-red-300">
-          Workspace Repo must be in
-          <code class="text-xs bg-black/30 px-1 rounded">owner/repo</code>
-          format.
-        </div>`
-      : null}
     ${error
       ? html`<div
           class="bg-red-900/30 border border-red-800 rounded-xl p-3 text-red-300 text-sm"
@@ -281,39 +367,48 @@ export const WelcomeFormStep = ({
       ${step < totalGroups - 1
         ? html`
             ${step > 0
-              ? html`<button
-                  onclick=${goBack}
-                  class="w-full text-sm font-medium px-4 py-2 rounded-xl transition-all ac-btn-secondary"
-                >
-                  Back
-                </button>`
+              ? html`<${ActionButton}
+                  onClick=${goBack}
+                  tone="secondary"
+                  size="md"
+                  idleLabel="Back"
+                  className="w-full"
+                />`
               : html`<div class="w-full"></div>`}
-            <button
-              onclick=${goNext}
-              disabled=${!currentGroupValid || githubStepLoading}
-              class="w-full text-sm font-medium px-4 py-2 rounded-xl transition-all ac-btn-cyan"
-            >
-              ${activeGroup.id === "github" && githubStepLoading
-                ? "Checking..."
+            <${ActionButton}
+              onClick=${goNext}
+              disabled=${!currentGroupValid}
+              loading=${activeGroup.id === "github" && githubStepLoading}
+              tone="primary"
+              size="md"
+              idleLabel=${activeGroup.id === "github" &&
+              githubFlow === kGithubFlowImport
+                ? "Check compatibility"
                 : "Next"}
-            </button>
+              loadingLabel="Checking..."
+              className="w-full"
+            />
           `
         : html`
             ${step > 0
-              ? html`<button
-                  onclick=${goBack}
-                  class="w-full text-sm font-medium px-4 py-2 rounded-xl transition-all ac-btn-secondary"
-                >
-                  Back
-                </button>`
+              ? html`<${ActionButton}
+                  onClick=${goBack}
+                  tone="secondary"
+                  size="md"
+                  idleLabel="Back"
+                  className="w-full"
+                />`
               : html`<div class="w-full"></div>`}
-            <button
-              onclick=${handleSubmit}
-              disabled=${!allValid || loading}
-              class="w-full text-sm font-medium px-4 py-2 rounded-xl transition-all ac-btn-cyan"
-            >
-              ${loading ? "Starting..." : "Next"}
-            </button>
+            <${ActionButton}
+              onClick=${handleSubmit}
+              disabled=${!allValid}
+              loading=${loading}
+              tone="primary"
+              size="md"
+              idleLabel="Next"
+              loadingLabel="Starting..."
+              className="w-full"
+            />
           `}
     </div>
   `;