loopat 0.1.50 → 0.1.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "loopat",
-  "version": "0.1.50",
+  "version": "0.1.52",
   "description": "Self-hosted AI workspace built around context management — works solo, scales to teams",
   "license": "Apache-2.0",
   "homepage": "https://github.com/simpx/loopat",
@@ -39,7 +39,10 @@
     "test:e2e": "playwright test",
     "test:e2e:ui": "playwright test --ui",
     "dogfood": "playwright test --config dogfood/playwright.config.ts",
-    "dogfood:first-run": "playwright test --config dogfood/first-run/playwright.config.ts"
+    "dogfood:smoke": "playwright test --config dogfood/playwright.config.ts dogfood/first-5-minutes",
+    "dogfood:journey": "playwright test --config dogfood/first-run/playwright.config.ts",
+    "dogfood:first-run": "playwright test --config dogfood/first-run/playwright.config.ts",
+    "dogfood:sync": "playwright test --config dogfood/sync/playwright.config.ts"
   },
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.3.150",

package/server/src/index.ts

@@ -4,7 +4,7 @@ import { createBunWebSocket } from "hono/bun"
 import { existsSync } from "node:fs"
 import { execFile, execFileSync } from "node:child_process"
 import { promisify } from "node:util"
-import { listLoops, createLoop, getLoop, loopExists, patchLoopMeta, backfillAllMounts, ensureWorkspaceDirs, provisionUserPersonal, importPersonalFromRepo, setupPersonalViaProvider, listPersonalReposViaProvider, authenticateViaProvider, isPersonalFresh, ensureUiNotesWorktree, syncUiNotes, ffUpdateUiNotes, notesBehind, inspectPersonalDirty, syncPersonalToRemote, deletePersonalVault, pullPersonalFromRemote, pushPersonalToRemote, ensureContextMounts, effectiveDriver, isDriver, distillLoop, inspectRepoSync, pullRepoFromRemote, pushRepoToRemote, listVaultPublicKeys, userOnboarding, submitOnboarding } from "./loops"
+import { listLoops, createLoop, getLoop, loopExists, patchLoopMeta, backfillAllMounts, ensureWorkspaceDirs, provisionUserPersonal, importPersonalFromRepo, setupPersonalViaProvider, listPersonalReposViaProvider, authenticateViaProvider, isPersonalFresh, ensureUiNotesWorktree, syncUiNotes, ffUpdateUiNotes, discardUiNotes, notesBehind, inspectPersonalDirty, syncPersonalToRemote, deletePersonalVault, pullPersonalFromRemote, pushPersonalToRemote, ensureContextMounts, effectiveDriver, isDriver, distillLoop, inspectRepoSync, pullRepoFromRemote, pushRepoToRemote, listVaultPublicKeys, userOnboarding, submitOnboarding } from "./loops"
 import { getEphemeralHostPort, probePodman, stopAllWorkspaceContainers, ensureServeContainer, ensurePortProxyContainer, ensureSandboxImage } from "./podman"
 import { startMcpAuth, completeMcpAuth, probeOAuthSupport, evictOAuthProbe, parseBearerEnvName, mcpRequiredEnvs, parseTemplateVars, type OAuthSupport } from "./mcp-oauth"
 import { DEFAULT_VAULT, loadVaultEnvs } from "./vaults"
@@ -2392,6 +2392,15 @@ app.post("/api/notes/refresh", requireAuth, async (c) => {
   return c.json({ ok: true })
 })
 
