@chrysb/alphaclaw 0.3.5-beta.0 → 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");
@@ -753,6 +723,25 @@ if (fs.existsSync(configPath)) {
           stdio: "ignore",
           env: gitEnv,
         });
+        try {
+          execSync("git show-ref --verify --quiet refs/heads/main", {
+            cwd: openclawDir,
+            stdio: "ignore",
+          });
+          try {
+            execSync("git rev-parse --abbrev-ref --symbolic-full-name main@{upstream}", {
+              cwd: openclawDir,
+              stdio: "ignore",
+            });
+          } catch {
+            execSync("git branch --set-upstream-to=origin/main main", {
+              cwd: openclawDir,
+              stdio: "ignore",
+              env: gitEnv,
+            });
+            console.log("[alphaclaw] Set main upstream to origin/main");
+          }
+        } catch {}
         const remoteConfig = String(
           execSync(`git show "origin/${branch}:openclaw.json"`, {
             cwd: openclawDir,
@@ -871,7 +860,52 @@ try {
 }
 
 // ---------------------------------------------------------------------------
-// 13. Start Express server
+// 13. Install git auth shim
+// ---------------------------------------------------------------------------
+
+try {
+  const gitAskPassSrc = path.join(__dirname, "..", "lib", "scripts", "git-askpass");
+  const gitAskPassDest = "/tmp/alphaclaw-git-askpass.sh";
+  const gitShimTemplatePath = path.join(__dirname, "..", "lib", "scripts", "git");
+  const gitShimDest = "/usr/local/bin/git";
+
+  if (fs.existsSync(gitAskPassSrc)) {
+    fs.copyFileSync(gitAskPassSrc, gitAskPassDest);
+    fs.chmodSync(gitAskPassDest, 0o755);
+  }
+
+  if (fs.existsSync(gitShimTemplatePath)) {
+    let realGitPath = "/usr/bin/git";
+    try {
+      const gitCandidates = String(
+        execSync("which -a git", {
+          stdio: ["ignore", "pipe", "ignore"],
+          encoding: "utf8",
+        }),
+      )
+        .split("\n")
+        .map((candidate) => candidate.trim())
+        .filter(Boolean);
+      const normalizedShimDest = path.resolve(gitShimDest);
+      const selectedCandidate = gitCandidates.find(
+        (candidatePath) => path.resolve(candidatePath) !== normalizedShimDest,
+      );
+      if (selectedCandidate) realGitPath = selectedCandidate;
+    } catch {}
+
+    const gitShimTemplate = fs.readFileSync(gitShimTemplatePath, "utf8");
+    const gitShimContent = gitShimTemplate
+      .replace("@@REAL_GIT@@", realGitPath)
+      .replace("@@OPENCLAW_REPO_ROOT@@", openclawDir);
+    fs.writeFileSync(gitShimDest, gitShimContent, { mode: 0o755 });
+    console.log("[alphaclaw] git auth shim installed");
+  }
+} catch (e) {
+  console.log(`[alphaclaw] git auth shim skipped: ${e.message}`);
+}
+
+// ---------------------------------------------------------------------------
+// 14. Start Express server
 // ---------------------------------------------------------------------------
 
 console.log("[alphaclaw] Setup complete -- starting server");

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;
@@ -259,6 +281,10 @@
   color: #ff7ac6;
 }
 
+.file-icon-audio {
+  color: #f5a6ff;
+}
+
 .file-icon-shell {
   color: #71f8a7;
 }
@@ -561,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;
@@ -929,6 +986,187 @@
   color: var(--text-muted);
 }
 
+.file-viewer-image-shell {
+  flex: 1 1 auto;
+  min-height: 0;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 18px;
+  overflow: auto;
+}
+
+.file-viewer-image {
+  max-width: 100%;
+  max-height: 100%;
+  width: auto;
+  height: auto;
+  border-radius: 8px;
+  border: 1px solid var(--border);
+  background: rgba(255, 255, 255, 0.02);
+  box-shadow: 0 8px 30px rgba(0, 0, 0, 0.35);
+}
+
+.file-viewer-audio-shell {
+  flex: 1 1 auto;
+  min-height: 0;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 18px;
+  overflow: auto;
+}
+
+.file-viewer-audio-player {
+  width: min(640px, 100%);
+}
+
+.file-viewer-sqlite-shell {
+  flex: 1 1 auto;
+  min-height: 0;
+  height: 100%;
+  overflow: auto;
+  padding: 14px 16px 22px;
+}
+
+.file-viewer-sqlite-header {
+  font-size: 12px;
+  color: var(--text-dim);
+  margin-bottom: 10px;
+}
+
+.file-viewer-sqlite-footer {
+  margin-top: 10px;
+  text-align: center;
+  font-size: 12px;
+  color: var(--text-dim);
+}
+
+.file-viewer-sqlite-list {
+  flex: 0 0 240px;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.file-viewer-sqlite-layout {
+  display: flex;
+  gap: 12px;
+  align-items: stretch;
+  min-height: 0;
+}
+
+.file-viewer-sqlite-card {
+  width: 100%;
+  text-align: left;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  padding: 7px 10px;
+  background: rgba(255, 255, 255, 0.02);
+  font: inherit;
+}
+
+.file-viewer-sqlite-card:hover {
+  background: rgba(255, 255, 255, 0.04);
+}
+
+.file-viewer-sqlite-card.is-active {
+  border-color: rgba(99, 235, 255, 0.45);
+  background: rgba(99, 235, 255, 0.08);
+}
+
+.file-viewer-sqlite-title {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 10px;
+  font-size: 12px;
+  color: var(--text);
+  margin-bottom: 0;
+}
+
+.file-viewer-sqlite-type {
+  font-size: 10px;
+  letter-spacing: 0.06em;
+  text-transform: uppercase;
+  color: var(--text-dim);
+}
+
+.file-viewer-sqlite-table-shell {
+  flex: 1;
+  min-width: 0;
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  padding: 10px;
+  background: rgba(255, 255, 255, 0.015);
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+}
+
+.file-viewer-sqlite-table-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 10px;
+}
+
+.file-viewer-sqlite-table-name {
+  font-size: 12px;
+  color: var(--text);
+  font-weight: 600;
+}
+
+.file-viewer-sqlite-table-nav {
+  display: inline-flex;
+  gap: 6px;
+}
+
+.file-viewer-sqlite-table-meta {
+  margin-top: 4px;
+  margin-bottom: 8px;
+  font-size: 11px;
+  color: var(--text-dim);
+}
+
+.file-viewer-sqlite-table-wrap {
+  min-height: 0;
+  overflow: auto;
+}
+
+.file-viewer-sqlite-table {
+  width: 100%;
+  border-collapse: collapse;
+  table-layout: fixed;
+}
+
+.file-viewer-sqlite-table th,
+.file-viewer-sqlite-table td {
+  border: 1px solid var(--border);
+  padding: 6px 8px;
+  font-size: 11px;
+  color: var(--text-muted);
+  text-align: left;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.file-viewer-sqlite-table th {
+  color: var(--text);
+  background: rgba(255, 255, 255, 0.04);
+}
+
+.file-viewer-sqlite-table-empty {
+  color: var(--text-dim);
+}
+
 .file-viewer-state-error {
   color: #f87171;
 }
@@ -1045,20 +1283,30 @@
   text-overflow: ellipsis;
 }
 
-.sidebar-git-dirty {
-  font-size: 10px;
-  text-transform: uppercase;
-  letter-spacing: 0.06em;
+.sidebar-git-sync-status {
+  font-size: 12px;
+  font-weight: 600;
+  line-height: 1;
 }
 
-.sidebar-git-dirty.is-clean {
+.sidebar-git-sync-status.is-up-to-date {
   color: #71f8a7;
 }
 
-.sidebar-git-dirty.is-dirty {
+.sidebar-git-sync-status.is-ahead,
+.sidebar-git-sync-status.is-diverged {
   color: #f3a86a;
 }
 
+.sidebar-git-sync-status.is-behind {
+  color: #93c5fd;
+}
+
+.sidebar-git-sync-status.is-no-upstream,
+.sidebar-git-sync-status.is-upstream-gone {
+  color: var(--text-dim);
+}
+
 .sidebar-git-meta {
   color: var(--text-muted);
 }