@chrysb/alphaclaw 0.3.5-beta.1 → 0.4.0

package/bin/alphaclaw.js

@@ -626,37 +626,7 @@ try {
 } catch {}
 
 // ---------------------------------------------------------------------------
-// 10. Configure gog credentials (if env vars present)
-// ---------------------------------------------------------------------------
-
-if (process.env.GOG_CLIENT_CREDENTIALS_JSON && process.env.GOG_REFRESH_TOKEN) {
-  try {
-    const tmpCreds = `/tmp/gog-creds-${process.pid}.json`;
-    const tmpToken = `/tmp/gog-token-${process.pid}.json`;
-    fs.writeFileSync(tmpCreds, process.env.GOG_CLIENT_CREDENTIALS_JSON);
-    execSync(`gog auth credentials set "${tmpCreds}"`, { stdio: "ignore" });
-    fs.unlinkSync(tmpCreds);
-    fs.writeFileSync(
-      tmpToken,
-      JSON.stringify({
-        email: process.env.GOG_ACCOUNT || "",
-        refresh_token: process.env.GOG_REFRESH_TOKEN,
-      }),
-    );
-    execSync(`gog auth tokens import "${tmpToken}"`, { stdio: "ignore" });
-    fs.unlinkSync(tmpToken);
-    console.log(
-      `[alphaclaw] gog CLI configured for ${process.env.GOG_ACCOUNT || "account"}`,
-    );
-  } catch (e) {
-    console.log(`[alphaclaw] gog credentials setup skipped: ${e.message}`);
-  }
-} else {
-  console.log("[alphaclaw] Google credentials not set -- skipping gog setup");
-}
-
-// ---------------------------------------------------------------------------
-// 11. Reconcile channels if already onboarded
+// 10. Reconcile channels if already onboarded
 // ---------------------------------------------------------------------------
 
 const configPath = path.join(openclawDir, "openclaw.json");

package/lib/public/assets/icons/google_icon.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" role="img" aria-labelledby="title">
+  <title>Google</title>
+  <path d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z" fill="#4285F4"/>
+  <path d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z" fill="#34A853"/>
+  <path d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z" fill="#FBBC05"/>
+  <path d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z" fill="#EA4335"/>
+  <path d="M1 1h22v22H1z" fill="none"/>
+</svg>

package/lib/public/css/explorer.css

@@ -216,6 +216,28 @@
   background: var(--bg-hover);
 }
 
+.tree-folder.active {
+  background: var(--bg-active);
+  color: var(--accent);
+}
+
+.tree-folder.active .arrow {
+  color: var(--accent);
+}
+
+.tree-folder-toggle {
+  border: 0;
+  margin: 0;
+  padding: 0;
+  background: transparent;
+  color: inherit;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  flex: 0 0 auto;
+}
+
 .arrow {
   font-size: 10px;
   transition: transform 0.15s;
@@ -565,6 +587,37 @@
   flex-shrink: 0;
 }
 
