@chrysb/alphaclaw 0.3.4 → 0.3.5-beta.1

package/bin/alphaclaw.js

@@ -10,6 +10,9 @@ const {
   validateGitSyncFilePath,
 } = require("../lib/cli/git-sync");
 const { buildSecretReplacements } = require("../lib/server/helpers");
+const {
+  migrateManagedInternalFiles,
+} = require("../lib/server/internal-files-migration");
 
 const kUsageTrackerPluginPath = path.resolve(
   __dirname,
@@ -143,6 +146,10 @@ if (portFlag) {
 
 const openclawDir = path.join(rootDir, ".openclaw");
 fs.mkdirSync(openclawDir, { recursive: true });
+const { hourlyGitSyncPath } = migrateManagedInternalFiles({
+  fs,
+  openclawDir,
+});
 console.log(`[alphaclaw] Root directory: ${rootDir}`);
 
 // Check for pending update marker (written by the update endpoint before restart).
@@ -542,7 +549,6 @@ if (!fs.existsSync(gogConfigFile)) {
 // 8. Install/reconcile system cron entry
 // ---------------------------------------------------------------------------
 
-const hourlyGitSyncPath = path.join(openclawDir, "hourly-git-sync.sh");
 const packagedHourlyGitSyncPath = path.join(setupDir, "hourly-git-sync.sh");
 
 try {
@@ -747,6 +753,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,
@@ -822,7 +847,16 @@ if (fs.existsSync(configPath)) {
       const replacements = buildSecretReplacements(process.env);
       for (const [secret, envRef] of replacements) {
         if (secret) {
-          content = content.split(secret).join(envRef);
+          // Only replace the secret if it is an exact match for a JSON string value
+          // This ensures we do not replace substrings inside other strings
+          const secretJson = JSON.stringify(secret);
+          content = content.replace(
+            new RegExp(
+              secretJson.replace(/[-\/\\^$*+?.()|[\]{}]/g, "\\$&"),
+              "g",
+            ),
+            JSON.stringify(envRef),
+          );
         }
       }
       fs.writeFileSync(configPath, content);
@@ -856,7 +890,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/css/explorer.css

@@ -105,6 +105,11 @@
   padding: 6px 0 8px;
 }
 
+.file-tree-wrap-loading {
+  min-height: 100%;
+  display: flex;
+}
+
 .file-tree-search {
   padding: 0 8px 6px;
 }
@@ -254,6 +259,10 @@
   color: #ff7ac6;
 }
 
+.file-icon-audio {
+  color: #f5a6ff;
+}
+
 .file-icon-shell {
   color: #71f8a7;
 }
@@ -281,6 +290,14 @@
   box-shadow: 0 0 6px rgba(45, 226, 255, 0.75);
 }
 
+.tree-lock-icon {
+  flex: 0 0 auto;
+  margin-left: auto;
+  width: 11px;
+  height: 11px;
+  color: var(--text-dim);
+}
+
 .tree-children {
   list-style: none;
 }
@@ -295,6 +312,15 @@
   color: var(--text-muted);
 }
 
+.file-tree-state-loading {
+  width: 100%;
+  flex: 1 1 auto;
+  min-height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
 .file-tree-state-error {
   color: #f87171;
 }
@@ -331,6 +357,21 @@
   background: rgba(234, 179, 8, 0.08);
 }
 
+.file-viewer-protected-banner.is-locked {
+  background: rgba(220, 38, 38, 0.16);
+}
+
+.file-viewer-protected-banner-icon {
+  width: 14px;
+  height: 14px;
+  color: #fca5a5;
+  flex-shrink: 0;
+}
+
+.file-viewer-protected-banner.is-locked .file-viewer-protected-banner-text {
+  color: #fecaca;
+}
+
 .file-viewer-protected-banner-text {
   font-size: 12px;
   color: #f7cc5e;
@@ -344,6 +385,15 @@
   letter-spacing: 0.01em;
 }
 
+.file-viewer-diff-banner {
+  background: rgba(59, 130, 246, 0.12);
+}
+
+.file-viewer-diff-banner .file-viewer-protected-banner-text,
+.file-viewer-diff-banner {
+  color: #bfdbfe;
+}
+
 .file-viewer-tabbar-spacer {
   flex: 1;
 }
@@ -559,6 +609,48 @@
   align-items: stretch;
 }
 
