@edgedive/cli 0.1.5 → 0.1.7

package/src/config/config-manager.ts

@@ -12,6 +12,7 @@ export interface EdgediveConfig {
   tokenType?: string;
   expiresAt?: number;
   scope?: string;
+  refreshToken?: string;
 }
 
 export class ConfigManager {
@@ -45,11 +46,7 @@ export class ConfigManager {
     try {
       const configDir = path.dirname(this.configPath);
       await fs.mkdir(configDir, { recursive: true, mode: 0o700 });
-      await fs.writeFile(
-        this.configPath,
-        JSON.stringify(config, null, 2),
-        { mode: 0o600 }
-      );
+      await fs.writeFile(this.configPath, JSON.stringify(config, null, 2), { mode: 0o600 });
     } catch (error: any) {
       throw new Error(`Failed to save config: ${error.message}`);
     }
@@ -73,30 +70,45 @@ export class ConfigManager {
    */
   async isAuthenticated(): Promise<boolean> {
     const config = await this.load();
-    if (!config.accessToken) {
-      return false;
+
+    // If we have an access token that's not expired, we're authenticated
+    if (config.accessToken && (!config.expiresAt || config.expiresAt > Date.now())) {
+      return true;
     }
 
-    // Check if token is expired
-    if (config.expiresAt && config.expiresAt < Date.now()) {
-      return false;
+    // If we have a refresh token, we can refresh, so consider authenticated
+    if (config.refreshToken) {
+      return true;
     }
 
-    return true;
+    return false;
   }
 
   /**
-   * Get access token
+   * Get access token (even if expired - let the API client handle refresh)
    */
   async getAccessToken(): Promise<string | null> {
     const config = await this.load();
+    return config.accessToken || null;
+  }
 
-    // Check if token is expired
-    if (config.expiresAt && config.expiresAt < Date.now()) {
-      return null;
-    }
+  /**
+   * Get refresh token
+   */
+  async getRefreshToken(): Promise<string | null> {
+    const config = await this.load();
+    return config.refreshToken || null;
+  }
 
-    return config.accessToken || null;
+  /**
+   * Check if token is expired or will expire soon (within 5 minutes)
+   */
+  isTokenExpiringSoon(config: EdgediveConfig): boolean {
+    if (!config.expiresAt) {
+      return false;
+    }
+    // Consider token expiring if less than 5 minutes remaining
+    return config.expiresAt < Date.now() + 5 * 60 * 1000;
   }
 
   /**

package/src/constants.ts

@@ -4,19 +4,6 @@ import 'dotenv/config';
  * Edgedive CLI Constants
  */
 
-// Validate required environment variables
-const getRequiredEnv = (key: string, fallback?: string): string => {
-  const value = process.env[key];
-  if (!value) {
-    if (fallback) {
-      console.warn(`Warning: ${key} not set, using default: ${fallback}`);
-      return fallback;
-    }
-    throw new Error(`Missing required environment variable: ${key}`);
-  }
-  return value;
-};
-
 // OAuth configuration
 export const OAUTH_CONFIG = {
   CLIENT_ID: 'edgedive-cli',

package/src/utils/claude-launcher.ts

@@ -45,7 +45,7 @@ export async function launchClaudeSession(
     await new Promise<void>((resolve, reject) => {
       const shell = getUserShell();
       // Set the CLAUDE_SESSION_END_HOOK environment variable to our hook script
-      const child = spawn(shell, ['-i', '-c', `claude -r ${claudeSessionId}`], {
+      const child = spawn(shell, ['-i', '-c', `claude -r ${claudeSessionId} --settings '{"includeCoAuthoredBy": false}'`], {
         cwd: workspacePath,
         stdio: 'inherit',
         env: {

package/src/utils/git-utils.ts

@@ -9,9 +9,7 @@ export interface RepoVerification {
 }
 
 function parseGithubRemote(remoteUrl: string): { owner: string; repo: string } | null {
-  const patterns = [
-    /github\.com[:/](?<owner>[^/]+)\/(?<repo>[^/.]+)(?:\.git)?$/,
-  ];
+  const patterns = [/github\.com[:/](?<owner>[^/]+)\/(?<repo>[^/.]+)(?:\.git)?$/];
 
   for (const pattern of patterns) {
     const match = remoteUrl.match(pattern);
@@ -63,10 +61,7 @@ export class GitUtils {
     return { rootPath, remoteUrl };
   }
 
-  static async ensureBranchCheckedOut(
-    branch: string,
-    rootPath: string
-  ): Promise<void> {
+  static async ensureBranchCheckedOut(branch: string, rootPath: string): Promise<void> {
     // Get current branch
     const currentBranch = await runGit('rev-parse --abbrev-ref HEAD', rootPath);
 
@@ -116,4 +111,3 @@ export class GitUtils {
     }
   }
 }
-

package/src/utils/session-downloader.ts

@@ -17,12 +17,7 @@ export class SessionDownloader {
   private getClaudeProjectDir(workspacePath: string): string {
     const homeDir = os.homedir();
     const sanitized = this.sanitizeWorkspacePath(workspacePath);
-    return path.join(
-      homeDir,
-      LOCAL_CONFIG.CLAUDE_DIR,
-      LOCAL_CONFIG.CLAUDE_PROJECTS_DIR,
-      sanitized
-    );
+    return path.join(homeDir, LOCAL_CONFIG.CLAUDE_DIR, LOCAL_CONFIG.CLAUDE_PROJECTS_DIR, sanitized);
   }
 
   private async downloadFile(url: string, targetPath: string): Promise<void> {

package/.claude/settings.local.json

@@ -1,9 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(gh pr view:*)"
-    ],
-    "deny": [],
-    "ask": []
-  }
-}