+// Take-remote: drop held-back local notes edits, reset hard to origin. The
+// escape hatch when save reports a same-spot conflict it can't rebase past.
+app.post("/api/notes/discard", requireAuth, async (c) => {
+  const userId = c.get("userId") as string
+  const r = await discardUiNotes(userId)
+  if (!r.ok) return c.json({ error: r.error }, 400)
+  return c.json({ ok: true })
+})
+
 app.delete("/api/workspace/file", requireAuth, async (c) => {
   const userId = c.get("userId") as string
   const vault = c.req.query("vault") ?? ""

package/server/src/loops.ts

@@ -453,8 +453,23 @@ async function ensureRepoMirror(user: string, name: string, sshCommand?: string)
   if (!spec?.git) return null
   const dir = personalRepoCacheDir(user, name)
   const env = sshCommand ? { ...process.env, GIT_SSH_COMMAND: sshCommand } : process.env
-  // Already mirrored → just fetch (incremental, fast). HEAD presence == bare repo.
+  // Pin the STANDARD fetch refspec (default branch → refs/remotes/origin/<def>)
+  // so worktrees off this mirror get an ordinary `origin/<def>` tracking ref —
+  // `git rebase origin/<def>`, `git status` ahead/behind, `git log origin/<def>`
+  // all work as in any normal clone. Self-healing: re-assert it on EVERY ensure
+  // (incl. caches pinned by the old non-standard `+…:refs/heads/<def>` refspec),
+  // then fetch so the standard ref materializes.
+  const assertStandardRefspec = async () => {
+    const def = await execFileP("git", ["-C", dir, "symbolic-ref", "--short", "HEAD"])
+      .then((r) => r.stdout.trim()).catch(() => "")
+    if (def) {
+      await execFileP("git", ["-C", dir, "config", "remote.origin.fetch", `+refs/heads/${def}:refs/remotes/origin/${def}`]).catch(() => {})
+    }
+  }
+  // Already mirrored → re-assert the standard refspec, then fetch (incremental,
+  // fast). HEAD presence == bare repo.
   if (existsSyncBase(join(dir, "HEAD"))) {
+    await assertStandardRefspec()
     await execFileP("git", ["-C", dir, "fetch", "--quiet", "origin"], { env, timeout: 60_000 }).catch(() => {})
     return dir
   }
@@ -474,13 +489,13 @@ async function ensureRepoMirror(user: string, name: string, sshCommand?: string)
       await execFileP("git", ["clone", "--bare", "--single-branch", "--", spec.git, dir], { env, timeout: 300_000 })
     }
     // A bare clone sets NO fetch refspec, so `git fetch origin` wouldn't advance
-    // any ref. Pin one for JUST the default branch so future fetches keep
-    // refs/heads/<default> (= the worktree start point) fresh — and stay small.
-    const def = await execFileP("git", ["-C", dir, "symbolic-ref", "--short", "HEAD"])
-      .then((r) => r.stdout.trim()).catch(() => "")
-    if (def) {
-      await execFileP("git", ["-C", dir, "config", "remote.origin.fetch", `+refs/heads/${def}:refs/heads/${def}`]).catch(() => {})
-    }
+    // any ref. Pin the STANDARD one for JUST the default branch
+    // (+refs/heads/<def>:refs/remotes/origin/<def>) so worktrees off this mirror
+    // get an ordinary `origin/<def>` tracking ref — and the mirror stays small.
+    await assertStandardRefspec()
+    // Materialize refs/remotes/origin/<def> now (the clone only wrote
+    // refs/heads/<def>), so the very first worktree already tracks origin.
+    await execFileP("git", ["-C", dir, "fetch", "--quiet", "origin"], { env, timeout: 60_000 }).catch(() => {})
     console.log(`[loopat] mirrored ${spec.git} → ${dir}`)
     return dir
   } catch (e: any) {
@@ -1592,6 +1607,29 @@ export async function ffUpdateUiNotes(
   }
 }
 
