contextloop-cli 0.2.0 → 0.2.2

package/README.md

@@ -5,8 +5,10 @@ The official command-line interface for [ContextLoop](https://contextloop.io) -
 ## Features
 
 - **Token-efficient uploads**: Read files directly from disk without generating tokens
+- **Bidirectional sync**: Push, pull, or sync local directories with ContextLoop
 - **Pipe support**: Stream content from stdin for AI agent integration
 - **Batch operations**: Upload multiple files with glob patterns
+- **Conflict resolution**: Auto-resolve sync conflicts (newest, local, remote, skip)
 - **Cross-platform**: Works on macOS, Windows, and Linux
 - **Secure**: Credentials stored in OS keychain
 - **Local development**: Easy localhost support for testing
@@ -109,6 +111,46 @@ contextloop comment add <document-id> --body "text"         # Add comment
 contextloop comment resolve <comment-id>                    # Resolve comment
 ```
 
+### Sync
+
+Bidirectional sync between local directories and ContextLoop.
+
+```bash
+contextloop sync [local-dir]              # Bidirectional sync (default: current dir)
+contextloop sync push <local-dir>         # Push local files to remote
+contextloop sync pull <local-dir>         # Pull remote files to local
+```
+
+**Options:**
+```
+--remote-path <path>      Remote path prefix to sync
+--delete                  Delete files not present on source side
+--conflict <strategy>     Conflict resolution: newest, local, remote, skip, error (default: error)
+--concurrency <n>         Max concurrent operations (default: 5, max: 10)
+--dry-run                 Preview changes without executing
+--include <glob>          Include pattern (can be repeated)
+--exclude <glob>          Exclude pattern (can be repeated)
+--force                   Skip confirmation for deletions
+```
+
+**Examples:**
+```bash
+# Preview what would be synced (dry-run)
+contextloop sync ./docs --dry-run
+
+# Push local docs to remote with a path prefix
+contextloop sync push ./docs --remote-path /specs
+
+# Pull remote files, keeping only .md files
+contextloop sync pull ./docs --include "*.md"
+
+# Bidirectional sync, auto-resolve conflicts by newest
+contextloop sync ./docs --conflict newest
+
+# Push and delete remote files not present locally
+contextloop sync push ./docs --delete --force
+```
+
 ## Global Options
 
 ```
@@ -177,6 +219,11 @@ echo "# New Doc" | contextloop document upload - --title "Quick Note"
 
 # Batch upload
 contextloop document upload "./docs/**/*.md" --dry-run
+
+# Sync entire directory (ideal for keeping docs in sync)
+contextloop sync ./docs --dry-run    # Preview changes first
+contextloop sync push ./docs         # Push local changes
+contextloop sync pull ./docs         # Pull remote changes
 ```
 
 ## Exit Codes

package/dist/index.js

@@ -135,6 +135,7 @@ import * as os from "os";
 var SERVICE_NAME = "contextloop-cli";
 var CREDENTIALS_FILENAME = "credentials.enc";
 var LOCAL_CONFIG_DIR = ".contextloop";
+var ENV_FILE_NAME = ".env";
 var KEY_API_KEY = "api-key";
 var KEY_ACCESS_TOKEN = "access-token";
 var KEY_REFRESH_TOKEN = "refresh-token";
@@ -168,6 +169,54 @@ function getOrCreateLocalConfigDir() {
   }
   return configDir;
 }
+function findEnvFile() {
+  let current = process.cwd();
+  const root = path.parse(current).root;
+  while (current !== root) {
+    const envFile = path.join(current, ENV_FILE_NAME);
+    if (fs.existsSync(envFile) && fs.statSync(envFile).isFile()) {
+      return envFile;
+    }
+    current = path.dirname(current);
+  }
+  return null;
+}
+function parseEnvFile(filePath) {
+  const result = {};
+  try {
+    const content = fs.readFileSync(filePath, "utf-8");
+    const lines = content.split("\n");
+    for (const line of lines) {
+      const trimmed = line.trim();
+      if (!trimmed || trimmed.startsWith("#")) {
+        continue;
+      }
+      const eqIndex = trimmed.indexOf("=");
+      if (eqIndex === -1) {
+        continue;
+      }
+      const key = trimmed.slice(0, eqIndex).trim();
+      let value = trimmed.slice(eqIndex + 1).trim();
+      if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
+        value = value.slice(1, -1);
+      }
+      if (trimmed.slice(eqIndex + 1).trim().startsWith('"')) {
+        value = value.replace(/\\n/g, "\n").replace(/\\t/g, "	").replace(/\\\\/g, "\\");
+      }
+      result[key] = value;
+    }
+  } catch {
+  }
+  return result;
+}
+function getApiKeyFromEnvFile() {
+  const envFile = findEnvFile();
+  if (!envFile) {
+    return null;
+  }
+  const env = parseEnvFile(envFile);
+  return env.CONTEXTLOOP_API_KEY ?? null;
+}
 function getMachineKey() {
   const machineId = `${os.hostname()}-${os.userInfo().username}-${SERVICE_NAME}`;
   return crypto2.scryptSync(machineId, "contextloop-cli-salt", KEY_LENGTH);
@@ -328,6 +377,10 @@ async function getApiKeyWithScope() {
   if (process.env.CONTEXTLOOP_API_KEY) {
     return { apiKey: process.env.CONTEXTLOOP_API_KEY, scope: "environment" };
   }
+  const envApiKey = getApiKeyFromEnvFile();
+  if (envApiKey) {
+    return { apiKey: envApiKey, scope: "dotenv" };
+  }
   const localDir = findLocalConfigDir();
   if (localDir) {
     try {
@@ -414,6 +467,10 @@ async function getCredentialsWithScope() {
     scope
   };
 }
+async function getCredentials() {
+  const { credentials } = await getCredentialsWithScope();
+  return credentials;
+}
 async function clearCredentials(scope = "all") {
   if (scope === "local" || scope === "all") {
     const localDir = findLocalConfigDir();
@@ -927,7 +984,7 @@ async function generatePKCE() {
   const challenge = btoa(String.fromCharCode(...hashArray)).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
   return { verifier, challenge };
 }
-async function interactiveLogin(config2, logger) {
+async function interactiveLogin(config2, logger, local = false) {
   const state = generateState();
   const { verifier, challenge } = await generatePKCE();
   const redirectUri = `http://localhost:${CALLBACK_PORT}${CALLBACK_PATH}`;
@@ -981,10 +1038,11 @@ ${authUrl.toString()}`);
     );
   }
   const tokens = await response.json();
-  await storeTokens(tokens.access_token, tokens.refresh_token);
+  await storeTokens(tokens.access_token, tokens.refresh_token, local);
+  const scopeLabel = local ? "project" : "global";
   if (tokens.project_id) {
     saveConfig({ defaultProjectId: tokens.project_id });
-    console.log(chalk2.green("Successfully authenticated!"));
+    console.log(chalk2.green(`Successfully authenticated! [${chalk2.cyan(scopeLabel)}]`));
     const projectInfo = await fetchProjectInfo(
       config2.apiUrl,
       tokens.project_id,
@@ -998,10 +1056,14 @@ ${authUrl.toString()}`);
       console.log(chalk2.gray(`Default project set to: ${tokens.project_id}`));
     }
   } else {
-    console.log(chalk2.green("Successfully authenticated!"));
+    console.log(chalk2.green(`Successfully authenticated! [${chalk2.cyan(scopeLabel)}]`));
+  }
+  if (local) {
+    console.log(chalk2.gray("Credentials stored in .contextloop/ directory"));
+    console.log(chalk2.yellow("Tip: Add .contextloop/ to your .gitignore"));
   }
 }
