tokrepo 3.0.0 → 3.1.1

package/bin/tokrepo.js

@@ -22,9 +22,10 @@ const C = {
 
 const CONFIG_DIR = path.join(require('os').homedir(), '.tokrepo');
 const CONFIG_FILE = path.join(CONFIG_DIR, 'config.json');
+const SYNC_STATE_FILE = path.join(CONFIG_DIR, 'sync-state.json');
 const PROJECT_CONFIG = '.tokrepo.json';
 const DEFAULT_API = 'https://api.tokrepo.com';
-const CLI_VERSION = '3.0.0';
+const CLI_VERSION = '3.1.1';
 const VERSION_CHECK_FILE = path.join(require('os').homedir(), '.tokrepo', '.version-check');
 
 // ─── Helpers ───
@@ -105,6 +106,15 @@ function compareVersions(a, b) {
   return 0;
 }
 
+// Sync state: maps "dirPath:title" → { uuid, hash, lastSync }
+function readSyncState() {
+  try { return JSON.parse(fs.readFileSync(SYNC_STATE_FILE, 'utf8')); } catch { return {}; }
+}
+function writeSyncState(state) {
+  if (!fs.existsSync(CONFIG_DIR)) fs.mkdirSync(CONFIG_DIR, { recursive: true, mode: 0o700 });
+  fs.writeFileSync(SYNC_STATE_FILE, JSON.stringify(state, null, 2), { mode: 0o600 });
+}
+
 function readProjectConfig(baseDir = process.cwd()) {
   const configPath = path.join(baseDir, PROJECT_CONFIG);
   try {
@@ -955,7 +965,9 @@ function scanDirectory(dirPath) {
       const files = collectAssetFiles(fullPath);
       if (files.length === 0) continue;
 
-      const title = guessAssetTitle(files, entry.name);
+      // Use directory name as title (matches what `push` uses for remote title)
+      // NOT the markdown heading, which can be completely different
+      const title = entry.name;
       const hash = computeHash(files);
       const detectedTags = new Set();
       for (const f of files) {
@@ -1063,35 +1075,54 @@ async function cmdSync() {
 
   log(`  Found ${C.bold}${assets.length}${C.reset} assets\n`);
 
-  // Step 1: Diff with remote
-  info('Comparing with remote...');
-  const diffPayload = assets.map(a => ({ title: a.title, content_hash: a.hash }));
+  // Load local sync state for fast local-only diff
+  const syncState = readSyncState();
 
-  let diffResults;
-  try {
-    const data = await apiRequest('POST', '/api/v1/tokenboard/push/diff', { assets: diffPayload }, config.token, config.api);
-    diffResults = data.results;
-  } catch (e) {
-    // Fallback: if diff endpoint not available, treat all as new
-    warn(`Diff API not available (${e.message}), treating all as new`);
-    diffResults = assets.map(a => ({ title: a.title, status: 'new' }));
+  // Classify each asset: check local state first, then remote diff for unknowns
+  const needsRemoteCheck = [];
+  const localStatus = {};
+
+  for (const asset of assets) {
+    const key = asset.sourcePath;
+    const cached = syncState[key];
+    if (cached && cached.hash === asset.hash) {
+      // Local hash matches last sync — unchanged
+      localStatus[asset.title] = { status: 'unchanged', uuid: cached.uuid };
+    } else if (cached && cached.hash !== asset.hash) {
+      // Local hash differs from last sync — updated
+      localStatus[asset.title] = { status: 'updated', uuid: cached.uuid };
+    } else {
+      // Not in local state — check remote
+      needsRemoteCheck.push(asset);
+    }
   }
 
-  // Build status map
-  const statusMap = {};
-  for (const r of diffResults) {
-    statusMap[r.title] = r;
+  // Remote diff for assets not in local state
+  if (needsRemoteCheck.length > 0) {
+    info('Comparing with remote...');
+    const diffPayload = needsRemoteCheck.map(a => ({ title: a.title, content_hash: a.hash }));
+    try {
+      const data = await apiRequest('POST', '/api/v1/tokenboard/push/diff', { assets: diffPayload }, config.token, config.api);
+      for (const r of data.results) {
+        localStatus[r.title] = { status: r.status, uuid: r.remote_uuid || '' };
+      }
+    } catch (e) {
+      warn(`Diff API: ${e.message} — treating unknowns as new`);
+      for (const a of needsRemoteCheck) {
+        localStatus[a.title] = { status: 'new', uuid: '' };
+      }
+    }
   }
 
   // Show status
   let newCount = 0, updatedCount = 0, unchangedCount = 0;
 
   for (const asset of assets) {
-    const status = statusMap[asset.title]?.status || 'new';
-    if (status === 'new') {
+    const st = localStatus[asset.title] || { status: 'new' };
+    if (st.status === 'new') {
       log(`  ${C.green}+ new${C.reset}       ${asset.title} ${C.dim}(${asset.files.length} files)${C.reset}`);
       newCount++;
-    } else if (status === 'updated') {
+    } else if (st.status === 'updated') {
       log(`  ${C.yellow}~ updated${C.reset}   ${asset.title}`);
       updatedCount++;
     } else {
@@ -1117,13 +1148,13 @@ async function cmdSync() {
     if (confirm.toLowerCase() !== 'y') { log('Aborted.'); return; }
   }
 
-  // Step 2: Upsert each changed asset
+  // Upsert each changed asset + save state
   let successCount = 0;
   let failCount = 0;
 
   for (const asset of assets) {
-    const status = statusMap[asset.title]?.status || 'new';
-    if (status === 'unchanged') continue;
+    const st = localStatus[asset.title] || { status: 'new' };
+    if (st.status === 'unchanged') continue;
 
     const totalChars = asset.files.reduce((sum, f) => sum + f.content.length, 0);
 
@@ -1138,6 +1169,15 @@ async function cmdSync() {
 
       const action = data.action === 'created' ? C.green + '+ created' : C.yellow + '~ updated';
       log(`  ${action}${C.reset}  ${asset.title}  ${C.dim}${data.url}${C.reset}`);
+
+      // Save to local sync state
+      syncState[asset.sourcePath] = {
+        uuid: data.uuid,
+        hash: asset.hash,
+        title: asset.title,
+        url: data.url,
+        lastSync: new Date().toISOString(),
+      };
       successCount++;
     } catch (e) {
       log(`  ${C.red}✗ failed${C.reset}   ${asset.title}: ${e.message}`);
@@ -1145,6 +1185,9 @@ async function cmdSync() {
     }
   }
 
+  // Persist sync state
+  writeSyncState(syncState);
+
   log('');
   if (failCount === 0) {
     success(`Synced ${successCount} assets!`);
@@ -1176,28 +1219,42 @@ async function cmdStatus() {
     return;
   }
 
-  // Diff with remote
-  info('Comparing with remote...\n');
-  const diffPayload = assets.map(a => ({ title: a.title, content_hash: a.hash }));
+  // Check local sync state first, remote for unknowns
+  const syncState = readSyncState();
+  const localStatus = {};
+  const needsRemoteCheck = [];
 
-  let diffResults;
-  try {
-    const data = await apiRequest('POST', '/api/v1/tokenboard/push/diff', { assets: diffPayload }, config.token, config.api);
-    diffResults = data.results;
-  } catch (e) {
-    error(`Diff API error: ${e.message}`);
+  for (const asset of assets) {
+    const cached = syncState[asset.sourcePath];
+    if (cached && cached.hash === asset.hash) {
+      localStatus[asset.title] = { status: 'unchanged', uuid: cached.uuid };
+    } else if (cached && cached.hash !== asset.hash) {
+      localStatus[asset.title] = { status: 'updated', uuid: cached.uuid };
+    } else {
+      needsRemoteCheck.push(asset);
+    }
   }
 
-  const statusMap = {};
-  for (const r of diffResults) {
-    statusMap[r.title] = r;
+  if (needsRemoteCheck.length > 0) {
+    info('Comparing with remote...');
+    const diffPayload = needsRemoteCheck.map(a => ({ title: a.title, content_hash: a.hash }));
+    try {
+      const data = await apiRequest('POST', '/api/v1/tokenboard/push/diff', { assets: diffPayload }, config.token, config.api);
+      for (const r of data.results) {
+        localStatus[r.title] = { status: r.status, uuid: r.remote_uuid || '' };
+      }
+    } catch (e) {
+      error(`Diff API error: ${e.message}`);
+    }
   }
 
+  log('');
   let newCount = 0, updatedCount = 0, unchangedCount = 0;
 
   for (const asset of assets) {
-    const status = statusMap[asset.title]?.status || 'new';
-    const uuid = statusMap[asset.title]?.remote_uuid || '';
+    const st = localStatus[asset.title] || { status: 'new', uuid: '' };
+    const status = st.status;
+    const uuid = st.uuid || '';
     const uuidShort = uuid ? ` ${C.dim}(${uuid.substring(0, 8)})${C.reset}` : '';
 
     if (status === 'new') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tokrepo",
-  "version": "3.0.0",
+  "version": "3.1.1",
   "description": "AI assets for humans and agents — sync, search, install, push. Like git push for your AI skills.",
   "bin": {
     "tokrepo": "bin/tokrepo.js"