+/**
+ * Take-remote: discard the user's held-back notes edits and reset hard to
+ * origin. The escape hatch from a same-spot conflict the rebase can't clear —
+ * "drop this edit, take the remote" (the other half is keep-mine via a loop AI
+ * merge). Destructive by design; the UI confirms first.
+ */
+export async function discardUiNotes(
+  user: string,
+): Promise<{ ok: true } | { ok: false; error: string }> {
+  const dir = uiNotesDir(user)
+  await ensureUiNotesWorktree(user)
+  const branch = await remoteDefaultBranch(dir)
+  try {
+    await execFileP("git", ["-C", dir, "fetch", "origin"], {
+      env: { ...process.env, GIT_TERMINAL_PROMPT: "0", GIT_SSH_COMMAND: sshCommandForUser(user) }, timeout: 30_000,
+    })
+    await execFileP("git", ["-C", dir, "reset", "--hard", `origin/${branch}`])
+    return { ok: true }
+  } catch (e: any) {
+    return { ok: false, error: `discard failed: ${e?.stderr ?? e?.message ?? e}` }
+  }
+}
+
 /**
  * How many commits the user's notes worktree is behind origin/main (after a
  * fetch). Drives the "remote updated" hint. 0 = up to date.
@@ -2059,6 +2097,14 @@ async function remoteDefaultBranch(dir: string): Promise<string> {
     const m = stdout.match(/ref:\s+refs\/heads\/(\S+)\s+HEAD/)
     if (m?.[1]) return m[1]
   } catch {}
+  // Bare mirrors don't carry a refs/remotes/origin/HEAD, but their own HEAD
+  // symbolic-ref names the default branch the clone tracked — cheaper than (and
+  // a fallback for) ls-remote, and correct for `ensureRepoMirror`'s mirrors.
+  try {
+    const { stdout } = await execFileP("git", ["-C", dir, "symbolic-ref", "--short", "HEAD"])
+    const b = stdout.trim().replace(/^origin\//, "")
+    if (b) return b
+  } catch {}
   return "main"
 }
 
@@ -2206,10 +2252,17 @@ export async function createLoop(opts: {
     const branch = `loop/${(await shortBranchSlug(meta.title))}-${id.slice(0, 6)}`
     try {
       // ① pull (docs/context-flow.md): ensureRepoMirror already fetched, so the
-      // mirror's HEAD (refs/heads/<default>) is the latest consensus. Worktree
-      // the new loop branch off it — fresh, and the worktree's `origin` is the
-      // real remote, so the loop's pushes go straight upstream.
-      await execFileP("git", ["-C", repoPath, "worktree", "add", "-b", branch, loopWorkdir(id)])
+      // mirror's `origin/<default>` tracking ref is the latest consensus. Open
+      // the loop branch off `origin/<default>` (not the bare mirror's HEAD) so
+      // the worktree is an ORDINARY clone: it has a real `origin/<default>`
+      // tracking ref and `git rebase origin/<default>` / `git status`
+      // ahead-behind work with nothing special to learn. Fall back to HEAD only
+      // if origin/<default> can't be resolved (offline / empty remote).
+      const start = await remoteStartPoint(repoPath, userSsh)
+      const addArgs = start
+        ? ["-C", repoPath, "worktree", "add", "-b", branch, loopWorkdir(id), start]
+        : ["-C", repoPath, "worktree", "add", "-b", branch, loopWorkdir(id)]
+      await execFileP("git", addArgs)
       meta.repo = opts.repo
       meta.branch = branch
     } catch (e: any) {

package/server/templates/CLAUDE.md

@@ -71,6 +71,7 @@ For team memory: when an insight is genuinely team-relevant (a convention everyo
 - **Don't echo sensitive values** (API keys, tokens, SSH key material, anything that looks like a credential) to chat. Reference by filename or env var name instead.
 - **Default to short, direct answers**. Don't announce a plan unless the task is genuinely large.
 - **Read before Edit on long files**; avoid guessing surrounding context.
+- **`origin` is the source of truth — finishing means pushing to origin.** The workdir is an ordinary git worktree with a normal `origin/<default>` tracking ref, so `git rebase origin/<default>`, `git status` ahead/behind, and `git log origin/<default>` all work as usual. A local commit is NOT "done": work is only preserved and shared once it reaches origin — open a PR, or push directly when that's the team's flow. Don't consider a task complete while it lives only in local commits.
 
 ## collaboration