@jive-ai/cli 0.0.37 → 0.0.39

package/dist/index.mjs

@@ -3430,7 +3430,7 @@ async function createGraphQLClient() {
 
 //#endregion
 //#region package.json
-var version = "0.0.37";
+var version = "0.0.39";
 
 //#endregion
 //#region src/runner/index.ts
@@ -4761,10 +4761,11 @@ Host gitlab.com
 		}
 		this.debugLog("Configuring pull...");
 		await execAsync$1(`git config pull.rebase false`);
-		this.debugLog("Pulling main...");
-		await execAsync$1(`git pull origin main`);
-		this.debugLog("Checking out main...");
-		await execAsync$1(`git checkout main`);
+		const defaultBranch = this.ctx.defaultBranch;
+		this.debugLog(`Pulling ${defaultBranch}...`);
+		await execAsync$1(`git pull origin ${defaultBranch}`);
+		this.debugLog(`Checking out ${defaultBranch}...`);
+		await execAsync$1(`git checkout ${defaultBranch}`);
 		this.debugLog("Checking out branch...");
 		try {
 			await execAsync$1(`git checkout ${this.ctx.branch}`);
@@ -5133,18 +5134,32 @@ async function setupRunnerCommand(options) {
 let config = null;
 const runnerConfigPath = path.join(process.env.HOME || process.env.USERPROFILE || "", ".jive", "runner.json");
 async function getRunnerConfig() {
-	if (process.env.JIVE_RUNNER_ID && process.env.JIVE_TEAM_ID) return {
-		id: parseInt(process.env.JIVE_RUNNER_ID),
-		name: process.env.JIVE_RUNNER_NAME || "docker-runner",
-		type: "docker",
-		teamId: process.env.JIVE_TEAM_ID,
-		createdAt: (/* @__PURE__ */ new Date()).toISOString()
-	};
 	if (config) return config;
-	const configData = await fs.readFile(runnerConfigPath, "utf-8");
-	config = JSON.parse(configData);
-	if (!config) throw new Error("Failed to load runner config");
-	return config;
+	let fileConfig = null;
+	try {
+		const configData = await fs.readFile(runnerConfigPath, "utf-8");
+		fileConfig = JSON.parse(configData);
+	} catch {}
+	if (fileConfig) {
+		config = {
+			...fileConfig,
+			...process.env.JIVE_RUNNER_ID && { id: parseInt(process.env.JIVE_RUNNER_ID) },
+			...process.env.JIVE_RUNNER_NAME && { name: process.env.JIVE_RUNNER_NAME },
+			...process.env.JIVE_TEAM_ID && { teamId: process.env.JIVE_TEAM_ID }
+		};
+		return config;
+	}
+	if (process.env.JIVE_RUNNER_ID && process.env.JIVE_TEAM_ID) {
+		config = {
+			id: parseInt(process.env.JIVE_RUNNER_ID),
+			name: process.env.JIVE_RUNNER_NAME || "docker-runner",
+			type: "docker",
+			teamId: process.env.JIVE_TEAM_ID,
+			createdAt: (/* @__PURE__ */ new Date()).toISOString()
+		};
+		return config;
+	}
+	throw new Error("Failed to load runner config - no config file found and JIVE_RUNNER_ID/JIVE_TEAM_ID env vars not set");
 }
 async function saveRunnerConfig(config$2) {
 	await fs.mkdir(path.dirname(runnerConfigPath), { recursive: true });

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@jive-ai/cli",
-  "version": "0.0.37",
+  "version": "0.0.39",
   "main": "index.js",
   "files": [
     "dist",