@myvillage/cli 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myvillage/cli",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "MyVillageOS CLI for student game developers",
   "type": "module",
   "bin": {

package/src/commands/login.js

@@ -53,6 +53,7 @@ export async function loginCommand() {
 
   // Create a promise that resolves when we receive the OAuth callback
   const authResult = await new Promise((resolve, reject) => {
+    let timeout;
     const server = createServer(async (req, res) => {
       const url = new URL(req.url, `http://localhost:${config.callbackPort}`);
 
@@ -91,8 +92,9 @@ export async function loginCommand() {
         `);
       }
 
-      // Close the server
+      // Close the server and clear timeout
       server.close();
+      clearTimeout(timeout);
 
       if (error) {
         reject(new Error(errorDescription || error));
@@ -131,7 +133,7 @@ export async function loginCommand() {
     });
 
     // Timeout after 5 minutes
-    setTimeout(() => {
+    timeout = setTimeout(() => {
       server.close();
       reject(new Error('Authentication timed out. Please try again.'));
     }, 5 * 60 * 1000);

package/src/utils/config.js

@@ -8,7 +8,7 @@ const CONFIG_FILE = join(CONFIG_DIR, 'config.json');
 const DEFAULT_CONFIG = {
   apiBaseUrl: 'https://portal.myvillageproject.ai/api/v1',
   oauthBaseUrl: 'https://portal.myvillageproject.ai/api/oauth',
-  clientId: 'myvillage-cli',
+  clientId: 'mvos_aG_c729fuQxvvqYHOnkgTQ',
   callbackPort: 3737,
 };
 
@@ -21,14 +21,20 @@ function ensureConfigDir() {
 export function getConfig() {
   ensureConfigDir();
 
+  // Only persist user-overridable settings (not clientId/oauthBaseUrl which are app constants)
   if (!existsSync(CONFIG_FILE)) {
-    writeFileSync(CONFIG_FILE, JSON.stringify(DEFAULT_CONFIG, null, 2));
+    const { clientId, oauthBaseUrl, ...persistable } = DEFAULT_CONFIG;
+    writeFileSync(CONFIG_FILE, JSON.stringify(persistable, null, 2));
     return { ...DEFAULT_CONFIG };
   }
 
   try {
     const data = readFileSync(CONFIG_FILE, 'utf-8');
-    return { ...DEFAULT_CONFIG, ...JSON.parse(data) };
+    const fileConfig = JSON.parse(data);
+    // Remove stale clientId/oauthBaseUrl from file config — code defaults always win
+    delete fileConfig.clientId;
+    delete fileConfig.oauthBaseUrl;
+    return { ...DEFAULT_CONFIG, ...fileConfig };
   } catch {
     return { ...DEFAULT_CONFIG };
   }