+.file-viewer-diff-shell {
+  width: 100%;
+  min-height: 0;
+  height: 100%;
+  overflow: auto;
+  padding: 8px 0;
+}
+
+.file-viewer-diff-pre {
+  margin: 0;
+  padding: 0 12px 12px;
+  font-family: inherit;
+  font-size: 12px;
+  line-height: 1.45;
+  color: var(--text-muted);
+}
+
+.file-viewer-diff-line {
+  white-space: pre-wrap;
+  word-break: break-word;
+  padding: 1px 8px;
+  border-radius: 4px;
+}
+
+.file-viewer-diff-line.is-added {
+  color: #86efac;
+  background: rgba(34, 197, 94, 0.1);
+}
+
+.file-viewer-diff-line.is-removed {
+  color: #fca5a5;
+  background: rgba(239, 68, 68, 0.1);
+}
+
+.file-viewer-diff-line.is-hunk {
+  color: #93c5fd;
+}
+
+.file-viewer-diff-line.is-header {
+  color: var(--text-dim);
+}
+
 .file-viewer-editor-line-num-col {
   width: 56px;
   flex-shrink: 0;
@@ -841,6 +933,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;
 }
@@ -957,35 +1230,138 @@
   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);
 }
 
-.sidebar-git-list {
+.sidebar-git-changes-label {
+  padding: 7px 10px 4px;
+  font-size: 10px;
+  letter-spacing: 0.06em;
+  text-transform: uppercase;
+  color: var(--text-dim);
+}
+
+.sidebar-git-changes-list {
   list-style: none;
   display: flex;
   flex-direction: column;
-  gap: 3px;
-  padding: 6px 10px 0;
+  gap: 2px;
+  padding: 0 6px;
+}
+
+.sidebar-git-change-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+  min-height: 22px;
+  padding: 2px 6px;
+  border-radius: 6px;
+  line-height: 1.25;
+}
+
+.sidebar-git-change-row.is-clickable {
+  cursor: pointer;
+}
+
+.sidebar-git-change-row.is-clickable:hover {
+  background: rgba(255, 255, 255, 0.04);
+}
+
+.sidebar-git-change-path {
+  min-width: 0;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  color: var(--text-muted);
+  font-weight: 400;
+}
+
+.sidebar-git-change-meta {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  flex-shrink: 0;
+  font-size: 10px;
+}
+
+.sidebar-git-change-plus {
+  color: #71f8a7;
+}
+
+.sidebar-git-change-minus {
+  color: #f3a86a;
+}
+
+.sidebar-git-change-status {
+  font-size: 10px;
+  letter-spacing: 0.06em;
+}
+
+.sidebar-git-change-row.is-untracked .sidebar-git-change-status {
+  color: #71f8a7;
+}
+
+.sidebar-git-change-row.is-modified .sidebar-git-change-status {
+  color: #63ebff;
+}
+
+.sidebar-git-change-row.is-deleted .sidebar-git-change-status {
+  color: #f87171;
+}
+
+.sidebar-git-change-row.is-deleted .sidebar-git-change-path {
+  text-decoration: line-through;
+  text-decoration-thickness: 1px;
+}
+
+.sidebar-git-scroll {
   overflow-y: auto;
   min-height: 0;
   flex: 1 1 auto;
 }
 
+.sidebar-git-actions {
+  padding: 8px 10px 6px;
+}
+
+.sidebar-git-sync-button {
+  width: 100%;
+}
+
+.sidebar-git-list {
+  list-style: none;
+  display: flex;
+  flex-direction: column;
+  gap: 3px;
+  padding: 6px 10px 0;
+}
+
 .sidebar-git-list li {
   display: flex;
   align-items: baseline;

package/lib/public/css/theme.css

@@ -8,7 +8,7 @@
   --border-strong: rgba(255, 255, 255, 0.11);
   --text: #c9d1d9;
   --text-muted: #6e7681;
-  --text-dim: #383d47;
+  --text-dim: #424854;
   --accent: #63ebff;
   --accent-dim: rgba(99, 235, 255, 0.4);
   --accent-link: rgba(99, 235, 255, 0.6);