sessioncast-cli 2.4.1 → 2.4.2

package/dist/agent/runner.js

@@ -79,13 +79,11 @@ class AgentRunner {
         }
     }
     static async loadConfig(configPath) {
-        // Check if agent token is available (for relay connection)
-        const agentToken = (0, config_1.getAgentToken)();
         // Check environment variable
         const envPath = process.env.SESSIONCAST_CONFIG || process.env.TMUX_REMOTE_CONFIG;
         // Try multiple default paths
         const defaultPaths = [
-            path.join(process.env.HOME || '', '.sessioncast.yml'),
+            (0, config_1.getYmlPath)(),
             path.join(process.env.HOME || '', '.tmux-remote.yml'),
         ];
         let finalPath = configPath || envPath;
@@ -97,66 +95,61 @@ class AgentRunner {
                 }
             }
         }
-        // If no config file found but agent token exists, create default config
-        if ((!finalPath || !fs.existsSync(finalPath)) && agentToken) {
-            console.log('Using OAuth authentication');
-            const machineId = os.hostname();
-            // Try to fetch optimal relay URL from Platform API
-            let relayUrl = await AgentRunner.fetchRelayUrlForAgent(agentToken);
-            if (relayUrl) {
-                console.log(`Fetched relay URL from Platform API: ${relayUrl}`);
+        // Load from yml file if exists
+        if (finalPath && fs.existsSync(finalPath)) {
+            console.log(`Loading config from: ${finalPath}`);
+            const content = fs.readFileSync(finalPath, 'utf-8');
+            const ext = path.extname(finalPath).toLowerCase();
+            if (ext === '.json') {
+                return JSON.parse(content);
             }
             else {
-                relayUrl = (0, config_1.getRelayUrl)();
-                console.log(`Using default relay URL: ${relayUrl}`);
+                return yaml.load(content);
             }
-            return {
-                machineId,
-                relay: relayUrl,
-                token: agentToken,
-                api: {
-                    enabled: false
-                }
-            };
         }
-        if (!finalPath || !fs.existsSync(finalPath)) {
-            const isLoggedIn = (0, config_1.getAccessToken)() || (0, config_1.getAgentToken)();
-            if (isLoggedIn) {
-                // User is logged in but agent token not yet generated
-                throw new Error('\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n' +
-                    '  Agent token not yet generated\n' +
-                    '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n\n' +
-                    '  Please run `sessioncast login` again to generate an agent token.\n\n' +
-                    '  Or create a config file manually:\n' +
-                    '    $ cat > ~/.sessioncast.yml << \'EOF\'\n' +
-                    '    machineId: my-machine\n' +
-                    '    relay: wss://relay.sessioncast.io/ws\n' +
-                    '    token: agt_YOUR_TOKEN\n' +
-                    '    EOF\n\n' +
-                    '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
-            }
+        // No yml file found - check if we have agent token
+        const agentToken = (0, config_1.getAgentToken)();
+        if (!agentToken) {
             throw new Error('\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n' +
                 '  Not logged in\n' +
                 '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n\n' +
                 '  Please login first:\n' +
                 '    $ sessioncast login\n\n' +
-                '  Or create a config file manually:\n' +
-                '    $ cat > ~/.sessioncast.yml << \'EOF\'\n' +
-                '    machineId: my-machine\n' +
-                '    relay: wss://relay.sessioncast.io/ws\n' +
-                '    token: agt_YOUR_TOKEN\n' +
-                '    EOF\n\n' +
+                '  Or with agent token:\n' +
+                '    $ sessioncast login agt_YOUR_TOKEN\n\n' +
                 '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
         }
-        console.log(`Loading config from: ${finalPath}`);
-        const content = fs.readFileSync(finalPath, 'utf-8');
-        const ext = path.extname(finalPath).toLowerCase();
-        if (ext === '.json') {
-            return JSON.parse(content);
+        // Create yml file with agent token
+        const machineId = os.hostname();
+        // Try to fetch optimal relay URL from Platform API
+        let relayUrl = await AgentRunner.fetchRelayUrlForAgent(agentToken);
+        if (relayUrl) {
+            console.log(`Fetched relay URL from Platform API: ${relayUrl}`);
         }
         else {
-            return yaml.load(content);
+            relayUrl = (0, config_1.getRelayUrl)();
+            console.log(`Using default relay URL: ${relayUrl}`);
         }
+        // Create config object
+        const newConfig = {
+            machineId,
+            relay: relayUrl,
+            token: agentToken,
+            api: {
+                enabled: false
+            }
+        };
+        // Save to yml file
+        const ymlPath = (0, config_1.getYmlPath)();
+        const ymlContent = yaml.dump(newConfig, {
+            indent: 2,
+            lineWidth: -1,
+            quotingType: '"',
+            forceQuotes: false
+        });
+        fs.writeFileSync(ymlPath, ymlContent, 'utf-8');
+        console.log(`Created config file: ${ymlPath}`);
+        return newConfig;
     }
     async start() {
         if (this.running)

package/dist/config.d.ts

@@ -11,7 +11,19 @@ interface ConfigSchema {
     machineId?: string;
     hasSeenWelcome?: boolean;
 }
+interface YmlConfig {
+    machineId?: string;
+    relay?: string;
+    token?: string;
+    api?: {
+        enabled?: boolean;
+        agentId?: string;
+    };
+}
 declare const config: Conf<ConfigSchema>;
+export declare function getYmlPath(): string;
+export declare function loadYmlConfig(): YmlConfig | null;
+export declare function saveYmlConfig(ymlConfig: YmlConfig): void;
 export declare function getApiKey(): string | undefined;
 export declare function setApiKey(key: string): void;
 export declare function clearApiKey(): void;

package/dist/config.js

@@ -1,8 +1,44 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getYmlPath = getYmlPath;
+exports.loadYmlConfig = loadYmlConfig;
+exports.saveYmlConfig = saveYmlConfig;
 exports.getApiKey = getApiKey;
 exports.setApiKey = setApiKey;
 exports.clearApiKey = clearApiKey;
@@ -28,6 +64,10 @@ exports.getConfigPath = getConfigPath;
 exports.getRawAccessToken = getRawAccessToken;
 exports.getTokenExpiresAt = getTokenExpiresAt;
 const conf_1 = __importDefault(require("conf"));
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const os = __importStar(require("os"));
+const yaml = __importStar(require("js-yaml"));
 const config = new conf_1.default({
     projectName: 'sessioncast',
     defaults: {
@@ -36,6 +76,34 @@ const config = new conf_1.default({
         relayUrl: 'wss://relay.sessioncast.io/ws',
     }
 });
+// YML file path
+const YML_PATH = path.join(os.homedir(), '.sessioncast.yml');
+function getYmlPath() {
+    return YML_PATH;
+}
+// Load config from yml file
+function loadYmlConfig() {
+    try {
+        if (fs.existsSync(YML_PATH)) {
+            const content = fs.readFileSync(YML_PATH, 'utf-8');
+            return yaml.load(content);
+        }
+    }
+    catch (e) {
+        // Ignore errors
+    }
+    return null;
+}
+// Save config to yml file
+function saveYmlConfig(ymlConfig) {
+    const content = yaml.dump(ymlConfig, {
+        indent: 2,
+        lineWidth: -1,
+        quotingType: '"',
+        forceQuotes: false
+    });
+    fs.writeFileSync(YML_PATH, content, 'utf-8');
+}
 function getApiKey() {
     return config.get('apiKey');
 }
@@ -84,11 +152,29 @@ function setRefreshToken(token) {
     config.set('refreshToken', token);
 }
 // Agent token (for relay connection)
+// Priority: yml > config.json
 function getAgentToken() {
+    // First check yml
+    const ymlConfig = loadYmlConfig();
+    if (ymlConfig?.token) {
+        return ymlConfig.token;
+    }
+    // Fallback to config.json
     return config.get('agentToken');
 }
 function setAgentToken(token) {
+    // Save to config.json (for compatibility)
     config.set('agentToken', token);
+    // Save to yml file
+    const ymlConfig = loadYmlConfig() || {};
+    ymlConfig.token = token;
+    if (!ymlConfig.machineId) {
+        ymlConfig.machineId = config.get('machineId') || os.hostname();
+    }
+    if (!ymlConfig.relay) {
+        ymlConfig.relay = config.get('relayUrl');
+    }
+    saveYmlConfig(ymlConfig);
 }
 function getMachineId() {
     return config.get('machineId');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sessioncast-cli",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "SessionCast CLI - Control your agents from anywhere",
   "main": "dist/index.js",
   "bin": {