@chrysb/alphaclaw 0.6.0-beta.3 → 0.6.1

package/lib/public/js/components/google/gmail-setup-wizard.js

@@ -47,14 +47,14 @@ const copyText = async (value) => {
   }
 };
 
-const kStepTitles = [
+const kSetupStepTitles = [
   "Install + Authenticate gcloud",
   "Enable APIs",
   "Create Topic + IAM",
   "Create Push Subscription",
   "Build with your Agent",
 ];
-const kTotalSteps = kStepTitles.length;
+const kTutorialStepTitles = kSetupStepTitles.slice(0, 3);
 const kNoSessionSelectedValue = kNoDestinationSessionValue;
 
 const renderCommandBlock = (command = "", onCopy = () => {}) => html`
@@ -136,6 +136,8 @@ export const GmailSetupWizard = ({
     String(clientConfig?.projectId || "").trim() ||
     "<project-id>";
   const hasExistingWebhookSetup = Boolean(clientConfig?.webhookExists);
+  const stepTitles = hasExistingWebhookSetup ? kTutorialStepTitles : kSetupStepTitles;
+  const totalSteps = stepTitles.length;
   const client =
     String(account?.client || clientConfig?.client || "default").trim() ||
     "default";
@@ -172,7 +174,7 @@ export const GmailSetupWizard = ({
         destination: selectedDestination,
       });
       setWatchEnabled(true);
-      setStep((prev) => Math.min(prev + 1, kTotalSteps - 1));
+      setStep((prev) => Math.min(prev + 1, totalSteps - 1));
     } catch (err) {
       setLocalError(err.message || "Could not finish setup");
     }
@@ -196,7 +198,7 @@ export const GmailSetupWizard = ({
       }
       return;
     }
-    setStep((prev) => Math.min(prev + 1, kTotalSteps - 1));
+    setStep((prev) => Math.min(prev + 1, totalSteps - 1));
   };
 
   const handleSendToAgent = async () => {
@@ -240,7 +242,7 @@ export const GmailSetupWizard = ({
       </button>
       <div class="text-xs text-gray-500">Gmail Pub / Sub Setup</div>
       <div class="flex items-center gap-1">
-        ${kStepTitles.map(
+        ${stepTitles.map(
           (title, idx) => html`
             <div
               class=${`h-1 flex-1 rounded-full transition-colors ${idx <= step ? "bg-accent" : "bg-border"}`}
@@ -251,7 +253,7 @@ export const GmailSetupWizard = ({
         )}
       </div>
       <${PageHeader}
-        title=${`Step ${step + 1} of ${kTotalSteps}: ${kStepTitles[step]}`}
+        title=${`Step ${step + 1} of ${totalSteps}: ${stepTitles[step]}`}
         actions=${null}
       />
       ${localError ? html`<div class="text-xs text-red-400">${localError}</div>` : null}
@@ -341,7 +343,7 @@ export const GmailSetupWizard = ({
           : null
       }
       ${
-        !needsProjectId && step === 3
+        !hasExistingWebhookSetup && !needsProjectId && step === 3
           ? html`
               ${renderCommandBlock(commands?.createSubscription || "", () =>
                 handleCopy(commands?.createSubscription || ""),
@@ -376,7 +378,7 @@ export const GmailSetupWizard = ({
           : null
       }
       ${
-        step === 4
+        !hasExistingWebhookSetup && step === 4
           ? html`
               <div
                 class="rounded-lg border border-border bg-black/20 p-3 space-y-3"
@@ -469,7 +471,18 @@ export const GmailSetupWizard = ({
               />`
         }
         ${
-          step < kTotalSteps - 2
+          !hasExistingWebhookSetup && step === totalSteps - 2
+            ? html`<${ActionButton}
+                onClick=${handleFinish}
+                disabled=${false}
+                loading=${saving}
+                idleLabel="Enable watch"
+                loadingLabel="Enabling..."
+                tone="primary"
+                size="md"
+                className="w-full justify-center"
+              />`
+            : step < totalSteps - 1
             ? html`<${ActionButton}
                 onClick=${handleNext}
                 disabled=${saving || (needsProjectId && !canAdvance)}
@@ -478,27 +491,14 @@ export const GmailSetupWizard = ({
                 size="md"
                 className="w-full justify-center"
               />`
-            : step === kTotalSteps - 2
-              ? html`<${ActionButton}
-                  onClick=${hasExistingWebhookSetup ? handleNext : handleFinish}
-                  disabled=${false}
-                  loading=${saving}
-                  idleLabel=${hasExistingWebhookSetup ? "Next" : "Enable watch"}
-                  loadingLabel=${hasExistingWebhookSetup
-                    ? "Loading..."
-                    : "Enabling..."}
-                  tone="primary"
-                  size="md"
-                  className="w-full justify-center"
-                />`
-              : html`<${ActionButton}
-                  onClick=${onClose}
-                  disabled=${saving || sendingToAgent}
-                  idleLabel="Done"
-                  tone="secondary"
-                  size="md"
-                  className="w-full justify-center"
-                />`
+            : html`<${ActionButton}
+                onClick=${onClose}
+                disabled=${saving || sendingToAgent}
+                idleLabel="Done"
+                tone="secondary"
+                size="md"
+                className="w-full justify-center"
+              />`
         }
       </div>
     </${ModalShell}>

package/lib/public/js/components/google/index.js

@@ -373,7 +373,7 @@ export const Google = ({
     if (!account) return;
     const client = String(account.client || "default").trim() || "default";
     const clientConfig = clientConfigByClient.get(client);
-    if (!clientConfig?.configured) {
+    if (!clientConfig?.configured || !clientConfig?.webhookExists) {
       openGmailSetupWizard(accountId);
       return;
     }

package/lib/server/gmail-watch.js

@@ -316,7 +316,6 @@ const createGmailWatchService = ({
         transform: { module: gmailTransformModulePath },
       },
       transformSource: buildGmailTransformSource(destination),
-      overwriteTransform: true,
     });
     const webhookAfter = fs.readFileSync(configPath, "utf8");
     if (webhookBefore !== webhookAfter) {

package/lib/server/onboarding/github.js

@@ -66,20 +66,7 @@ const verifyGithubRepoForOnboarding = async ({
         };
       }
     }
-    const authedUser = await userRes.json().catch(() => ({}));
-    const authedLogin = String(authedUser?.login || "").trim();
-    if (
-      !isExisting &&
-      repoOwner &&
-      authedLogin &&
-      repoOwner.toLowerCase() !== authedLogin.toLowerCase()
-    ) {
-      return {
-        ok: false,
-        status: 400,
-        error: `New workspace repo owner must match your token user "${authedLogin}"`,
-      };
-    }
+    await userRes.json().catch(() => ({}));
 
     const checkRes = await fetch(`https://api.github.com/repos/${repoUrl}`, {
       headers: ghHeaders,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrysb/alphaclaw",
-  "version": "0.6.0-beta.3",
+  "version": "0.6.1",
   "publishConfig": {
     "access": "public"
   },