@0dai-dev/cli 4.2.0 → 4.3.4

package/lib/shared.js

@@ -60,7 +60,7 @@ const DRIFT_TRACKED_CONFIGS = [
 ];
 
 // --- API ---
-function apiCall(endpoint, data) {
+function apiCall(endpoint, data, options = {}) {
   return new Promise((resolve) => {
     const url = new URL(endpoint, API_URL);
     const mod = url.protocol === "https:" ? https : http;
@@ -71,11 +71,16 @@ function apiCall(endpoint, data) {
       "X-CLI-Version": VERSION,
       "X-Client-Channel": "npm",
     };
-    try {
-      const auth = JSON.parse(fs.readFileSync(AUTH_FILE, "utf8"));
-      const token = auth.api_key || auth.access_token || auth.token;
-      if (token) headers["Authorization"] = `Bearer ${token}`;
-    } catch {}
+    const accessToken = options && options.accessToken ? String(options.accessToken).trim() : "";
+    if (accessToken) {
+      headers["Authorization"] = `Bearer ${accessToken}`;
+    } else {
+      try {
+        const auth = JSON.parse(fs.readFileSync(AUTH_FILE, "utf8"));
+        const token = auth.api_key || auth.access_token || auth.token;
+        if (token) headers["Authorization"] = `Bearer ${token}`;
+      } catch {}
+    }
     const opts = {
       hostname: url.hostname,
       port: url.port || (url.protocol === "https:" ? 443 : 80),
@@ -116,12 +121,14 @@ function updateAuthState(patch) {
   saveAuthState({ ...current, ...patch });
 }
 
-async function fetchAuthStatus() {
-  const status = await apiCall("/v1/auth/status");
-  if (status && !status.error && status.email) {
+async function fetchAuthStatus(accessToken = "") {
+  const token = String(accessToken || "").trim();
+  const status = await apiCall("/v1/auth/status", null, token ? { accessToken: token } : undefined);
+  if (status && !status.error && status.email && !token) {
     updateAuthState({
       email: status.email, plan: status.plan || "free",
       name: status.name || "", license: status.license || {},
+      plan_expires_at: status.plan_expires_at || "",
     });
   }
   return status;
@@ -302,6 +309,8 @@ function mergeSettingsJson(existing, incoming) {
 function writeFiles(target, files) {
   let created = 0, updated = 0, unchanged = 0, merged = 0, skipped = 0;
   const targetResolved = path.resolve(target);
+  let backupDir = null;
+  const backupConfigs = new Set(["CLAUDE.md", "AGENTS.md"]);
   for (const [rel, content] of Object.entries(files)) {
     if (typeof rel !== "string" || !rel || path.isAbsolute(rel) || rel.split(/[/\\]/).includes("..")) {
       skipped++; continue;
@@ -314,11 +323,16 @@ function writeFiles(target, files) {
       const existing = fs.readFileSync(p, "utf8");
       if (existing === content) { unchanged++; continue; }
       if (rel.endsWith("settings.json")) { finalContent = mergeSettingsJson(existing, content); merged++; }
-      else if (rel === "AGENTS.md") {
-        if (existing.includes("managed: false")) { unchanged++; continue; }
-        const backupDir = path.join(target, "ai", ".backups");
-        fs.mkdirSync(backupDir, { recursive: true });
-        fs.writeFileSync(path.join(backupDir, "AGENTS.md.bak"), existing, "utf8");
+      else if (backupConfigs.has(rel)) {
+        if (rel === "AGENTS.md" && existing.includes("managed: false")) { unchanged++; continue; }
+        if (!backupDir) {
+          const timestamp = new Date().toISOString().replace(/[:.]/g, "-");
+          backupDir = path.join(targetResolved, "ai", ".backups", timestamp);
+          fs.mkdirSync(backupDir, { recursive: true });
+        }
+        const backupPath = path.join(backupDir, rel);
+        fs.writeFileSync(backupPath, existing, "utf8");
+        log(`backed up existing ${rel} to ${backupPath}`);
         updated++;
       } else { updated++; }
     } else { created++; }
@@ -337,6 +351,7 @@ function findRepoScript(target, scriptName) {
     path.join(target, "scripts", scriptName),
     path.join(process.cwd(), "scripts", scriptName),
     path.join(__dirname, "..", "..", "..", "scripts", scriptName),
+    path.join(__dirname, "..", "..", "..", "..", "scripts", scriptName),
   ];
   for (const c of candidates) { if (fs.existsSync(c)) return c; }
   return null;