midsummer-sol 0.1.1 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "midsummer-sol",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Sol — agent-native version control (a new git). CLI, MCP server, and no-filesystem SDK.",
   "bin": {
     "sol": "./sol.js",

package/sol.js

@@ -1630,6 +1630,28 @@ async function resolveRef(log, ref) {
   const op = ops.find((o) => o.rootAfter.startsWith(bare) || (o.entryHash ?? "").startsWith(bare)) || die("unknown ref: " + ref);
   return { head: op.rootAfter, op };
 }
+async function resolveRefSoft(log, ref) {
+  const ops = await log.history();
+  if (!ref || ref === "head" || ref === "HEAD")
+    return { head: await log.head() ?? "", op: ops[ops.length - 1] };
+  if (existsSync6(refsPath())) {
+    const refs = JSON.parse(readFileSync6(refsPath(), "utf8"));
+    if (ref === refs.current) {
+      const h = await log.head() ?? "";
+      return { head: h, op: [...ops].reverse().find((o) => o.rootAfter === h) ?? ops[ops.length - 1] };
+    }
+    const named = refs.branches[ref]?.head ?? refs.tags[ref];
+    if (named !== undefined)
+      return { head: named, op: [...ops].reverse().find((o) => o.rootAfter === named) };
+  }
+  if (/^\d+$/.test(ref)) {
+    const op2 = ops.find((o) => o.seq === Number(ref));
+    return op2 ? { head: op2.rootAfter, op: op2 } : undefined;
+  }
+  const bare = ref.startsWith("h_") ? ref : "h_" + ref;
+  const op = ops.find((o) => o.rootAfter.startsWith(bare) || (o.entryHash ?? "").startsWith(bare));
+  return op ? { head: op.rootAfter, op } : undefined;
+}
 function materialize(store, head, path) {
   const blob = fileAt(store, head, path);
   if (!blob)
@@ -1656,6 +1678,40 @@ function materialize(store, head, path) {
   }
   return true;
 }
+function materializeInto(store, head, target, path) {
+  const blob = fileAt(store, head, path);
+  if (!blob)
+    return false;
+  const abs = resolve2(target, path);
+  if (abs !== target && !abs.startsWith(target + sep2))
+    return false;
+  const mode = modeAt(store, head, path);
+  mkdirSync5(dirname3(abs), { recursive: true });
+  if (mode === SYMLINK_MODE2) {
+    try {
+      unlinkSync4(abs);
+    } catch {}
+    symlinkSync3(blob.content, abs);
+    return true;
+  }
+  writeFileSync6(abs, blob.encoding === "base64" ? Buffer.from(blob.content, "base64") : blob.content);
+  if (mode === EXEC_MODE2) {
+    try {
+      chmodSync3(abs, EXEC_MODE2);
+    } catch {}
+  }
+  return true;
+}
+function writeWorkingIndexAt(targetSolDir, target, files) {
+  const idx = {};
+  for (const f of files) {
+    try {
+      const st = lstatSync3(join6(target, f));
+      idx[f] = [st.mtimeMs, st.size, st.mode & 73 ? 1 : 0];
+    } catch {}
+  }
+  writeFileSync6(join6(targetSolDir, "index.json"), JSON.stringify(idx));
+}
 function materializeTree(store, head) {
   const want = new Set(head ? listAll(store, head) : []);
   let n = 0;
@@ -1809,13 +1865,17 @@ function workingChanges(store, head, index = loadWorkingIndex()) {
   }
   return { added: added.sort(), modified: modified.sort(), removed: removed.sort() };
 }
-function printWorkingDiff(store, base) {
+function printWorkingDiff(store, base, only) {
   const ch = workingChanges(store, base);
-  for (const f of ch.added)
+  const keep = (f) => only === undefined || f === only;
+  const added = ch.added.filter(keep);
+  const removed = ch.removed.filter(keep);
+  const modified = ch.modified.filter(keep);
+  for (const f of added)
     console.log(`+ added    ${f}`);
-  for (const f of ch.removed)
+  for (const f of removed)
     console.log(`- removed  ${f}`);
-  for (const f of ch.modified) {
+  for (const f of modified) {
     console.log(`~ modified ${f}`);
     const abs = join6(cwd2, f);
     if (lstatSync3(abs).isSymbolicLink())
@@ -1827,8 +1887,16 @@ function printWorkingDiff(store, base) {
     if (typeof stored === "string" && stored !== buf.toString("utf8"))
       console.log(indent(lineHunks2(stored, buf.toString("utf8"))));
   }
-  if (!ch.added.length && !ch.removed.length && !ch.modified.length)
-    console.log("no working changes");
+  if (!added.length && !removed.length && !modified.length)
+    console.log(only ? `no working changes in ${only}` : "no working changes");
+}
+function isWorkingPath(store, head, arg) {
+  const rel = repoRel(arg);
+  if (lexists(join6(cwd2, rel)))
+    return rel;
+  if (head && listAll(store, head).includes(rel))
+    return rel;
+  return;
 }
 function blameFile(ops, store, path) {
   let tagged = [];
@@ -2401,10 +2469,26 @@ async function main() {
       case "diff": {
         const { log } = open();
         const store = loadStore();
+        const head = await log.head() ?? "";
         if (args.length >= 2) {
           printTreeDiff(diffTrees(store, (await resolveRef(log, args[0])).head, (await resolveRef(log, args[1])).head));
+        } else if (args.length === 1) {
+          const resolved = await resolveRefSoft(log, args[0]);
+          if (resolved) {
+            printWorkingDiff(store, resolved.head);
+          } else {
+            const path = isWorkingPath(store, head, args[0]);
+            if (path)
+              printWorkingDiff(store, head, path);
+            else
+              die(`'${args[0]}' is neither a ref nor a working-tree path.
+  usage: sol diff            (working tree vs HEAD)
+         sol diff <ref>      (working tree vs a branch/commit)
+         sol diff <ref> <ref> (tree vs tree)
+         sol diff <path>     (one file, working tree vs HEAD)`);
+          }
         } else {
-          printWorkingDiff(store, (await resolveRef(log, args[0])).head);
+          printWorkingDiff(store, head);
         }
         break;
       }
@@ -2872,17 +2956,11 @@ async function main() {
           store.put(node);
         let n = 0;
         if (checkoutHead) {
-          for (const f of listAll3(store, checkoutHead)) {
-            const abs = resolve3(target, f);
-            if (abs !== target && !abs.startsWith(target + sep3))
-              continue;
-            const blob = fileAt3(store, checkoutHead, f);
-            if (!blob)
-              continue;
-            mkdirSync7(dirname5(abs), { recursive: true });
-            writeFileSync9(abs, blob.encoding === "base64" ? Buffer.from(blob.content, "base64") : blob.content);
-            n++;
-          }
+          const files = listAll3(store, checkoutHead);
+          for (const f of files)
+            if (materializeInto(store, checkoutHead, target, f))
+              n++;
+          writeWorkingIndexAt(fdir, target, files);
         }
         console.log(`cloned ${repoName} -> ${rest[1] || repoName} (${bundle.ops.length} ops, ${Object.keys(cloneBranches).length} branch(es), ${n} files, on ${onBranch})`);
         break;
@@ -2898,8 +2976,9 @@ async function main() {
         const localRefs = existsSync9(refsPath()) ? JSON.parse(readFileSync9(refsPath(), "utf8")) : undefined;
         const branch = localRefs?.current ?? "main";
         const branchHead = await log.head() ?? "";
+        const remoteWasEmpty = rh.seq === 0 && !rh.tip;
         if (localSeq === rh.seq && localTip === rh.tip) {
-          console.log("everything up to date");
+          console.log(remoteWasEmpty ? "nothing to push \u2014 local repo is empty (commit something first)" : "everything up to date");
           break;
         }
         if (rh.seq > 0) {
@@ -2936,7 +3015,11 @@ async function main() {
         }
         setOpLogHead(res.head ?? branchHead);
         const prod = res.refs?.production;
-        console.log(`pushed ${res.applied} op(s) -> remote (branch ${branch} @ ${(res.head ?? "").slice(0, 12)})${prod ? `; production=${prod}` : ""}`);
+        if (remoteWasEmpty) {
+          console.log(`created remote repo ${cfg.repo} \u2014 pushed ${res.applied} op(s) (branch ${branch} @ ${(res.head ?? "").slice(0, 12)})${prod ? `; production=${prod}` : ""}`);
+        } else {
+          console.log(`pushed ${res.applied} op(s) -> remote (branch ${branch} @ ${(res.head ?? "").slice(0, 12)})${prod ? `; production=${prod}` : ""}`);
+        }
         break;
       }
       case "pull": {
@@ -3108,17 +3191,11 @@ async function main() {
           store.put(node);
         let n = 0;
         if (checkoutHead) {
-          for (const f of listAll3(store, checkoutHead)) {
-            const abs = resolve3(target, f);
-            if (abs !== target && !abs.startsWith(target + sep3))
-              continue;
-            const blob = fileAt3(store, checkoutHead, f);
-            if (!blob)
-              continue;
-            mkdirSync7(dirname5(abs), { recursive: true });
-            writeFileSync9(abs, blob.encoding === "base64" ? Buffer.from(blob.content, "base64") : blob.content);
-            n++;
-          }
+          const files = listAll3(store, checkoutHead);
+          for (const f of files)
+            if (materializeInto(store, checkoutHead, target, f))
+              n++;
+          writeWorkingIndexAt(fdir, target, files);
         }
         console.log(`forked ${parent} -> ${newRepo}  (your copy at ${args[3] || newRepo}: ${Object.keys(cloneBranches).length} branch(es), ${n} files; parent: ${parent})`);
         break;