-async function manualLogin(config2, logger) {
+async function manualLogin(config2, _logger, local = false) {
   const state = generateState();
   const { verifier, challenge } = await generatePKCE();
   const redirectUri = `http://localhost:${CALLBACK_PORT}${CALLBACK_PATH}`;
@@ -1075,10 +1137,11 @@ async function manualLogin(config2, logger) {
     );
   }
   const tokens = await response.json();
-  await storeTokens(tokens.access_token, tokens.refresh_token);
+  await storeTokens(tokens.access_token, tokens.refresh_token, local);
+  const scopeLabel = local ? "project" : "global";
   if (tokens.project_id) {
     saveConfig({ defaultProjectId: tokens.project_id });
-    console.log(chalk2.green("Successfully authenticated!"));
+    console.log(chalk2.green(`Successfully authenticated! [${chalk2.cyan(scopeLabel)}]`));
     const projectInfo = await fetchProjectInfo(
       config2.apiUrl,
       tokens.project_id,
@@ -1092,7 +1155,11 @@ async function manualLogin(config2, logger) {
       console.log(chalk2.gray(`Default project set to: ${tokens.project_id}`));
     }
   } else {
-    console.log(chalk2.green("Successfully authenticated!"));
+    console.log(chalk2.green(`Successfully authenticated! [${chalk2.cyan(scopeLabel)}]`));
+  }
+  if (local) {
+    console.log(chalk2.gray("Credentials stored in .contextloop/ directory"));
+    console.log(chalk2.yellow("Tip: Add .contextloop/ to your .gitignore"));
   }
 }
 
@@ -1192,14 +1259,29 @@ function registerAuthCommands(program2, context2) {
     try {
       const isLocal = options.local ?? false;
       const scopeLabel = isLocal ? "project" : "global";
-      if (options.apiKey) {
+      let apiKey = options.apiKey;
+      let envFilePath = null;
+      if (!apiKey && !options.manual) {
+        const envFile = findEnvFile();
+        if (envFile) {
+          const envApiKey = getApiKeyFromEnvFile();
+          if (envApiKey) {
+            apiKey = envApiKey;
+            envFilePath = envFile;
+          }
+        }
+      }
+      if (apiKey) {
         const spinner = ora("Validating API key...").start();
         try {
-          const { user } = await context2.apiClient.validateApiKey(options.apiKey);
-          await storeApiKey(options.apiKey, isLocal);
+          const { user } = await context2.apiClient.validateApiKey(apiKey);
+          await storeApiKey(apiKey, isLocal);
           spinner.succeed(
             `Logged in as ${chalk4.bold(user.name)} (${user.email}) [${chalk4.cyan(scopeLabel)}]`
           );
+          if (envFilePath) {
+            console.log(chalk4.gray(`API key loaded from ${envFilePath}`));
+          }
           if (isLocal) {
             console.log(chalk4.gray("Credentials stored in .contextloop/ directory"));
             console.log(chalk4.yellow("Tip: Add .contextloop/ to your .gitignore"));
@@ -1209,15 +1291,9 @@ function registerAuthCommands(program2, context2) {
           throw error;
         }
       } else if (options.manual) {
-        if (isLocal) {
-          console.log(chalk4.yellow("Note: OAuth login currently only supports global scope"));
-        }
-        await manualLogin(context2.config, context2.logger);
+        await manualLogin(context2.config, context2.logger, isLocal);
       } else {
-        if (isLocal) {
-          console.log(chalk4.yellow("Note: OAuth login currently only supports global scope"));
-        }
-        await interactiveLogin(context2.config, context2.logger);
+        await interactiveLogin(context2.config, context2.logger, isLocal);
       }
     } catch (error) {
       console.error(formatError(error, globalOptions.format));
@@ -1274,20 +1350,23 @@ function registerAuthCommands(program2, context2) {
         }
         spinner.stop();
         const localDir = findLocalConfigDir();
+        const envFile = findEnvFile();
         printOutput(
-          { user, project, scope, localDir },
+          { user, project, scope, localDir, envFile },
           {
-            text: ({ user: u, project: p, scope: s, localDir: ld }) => {
+            text: ({ user: u, project: p, scope: s, localDir: ld, envFile: ef }) => {
               const lines = [
                 chalk4.bold(u.name),
                 chalk4.gray(u.email),
                 chalk4.gray(`ID: ${u.id}`)
               ];
               lines.push("");
-              const scopeLabel = s === "environment" ? chalk4.magenta("environment variable") : s === "local" ? chalk4.cyan("project-local") : chalk4.blue("global");
+              const scopeLabel = s === "environment" ? chalk4.magenta("environment variable") : s === "dotenv" ? chalk4.magenta(".env file") : s === "local" ? chalk4.cyan("project-local") : chalk4.blue("global");
               lines.push(`Auth: ${scopeLabel}`);
               if (s === "local" && ld) {
                 lines.push(chalk4.gray(`  ${ld}`));
+              } else if (s === "dotenv" && ef) {
+                lines.push(chalk4.gray(`  ${ef}`));
               }
               if (p) {
                 lines.push("");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contextloop-cli",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "CLI for ContextLoop - upload, download, and manage documents",
   "type": "module",
   "bin": {