@jive-ai/cli 0.0.33 → 0.0.35

package/dist/index.mjs

@@ -185,9 +185,9 @@ async function openBrowser(url) {
 async function loginCommand() {
 	console.log(chalk.bold("\n👋 Login to Jive\n"));
 	console.log(chalk.white("Opening browser for authentication...\n"));
-	await openBrowser(`${API_URL}/cli-auth`);
+	await openBrowser(`${API_URL}/app/cli-auth`);
 	console.log(chalk.gray("If the browser did not open, visit:"));
-	console.log(chalk.cyan(`${API_URL}/cli-auth\n`));
+	console.log(chalk.cyan(`${API_URL}/app/cli-auth\n`));
 	const response = await prompts({
 		type: "password",
 		name: "apiKey",
@@ -2613,6 +2613,18 @@ const cliQueries = {
         gitDefaultBranch
         team {
           id
+          settings {
+            claude {
+              defaultModel
+              environmentVariables
+              betaFlags
+            }
+          }
+        }
+        settings {
+          defaultModel
+          environmentVariables
+          betaFlags
         }
         createdAt
         updatedAt
@@ -2951,16 +2963,24 @@ var ApiClient = class {
 		};
 	}
 	async getSessionLines(taskId, sessionId, excludePending = false) {
-		return (await (await getGraphQLClient()).request(queries.GetSessionLines, {
-			taskId: String(taskId),
-			sessionId: String(sessionId),
-			excludePending
-		})).sessionLines.edges.map((edge) => ({
-			uuid: edge.node.uuid,
-			schema: edge.node.schema,
-			payload: edge.node.payload,
-			createdAt: new Date(edge.node.createdAt)
-		}));
+		const client = await getGraphQLClient();
+		const allLines = [];
+		let hasNextPage = true;
+		let after = void 0;
+		while (hasNextPage) {
+			const response = await client.request(queries.GetSessionLines, {
+				taskId: String(taskId),
+				sessionId: String(sessionId),
+				excludePending,
+				first: 100,
+				after
+			});
+			const pageLines = response.sessionLines.edges.map((edge) => edge.node);
+			allLines.push(...pageLines);
+			hasNextPage = response.sessionLines.pageInfo.hasNextPage;
+			after = response.sessionLines.pageInfo.endCursor ?? void 0;
+		}
+		return allLines;
 	}
 	async getTaskSessions(taskId) {
 		return (await (await getGraphQLClient()).request(queries.GetSessions, { taskId: String(taskId) })).sessions.map((s) => ({
@@ -3337,7 +3357,10 @@ async function spawnTaskDocker(ctx, config$2, opts) {
 		console.log(chalk.yellow("Warning: Using Docker socket mount (no isolation). Set JIVE_USE_SYSBOX=true on Linux for secure mode."));
 	}
 	dockerArgs.push("--network", "bridge");
-	if (isDevMode) dockerArgs.push("--add-host", "host.docker.internal:host-gateway");
+	if (isDevMode) {
+		dockerArgs.push("--add-host", "host.docker.internal:host-gateway");
+		dockerArgs.push("--pull", "never");
+	}
 	dockerArgs.push("--cpus", limits.docker.cpus, "--memory", limits.docker.memory, "-v", `${ctx.directory}:/workspace`, "-w", "/workspace", ...envVars, limits.docker.image, encode(JSON.stringify(ctx)));
 	console.log(chalk.dim(`[Task ${ctx.taskId}] Spawning Docker container with args:`, JSON.stringify(dockerArgs, null, 2)));
 	const taskProcess = spawn("docker", dockerArgs, { cwd: ctx.directory });
@@ -3396,6 +3419,10 @@ async function createGraphQLClient() {
 	};
 }
 
+//#endregion
+//#region package.json
+var version = "0.0.35";
+
 //#endregion
 //#region src/runner/index.ts
 const execAsync$3 = promisify(exec);
@@ -3407,7 +3434,7 @@ function getEffectiveResourceLimits(config$2, projectLimits) {
 		docker: {
 			cpus: projectLimits?.dockerCpus?.toString() || process.env.JIVE_DOCKER_CPUS || config$2.resourceLimits?.docker?.cpus || "2",
 			memory: projectLimits?.dockerMemory || process.env.JIVE_DOCKER_MEMORY || config$2.resourceLimits?.docker?.memory || "2g",
-			image: projectLimits?.dockerImage || process.env.JIVE_DOCKER_IMAGE || config$2.resourceLimits?.docker?.image || "jiveai/task:latest"
+			image: projectLimits?.dockerImage || process.env.JIVE_DOCKER_IMAGE || config$2.resourceLimits?.docker?.image || `jiveai/task:${version}`
 		}
 	};
 }
@@ -3496,6 +3523,7 @@ var TaskRunner = class {
             directory
             repository
             branch
+            defaultBranch
             gitAuth {
               privateKey
               repositoryUrl
@@ -3528,6 +3556,7 @@ var TaskRunner = class {
 				directory: data.taskContext.directory,
 				repository: data.taskContext.repository,
 				branch: data.taskContext.branch,
+				defaultBranch: data.taskContext.defaultBranch,
 				gitAuth: auth || void 0,
 				permissionMode: data.taskContext.permissionMode
 			};
@@ -3792,27 +3821,11 @@ async function queryClaude(prompt, mcpServer, opts) {
 	const credentials = await getCredentials();
 	if (!credentials?.anthropicApiKey) throw new Error("Anthropic API key not found in credentials JSON");
 	process.env.ANTHROPIC_API_KEY = credentials.anthropicApiKey;
-	let teamSettings;
-	try {
-		const client = await getGraphQLClient();
-		const projectData = await client.request(cliQueries.Project, { id: task.projectId.toString() });
-		if (projectData.project?.team) {
-			const claude = (await client.request(cliQueries.Team, { id: projectData.project.team.id })).team?.settings?.claude;
-			if (claude) teamSettings = {
-				defaultModel: claude.defaultModel,
-				environmentVariables: claude.environmentVariables,
-				betaFlags: claude.betaFlags
-			};
-		}
-	} catch (error$1) {
-		console.error("Failed to fetch team settings, using defaults:", error$1);
-	}
-	const defaultModel = teamSettings?.defaultModel || "sonnet";
-	const environmentVariables = teamSettings?.environmentVariables || {};
-	const betaFlags = teamSettings?.betaFlags || [];
+	const { defaultModel, environmentVariables, betaFlags } = await getTaskClaudeSettings({ projectId: task.projectId.toString() });
 	for (const [key, value$1] of Object.entries(environmentVariables)) process.env[key] = value$1;
 	debugLog(`[Task ${task.id}] Querying Claude with permission mode: ${permissionMode}`);
 	debugLog(`[Task ${task.id}] Using model: ${defaultModel}`);
+	if (Object.keys(environmentVariables).length > 0) debugLog(`[Task ${task.id}] Environment variables: ${Object.keys(environmentVariables).join(", ")}`);
 	if (betaFlags.length > 0) debugLog(`[Task ${task.id}] Beta flags: ${betaFlags.join(", ")}`);
 	return query({
 		prompt,
@@ -3851,6 +3864,49 @@ async function queryClaude(prompt, mcpServer, opts) {
 		}
 	});
 }
+async function getTaskClaudeSettings(opts) {
+	const { projectId } = opts;
+	let teamSettings;
+	let projectSettings;
+	try {
+		const client = await getGraphQLClient();
+		const projectData = await client.request(cliQueries.Project, { id: projectId });
+		if (projectData.project) {
+			const projectSettingsData = projectData.project?.settings;
+			if (projectSettingsData) projectSettings = {
+				defaultModel: projectSettingsData.defaultModel,
+				environmentVariables: projectSettingsData.environmentVariables,
+				betaFlags: projectSettingsData.betaFlags
+			};
+			if (projectData.project.team) {
+				const teamClaude = (await client.request(cliQueries.Team, { id: projectData.project.team.id })).team?.settings?.claude;
+				if (teamClaude) teamSettings = {
+					defaultModel: teamClaude.defaultModel,
+					environmentVariables: teamClaude.environmentVariables,
+					betaFlags: teamClaude.betaFlags
+				};
+			}
+		}
+	} catch (error$1) {
+		debugLog(`[Task] Failed to fetch settings, using defaults: ${error$1}`);
+	}
+	const defaultModel = projectSettings?.defaultModel || teamSettings?.defaultModel || "sonnet";
+	const teamEnvVars = teamSettings?.environmentVariables || {};
+	const projectEnvVars = projectSettings?.environmentVariables || {};
+	const environmentVariables = {
+		...teamEnvVars,
+		...projectEnvVars
+	};
+	const betaFlags = [...teamSettings?.betaFlags || [], ...projectSettings?.betaFlags || []];
+	debugLog(`[Task] Default model: ${defaultModel}`);
+	debugLog(`[Task] Environment variables: ${Object.keys(environmentVariables).join(", ")}`);
+	debugLog(`[Task] Beta flags: ${betaFlags.join(", ")}`);
+	return {
+		defaultModel,
+		environmentVariables,
+		betaFlags
+	};
+}
 function mapPermissionMode(permissionMode) {
 	switch (permissionMode) {
 		case "DEFAULT": return "default";
@@ -4731,8 +4787,8 @@ Host gitlab.com
 			this.debugLog("Branch does not exist, creating...");
 			await execAsync$1(`git checkout -b ${this.ctx.branch}`);
 		}
-		this.debugLog("Pulling from default branch (main)...");
-		await execAsync$1(`git pull origin main`);
+		this.debugLog(`Pulling from default branch (${this.ctx.defaultBranch})...`);
+		await execAsync$1(`git pull origin ${this.ctx.defaultBranch}`);
 		this.debugLog("Pulling from task branch...");
 		try {
 			await execAsync$1(`git pull origin ${this.ctx.branch}`);
@@ -4753,7 +4809,7 @@ Host gitlab.com
 		const jsonlContent = sessionLines.map((m) => JSON.stringify(m)).join("\n");
 		await writeFile(this.claudeSessionFilePath, jsonlContent + "\n");
 		this.debugLog(`✓ Saved session file to ${this.claudeSessionFilePath}`);
-		this.debugLog(`Contents: ${jsonlContent}`);
+		this.debugLog(`Contains ${messages.length.toLocaleString()} session lines`);
 	}
 	async readNewSessionLines() {
 		try {
@@ -4879,7 +4935,7 @@ Host gitlab.com
 				}
 			});
 		} finally {
-			this.claudeAbortController.signal.removeEventListener("abort", abortHandler);
+			this.claudeAbortController?.signal.removeEventListener("abort", abortHandler);
 			this.stopSessionFileWatcher();
 			this.claudeAbortController = null;
 			this.sendStatusUpdate("idle");
@@ -5651,10 +5707,6 @@ async function resumeCommand(taskId) {
 }
 const taskCommands = { resume: resumeCommand };
 
-//#endregion
-//#region package.json
-var version = "0.0.33";
-
 //#endregion
 //#region src/index.ts
 const program = new Command();

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@jive-ai/cli",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "main": "index.js",
   "files": [
     "dist",
@@ -16,7 +16,7 @@
     "typecheck": "tsc --noEmit",
     "build": "tsdown && npm pack && npm install -g jive-ai-cli-*.tgz",
     "docker:build": "touch jive-ai-cli-0.0.0.tgz && docker build -t jiveai/task:latest . && rm -f jive-ai-cli-*.tgz",
-    "docker:build:local": "bun run build && docker build --build-arg USE_LOCAL=true -t jiveai/task:latest .",
+    "docker:build:local": "docker rmi jiveai/task:$npm_package_version jiveai/task:latest; bun run build && docker build --build-arg USE_LOCAL=true -t jiveai/task:latest -t jiveai/task:$npm_package_version .",
     "docker:build:public": "touch jive-ai-cli-0.0.0.tgz && docker buildx build --platform linux/amd64 -t jiveai/task:latest -t jiveai/task:$npm_package_version . && rm -f jive-ai-cli-*.tgz",
     "docker:push": "docker buildx build --platform linux/amd64 --push -t jiveai/task:latest -t jiveai/task:$npm_package_version .",
     "docker:publish": "touch jive-ai-cli-0.0.0.tgz && docker buildx build --platform linux/amd64 --push -t jiveai/task:latest -t jiveai/task:$npm_package_version . && rm -f jive-ai-cli-*.tgz",