+.file-viewer-icon-action {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 28px;
+  height: 28px;
+  margin-right: 10px;
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  background: rgba(255, 255, 255, 0.02);
+  color: var(--text-muted);
+  transition: border-color 0.12s ease, color 0.12s ease, background 0.12s ease;
+}
+
+.file-viewer-icon-action:hover {
+  border-color: rgba(148, 163, 184, 0.45);
+  color: var(--text);
+  background: rgba(148, 163, 184, 0.08);
+}
+
+.file-viewer-icon-action.is-disabled {
+  opacity: 0.45;
+  cursor: not-allowed;
+}
+
+.file-viewer-icon-action-icon {
+  width: 14px;
+  height: 14px;
+  flex-shrink: 0;
+}
+
 .file-viewer-view-toggle {
   display: flex;
   align-items: center;

package/lib/public/js/app.js

@@ -28,7 +28,7 @@ import { Gateway } from "./components/gateway.js";
 import { Channels, ALL_CHANNELS } from "./components/channels.js";
 import { Pairings } from "./components/pairings.js";
 import { DevicePairings } from "./components/device-pairings.js";
-import { Google } from "./components/google.js";
+import { Google } from "./components/google/index.js";
 import { Features } from "./components/features.js";
 import { Providers } from "./components/providers.js";
 import { Welcome } from "./components/welcome.js";
@@ -52,6 +52,7 @@ const kSidebarMinWidthPx = 180;
 const kSidebarMaxWidthPx = 460;
 const kBrowseLastPathUiSettingKey = "browseLastPath";
 const kLastMenuRouteUiSettingKey = "lastMenuRoute";
+const normalizeBrowsePath = (value) => String(value || "").replace(/^\/+|\/+$/g, "");
 
 const clampSidebarWidth = (value) =>
   Math.max(kSidebarMinWidthPx, Math.min(kSidebarMaxWidthPx, value));
@@ -106,7 +107,6 @@ const GeneralTab = ({
   onOpenclawVersionActionComplete = () => {},
   onOpenclawUpdate,
 }) => {
-  const [googleKey, setGoogleKey] = useState(0);
   const [dashboardLoading, setDashboardLoading] = useState(false);
   const [repairingWatchdog, setRepairingWatchdog] = useState(false);
   const status = statusData;
@@ -179,7 +179,6 @@ const GeneralTab = ({
     onRefreshStatuses();
     pairingsPoll.refresh();
     devicePoll.refresh();
-    setGoogleKey((k) => k + 1);
   }, [isActive]);
 
   useEffect(() => {
@@ -280,7 +279,7 @@ const GeneralTab = ({
         onReject=${handleReject}
       />
       <${Features} onSwitchTab=${onSwitchTab} />
-      <${Google} key=${googleKey} gatewayStatus=${gatewayStatus} />
+      <${Google} gatewayStatus=${gatewayStatus} />
 
       ${repo &&
       html`
@@ -646,9 +645,27 @@ const App = () => {
     setLocation(`/${screen}`);
     setMobileSidebarOpen(false);
   };
+  const handleBrowsePreviewFile = useCallback((nextPreviewPath) => {
+    const normalizedPreviewPath = normalizeBrowsePath(nextPreviewPath);
+    setBrowsePreviewPath(normalizedPreviewPath);
+  }, []);
   const navigateToBrowseFile = (relativePath, options = {}) => {
-    setBrowsePreviewPath("");
-    setLocation(buildBrowseRoute(relativePath, options));
+    const normalizedTargetPath = normalizeBrowsePath(relativePath);
+    const selectingDirectory =
+      !!options.directory || String(relativePath || "").trim().endsWith("/");
+    const shouldPreservePreview = selectingDirectory && !!options.preservePreview;
+    const activePath = normalizeBrowsePath(
+      browsePreviewPath || selectedBrowsePath || "",
+    );
+    const nextPreviewPath =
+      shouldPreservePreview && activePath && activePath !== normalizedTargetPath
+        ? activePath
+        : "";
+    setBrowsePreviewPath(nextPreviewPath);
+    const routeOptions = selectingDirectory
+      ? { ...options, view: "edit" }
+      : options;
+    setLocation(buildBrowseRoute(normalizedTargetPath, routeOptions));
     setMobileSidebarOpen(false);
   };
   const handleSidebarLogout = async () => {
@@ -879,7 +896,7 @@ const App = () => {
         onSelectNavItem=${handleSelectNavItem}
         selectedBrowsePath=${selectedBrowsePath}
         onSelectBrowseFile=${navigateToBrowseFile}
-        onPreviewBrowseFile=${setBrowsePreviewPath}
+        onPreviewBrowseFile=${handleBrowsePreviewFile}
         acHasUpdate=${acHasUpdate}
         acLatest=${acLatest}
         acDismissed=${acDismissed}
@@ -921,112 +938,116 @@ const App = () => {
           </span>
         </div>
         <div class=${isBrowseRoute ? "w-full" : "max-w-2xl w-full mx-auto"}>
-          ${isBrowseRoute
-            ? html`
-                <${FileViewer}
-                  filePath=${activeBrowsePath}
-                  isPreviewOnly=${Boolean(
-                    browsePreviewPath &&
-                      browsePreviewPath !== selectedBrowsePath,
-                  )}
-                  browseView=${browseViewerMode}
-                  onRequestEdit=${(targetPath) => {
-                    const normalizedTargetPath = String(targetPath || "");
-                    if (
-                      normalizedTargetPath &&
-                      normalizedTargetPath !== selectedBrowsePath
-                    ) {
-                      navigateToBrowseFile(normalizedTargetPath, { view: "edit" });
-                      return;
-                    }
-                    setLocation(buildBrowseRoute(selectedBrowsePath, { view: "edit" }));
-                  }}
+          <div style=${{ display: isBrowseRoute ? "block" : "none" }}>
+            <${FileViewer}
+              filePath=${activeBrowsePath}
+              isPreviewOnly=${false}
+              browseView=${browseViewerMode}
+              onRequestEdit=${(targetPath) => {
+                const normalizedTargetPath = String(targetPath || "");
+                if (
+                  normalizedTargetPath &&
+                  normalizedTargetPath !== selectedBrowsePath
+                ) {
+                  navigateToBrowseFile(normalizedTargetPath, { view: "edit" });
+                  return;
+                }
+                setLocation(buildBrowseRoute(selectedBrowsePath, { view: "edit" }));
+              }}
+              onRequestClearSelection=${() => {
+                setBrowsePreviewPath("");
+                setLocation("/browse");
+              }}
+            />
+          </div>
+          <div style=${{ display: isBrowseRoute ? "none" : "block" }}>
+            <div style=${{ display: location === "/general" ? "block" : "none" }}>
+              <div class="pt-4">
+                <${GeneralTab}
+                  statusData=${sharedStatus}
+                  watchdogData=${sharedWatchdogStatus}
+                  onRefreshStatuses=${refreshSharedStatuses}
+                  onSwitchTab=${(nextTab) => setLocation(`/${nextTab}`)}
+                  onNavigate=${navigateToSubScreen}
+                  isActive=${location === "/general"}
+                  restartingGateway=${restartingGateway}
+                  onRestartGateway=${handleGatewayRestart}
+                  restartSignal=${gatewayRestartSignal}
+                  openclawUpdateInProgress=${openclawUpdateInProgress}
+                  onOpenclawVersionActionComplete=${handleOpenclawVersionActionComplete}
+                  onOpenclawUpdate=${handleOpenclawUpdate}
                 />
-              `
-            : html`
-                <${Switch}>
-                  <${Route} path="/telegram">
-                    <div class="pt-4">
-                      <${TelegramWorkspace} onBack=${exitSubScreen} />
-                    </div>
-                  </${Route}>
-                  <${Route} path="/general">
-                    <div class="pt-4">
-                      <${GeneralTab}
-                        statusData=${sharedStatus}
-                        watchdogData=${sharedWatchdogStatus}
-                        onRefreshStatuses=${refreshSharedStatuses}
-                        onSwitchTab=${(nextTab) => setLocation(`/${nextTab}`)}
-                        onNavigate=${navigateToSubScreen}
-                        isActive=${location === "/general"}
-                        restartingGateway=${restartingGateway}
-                        onRestartGateway=${handleGatewayRestart}
-                        restartSignal=${gatewayRestartSignal}
-                        openclawUpdateInProgress=${openclawUpdateInProgress}
-                        onOpenclawVersionActionComplete=${handleOpenclawVersionActionComplete}
-                        onOpenclawUpdate=${handleOpenclawUpdate}
-                      />
-                    </div>
-                  </${Route}>
-                  <${Route} path="/providers">
-                    <div class="pt-4">
-                      <${Providers} onRestartRequired=${setRestartRequired} />
-                    </div>
-                  </${Route}>
-                  <${Route} path="/watchdog">
-                    <div class="pt-4">
-                      <${WatchdogTab}
-                        gatewayStatus=${sharedStatus?.gateway || null}
-                        openclawVersion=${sharedStatus?.openclawVersion || null}
-                        watchdogStatus=${sharedWatchdogStatus}
-                        onRefreshStatuses=${refreshSharedStatuses}
-                        restartingGateway=${restartingGateway}
-                        onRestartGateway=${handleGatewayRestart}
-                        restartSignal=${gatewayRestartSignal}
-                        openclawUpdateInProgress=${openclawUpdateInProgress}
-                        onOpenclawVersionActionComplete=${handleOpenclawVersionActionComplete}
-                        onOpenclawUpdate=${handleOpenclawUpdate}
-                      />
-                    </div>
-                  </${Route}>
-                  <${Route} path="/usage/:sessionId">
-                    ${(params) => html`
+              </div>
+            </div>
+            ${!isBrowseRoute && location !== "/general"
+              ? html`
+                  <${Switch}>
+                    <${Route} path="/telegram">
+                      <div class="pt-4">
+                        <${TelegramWorkspace} onBack=${exitSubScreen} />
+                      </div>
+                    </${Route}>
+                    <${Route} path="/providers">
+                      <div class="pt-4">
+                        <${Providers} onRestartRequired=${setRestartRequired} />
+                      </div>
+                    </${Route}>
+                    <${Route} path="/watchdog">
+                      <div class="pt-4">
+                        <${WatchdogTab}
+                          gatewayStatus=${sharedStatus?.gateway || null}
+                          openclawVersion=${sharedStatus?.openclawVersion || null}
+                          watchdogStatus=${sharedWatchdogStatus}
+                          onRefreshStatuses=${refreshSharedStatuses}
+                          restartingGateway=${restartingGateway}
+                          onRestartGateway=${handleGatewayRestart}
+                          restartSignal=${gatewayRestartSignal}
+                          openclawUpdateInProgress=${openclawUpdateInProgress}
+                          onOpenclawVersionActionComplete=${handleOpenclawVersionActionComplete}
+                          onOpenclawUpdate=${handleOpenclawUpdate}
+                        />
+                      </div>
+                    </${Route}>
+                    <${Route} path="/usage/:sessionId">
+                      ${(params) => html`
+                        <div class="pt-4">
+                          <${UsageTab}
+                            sessionId=${decodeURIComponent(params.sessionId || "")}
+                            onSelectSession=${(id) =>
+                              setLocation(`/usage/${encodeURIComponent(String(id || ""))}`)}
+                            onBackToSessions=${() => setLocation("/usage")}
+                          />
+                        </div>
+                      `}
+                    </${Route}>
+                    <${Route} path="/usage">
                       <div class="pt-4">
                         <${UsageTab}
-                          sessionId=${decodeURIComponent(params.sessionId || "")}
                           onSelectSession=${(id) =>
                             setLocation(`/usage/${encodeURIComponent(String(id || ""))}`)}
                           onBackToSessions=${() => setLocation("/usage")}
                         />
                       </div>
-                    `}
-                  </${Route}>
-                  <${Route} path="/usage">
-                    <div class="pt-4">
-                      <${UsageTab}
-                        onSelectSession=${(id) =>
-                          setLocation(`/usage/${encodeURIComponent(String(id || ""))}`)}
-                        onBackToSessions=${() => setLocation("/usage")}
-                      />
-                    </div>
-                  </${Route}>
-                  <${Route} path="/envars">
-                    <div class="pt-4">
-                      <${Envars} onRestartRequired=${setRestartRequired} />
-                    </div>
-                  </${Route}>
-                  <${Route} path="/webhooks/:hookName">
-                    ${(params) =>
-                      renderWebhooks(decodeURIComponent(params.hookName || ""))}
-                  </${Route}>
-                  <${Route} path="/webhooks">
-                    ${() => renderWebhooks("")}
-                  </${Route}>
-                  <${Route}>
-                    <${RouteRedirect} to="/general" />
-                  </${Route}>
-                </${Switch}>
-              `}
+                    </${Route}>
+                    <${Route} path="/envars">
+                      <div class="pt-4">
+                        <${Envars} onRestartRequired=${setRestartRequired} />
+                      </div>
+                    </${Route}>
+                    <${Route} path="/webhooks/:hookName">
+                      ${(params) =>
+                        renderWebhooks(decodeURIComponent(params.hookName || ""))}
+                    </${Route}>
+                    <${Route} path="/webhooks">
+                      ${() => renderWebhooks("")}
+                    </${Route}>
+                    <${Route}>
+                      <${RouteRedirect} to="/general" />
+                    </${Route}>
+                  </${Switch}>
+                `
+              : null}
+          </div>
         </div>
         <${ToastContainer}
           className="fixed bottom-10 right-4 z-50 space-y-2 pointer-events-none"

package/lib/public/js/components/credentials-modal.js

@@ -1,5 +1,5 @@
 import { h } from "https://esm.sh/preact";
-import { useState, useRef } from "https://esm.sh/preact/hooks";
+import { useEffect, useRef, useState } from "https://esm.sh/preact/hooks";
 import htm from "https://esm.sh/htm";
 import { saveGoogleCredentials } from "../lib/api.js";
 import { SecretInput } from "./secret-input.js";
@@ -9,16 +9,37 @@ import { ActionButton } from "./action-button.js";
 import { CloseIcon } from "./icons.js";
 const html = htm.bind(h);
 
-export const CredentialsModal = ({ visible, onClose, onSaved }) => {
+export const CredentialsModal = ({
+  visible,
+  onClose,
+  onSaved,
+  title = "Connect Google Workspace",
+  submitLabel = "Connect Google",
+  defaultInstrType = "workspace",
+  client = "default",
+  personal = false,
+  accountId = "",
+  initialValues = {},
+}) => {
   const [clientId, setClientId] = useState("");
   const [clientSecret, setClientSecret] = useState("");
   const [email, setEmail] = useState("");
   const [error, setError] = useState("");
   const [saving, setSaving] = useState(false);
-  const [instrType, setInstrType] = useState("workspace");
+  const [instrType, setInstrType] = useState(defaultInstrType);
   const [redirectUriCopied, setRedirectUriCopied] = useState(false);
   const fileRef = useRef(null);
 
+  useEffect(() => {
+    if (!visible) return;
+    setClientId(String(initialValues.clientId || ""));
+    setClientSecret(String(initialValues.clientSecret || ""));
+    setEmail(String(initialValues.email || ""));
+    setInstrType(defaultInstrType);
+    setError("");
+    setRedirectUriCopied(false);
+  }, [visible, initialValues, defaultInstrType]);
+
   if (!visible) return null;
 
   const redirectUri = `${window.location.origin}/auth/google/callback`;
@@ -50,15 +71,22 @@ export const CredentialsModal = ({ visible, onClose, onSaved }) => {
   const submit = async () => {
     setError("");
     if (!clientId || !clientSecret || !email) {
-      setError("All fields required");
+      setError("Client ID, Client Secret, and Email are required");
       return;
     }
     setSaving(true);
     try {
-      const data = await saveGoogleCredentials(clientId, clientSecret, email);
+      const data = await saveGoogleCredentials({
+        clientId,
+        clientSecret,
+        email,
+        client,
+        personal,
+        accountId,
+      });
       if (data.ok) {
         onClose();
-        onSaved();
+        onSaved?.(data.account);
       } else setError(data.error || "Failed to save credentials");
     } catch {
       setError("Request failed");
@@ -104,7 +132,7 @@ export const CredentialsModal = ({ visible, onClose, onSaved }) => {
     panelClassName="bg-modal border border-border rounded-xl p-6 max-w-lg w-full space-y-4"
   >
       <${PageHeader}
-        title="Connect Google Workspace"
+        title=${title}
         actions=${html`
           <button
             type="button"
@@ -338,7 +366,7 @@ export const CredentialsModal = ({ visible, onClose, onSaved }) => {
           loading=${saving}
           tone="primary"
           size="lg"
-          idleLabel="Connect Google"
+          idleLabel=${submitLabel}
           loadingLabel="Saving..."
           className="w-full px-4 py-2 rounded-lg text-sm"
         />