omnispace 0.3.0 → 0.3.1

package/dist/pull.js

@@ -121,13 +121,24 @@ async function pruneEmptyDirs(root, path) {
         parts.pop();
     }
 }
-function listSome(paths, max = 20) {
+function listSome(paths, max = 20, out = console.error) {
     for (const path of paths.slice(0, max))
-        console.error(`  ${path}`);
+        out(`  ${path}`);
     if (paths.length > max)
-        console.error(`  ... e mais ${paths.length - max}`);
+        out(`  ... e mais ${paths.length - max}`);
+}
+/** Local changes not on the server yet, one per line, marking the ones deleted here. */
+function listPending(paths, local) {
+    listSome(paths.map((p) => (local.has(p) ? `  ${p}` : `  ${p} (apagado aqui)`)), 20, console.log);
 }
 export const CONFLICT_CHOICES = ["local", "mesclar", "backup"];
+/** Files a pull wrote or removed, counting the ones settled by merge, backup or a conflict choice. */
+export function countApplied(plan, resolutions) {
+    return {
+        written: plan.writes.length + resolutions.filter((r) => !r.remove && (r.hash !== undefined || r.text !== undefined)).length,
+        deleted: plan.deletes.length + resolutions.filter((r) => r.remove).length,
+    };
+}
 /** The question for each kind of conflict, with one label per choice (local, mesclar, backup). */
 function promptFor(conflict) {
     switch (conflict.kind) {
@@ -275,7 +286,9 @@ async function pullWith(root, config, token, opts, asker) {
         else
             console.log(`✓ Esta pasta já está na versão ${head}, a mais nova do servidor.\n`);
         if (plan.localOnly.length > 0) {
-            console.log(`  ${plan.localOnly.length} mudança(s) local(is) ainda não enviada(s). Envie com omni sync --push.\n`);
+            console.log(`  ${plan.localOnly.length} mudança(s) local(is) ainda não enviada(s):`);
+            listPending(plan.localOnly, local);
+            console.log("  Envie com omni sync --push.\n");
         }
         return 0;
     }
@@ -412,7 +425,8 @@ async function pullWith(root, config, token, opts, asker) {
     const ack = await callApi(config.apiUrl, token, "/api/cli/sync/ack", { spaceId: config.spaceId, version: head });
     if (!ack.ok)
         console.error(`(aviso) A pasta está na versão ${head}, mas o servidor não registrou: ${ack.error}`);
-    console.log(`✓ Pasta na versão ${head}: ${plan.writes.length} arquivo(s) gravado(s), ${plan.deletes.length} apagado(s).`);
+    const applied = countApplied(plan, resolutions);
+    console.log(`✓ Pasta na versão ${head}: ${applied.written} arquivo(s) gravado(s), ${applied.deleted} apagado(s).`);
     if (autoMerged > 0)
         console.log(`  ${autoMerged} arquivo(s) mudaram dos dois lados e foram juntados sozinhos.`);
     if (backedUp.length > 0) {
@@ -423,9 +437,17 @@ async function pullWith(root, config, token, opts, asker) {
         for (const path of marked)
             console.log(`    ${path}`);
     }
-    const pendingPush = plan.localOnly.length + resolutions.filter((r) => r.pendingPush && !r.markers).length;
-    if (pendingPush > 0 && marked.length === 0) {
-        console.log(`  ${pendingPush} mudança(s) desta máquina ainda não estão no servidor.`);
+    const pendingPush = [
+        ...plan.localOnly,
+        ...resolutions.filter((r) => r.pendingPush && !r.markers).map((r) => r.path),
+    ].sort();
+    if (pendingPush.length > 0 && marked.length === 0) {
+        const afterPull = new Map(local);
+        for (const r of resolutions)
+            if (r.remove)
+                afterPull.delete(r.path);
+        console.log(`  ${pendingPush.length} mudança(s) desta máquina ainda não estão no servidor:`);
+        listPending(pendingPush, afterPull);
         if (process.stdin.isTTY && !opts.conflito) {
             const answer = await asker.ask("Enviar agora? (s/n) ");
             if (answer === "s" || answer === "sim")

package/package.json

@@ -1,39 +1,39 @@
-{
-  "name": "omnispace",
-  "version": "0.3.0",
-  "description": "Omni CLI (alpha): transforma uma pasta da sua máquina em um espaço Omni e sincroniza entre máquinas.",
-  "type": "module",
-  "bin": {
-    "omni": "dist/index.js",
-    "omnispace": "dist/index.js"
-  },
-  "files": [
-    "dist",
-    "README.md"
-  ],
-  "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "typecheck": "tsc -p tsconfig.json --noEmit",
-    "omni": "node dist/index.js",
-    "test": "tsc -p tsconfig.test.json && node --test \".test-build/test/**/*.test.js\""
-  },
-  "engines": {
-    "node": ">=20"
-  },
-  "keywords": [
-    "omni",
-    "tzolkin",
-    "ai",
-    "agent",
-    "sync",
-    "knowledge-base",
-    "cli"
-  ],
-  "homepage": "https://omni.tzolkin.cloud",
-  "license": "UNLICENSED",
-  "author": "Tzolkin",
-  "devDependencies": {
-    "@types/node": "^20",
-    "typescript": "^5"
-  }
-}
+{
+  "name": "omnispace",
+  "version": "0.3.1",
+  "description": "Omni CLI (alpha): transforma uma pasta da sua máquina em um espaço Omni e sincroniza entre máquinas.",
+  "type": "module",
+  "bin": {
+    "omni": "dist/index.js",
+    "omnispace": "dist/index.js"
+  },
+  "files": [
+    "dist",
+    "README.md"
+  ],
+  "scripts": {
+    "build": "tsc -p tsconfig.json",
+    "typecheck": "tsc -p tsconfig.json --noEmit",
+    "omni": "node dist/index.js",
+    "test": "tsc -p tsconfig.test.json && node --test \".test-build/test/**/*.test.js\""
+  },
+  "engines": {
+    "node": ">=20"
+  },
+  "keywords": [
+    "omni",
+    "tzolkin",
+    "ai",
+    "agent",
+    "sync",
+    "knowledge-base",
+    "cli"
+  ],
+  "homepage": "https://omni.tzolkin.cloud",
+  "license": "UNLICENSED",
+  "author": "Tzolkin",
+  "devDependencies": {
+    "@types/node": "^20",
+    "typescript": "^5"
+  }
+}