@jive-ai/cli 0.0.35 → 0.0.37

package/README.md

@@ -47,12 +47,17 @@ You can extend the Jive task runner image to add custom tools or dependencies:
 FROM jiveai/task:latest
 
 # Add your custom dependencies
-RUN apk add --no-cache python3 py3-pip
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    python3 \
+    python3-pip \
+    && rm -rf /var/lib/apt/lists/*
 
 # Install additional tools
 RUN pip install --break-system-packages black ruff
 ```
 
+**Note:** The base image is Debian-based (bookworm-slim), so use `apt-get` for package management.
+
 ## Publishing the Docker Image (Maintainers)
 
 ### One-Time Setup

package/dist/index.mjs

@@ -2566,6 +2566,7 @@ const cliQueries = {
           directory
           repository
           branch
+          defaultBranch
           gitAuth {
             privateKey
             repositoryUrl
@@ -2573,6 +2574,12 @@ const cliQueries = {
             method
           }
           permissionMode
+          settings {
+            model
+            environmentVariables
+            betaFlags
+            permissionMode
+          }
         }
         sessionId
       }
@@ -2925,7 +2932,15 @@ var ApiClient = class {
 				directory: t$2.ctx.directory,
 				repository: t$2.ctx.repository,
 				branch: t$2.ctx.branch,
-				gitAuth: t$2.ctx.gitAuth
+				defaultBranch: t$2.ctx.defaultBranch,
+				gitAuth: t$2.ctx.gitAuth,
+				permissionMode: t$2.ctx.permissionMode,
+				settings: {
+					model: t$2.ctx.settings.model,
+					environmentVariables: t$2.ctx.settings.environmentVariables,
+					betaFlags: t$2.ctx.settings.betaFlags,
+					permissionMode: t$2.ctx.settings.permissionMode
+				}
 			},
 			sessionId: t$2.sessionId
 		})) };
@@ -3342,20 +3357,14 @@ async function spawnTaskDocker(ctx, config$2, opts) {
 		envVars.push("-e", `GIT_USERNAME=${ctx.gitAuth.username}`);
 		envVars.push("-e", `GIT_PASSWORD=${ctx.gitAuth.token}`);
 	}
-	const useSysbox = process.env.JIVE_USE_SYSBOX !== "false";
 	const dockerArgs = [
 		"run",
 		"--rm",
-		"-i"
+		"-i",
+		"--runtime",
+		"sysbox-runc"
 	];
-	if (useSysbox) {
-		dockerArgs.push("--runtime", "sysbox-runc");
-		console.log(chalk.dim("Using Sysbox runtime for isolated Docker-in-Docker"));
-	} else {
-		dockerArgs.push("-v", "/var/run/docker.sock:/var/run/docker.sock");
-		dockerArgs.push("--user", "root");
-		console.log(chalk.yellow("Warning: Using Docker socket mount (no isolation). Set JIVE_USE_SYSBOX=true on Linux for secure mode."));
-	}
+	console.log(chalk.dim("Using Sysbox runtime for isolated Docker-in-Docker"));
 	dockerArgs.push("--network", "bridge");
 	if (isDevMode) {
 		dockerArgs.push("--add-host", "host.docker.internal:host-gateway");
@@ -3421,7 +3430,7 @@ async function createGraphQLClient() {
 
 //#endregion
 //#region package.json
-var version = "0.0.35";
+var version = "0.0.37";
 
 //#endregion
 //#region src/runner/index.ts
@@ -3531,6 +3540,12 @@ var TaskRunner = class {
               method
             }
             permissionMode
+            settings {
+              model
+              environmentVariables
+              betaFlags
+              permissionMode
+            }
           }
         }
       `);
@@ -3558,7 +3573,13 @@ var TaskRunner = class {
 				branch: data.taskContext.branch,
 				defaultBranch: data.taskContext.defaultBranch,
 				gitAuth: auth || void 0,
-				permissionMode: data.taskContext.permissionMode
+				permissionMode: data.taskContext.permissionMode,
+				settings: {
+					model: data.taskContext.settings.model,
+					environmentVariables: data.taskContext.settings.environmentVariables,
+					betaFlags: data.taskContext.settings.betaFlags,
+					permissionMode: data.taskContext.settings.permissionMode
+				}
 			};
 		} catch (error$1) {
 			console.error(error$1);
@@ -3821,7 +3842,7 @@ 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;
-	const { defaultModel, environmentVariables, betaFlags } = await getTaskClaudeSettings({ projectId: task.projectId.toString() });
+	const { model: defaultModel, environmentVariables, betaFlags } = task.getSettings();
 	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}`);
@@ -3864,49 +3885,6 @@ 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";
@@ -4317,6 +4295,13 @@ var Task = class {
 	get projectId() {
 		return this.ctx.projectId;
 	}
+	/**
+	* Get task settings (model, environment variables, beta flags, permission mode).
+	* Settings are inherited from team/project at task creation time and can be overridden per-task.
+	*/
+	getSettings() {
+		return this.ctx.settings;
+	}
 	constructor(ctx) {
 		this.id = ctx.taskId;
 		this.ctx = ctx;
@@ -5574,42 +5559,6 @@ async function initCommand() {
 	}
 }
 
-//#endregion
-//#region src/lib/git-utils.ts
-/**
-* Normalizes a git URL to a canonical form for comparison.
-* Handles SSH, HTTPS, with/without .git suffix, trailing slashes.
-* Returns format: github.com/owner/repo (lowercase)
-*/
-function normalizeGitUrl(url) {
-	if (!url) return "";
-	let normalized = url.trim();
-	normalized = normalized.replace(/\.git$/, "");
-	normalized = normalized.replace(/\/+$/, "");
-	const sshMatch = normalized.match(/^git@([^:]+):(.+)$/);
-	if (sshMatch) {
-		const [, host, path$2] = sshMatch;
-		normalized = `${host}/${path$2}`;
-	}
-	const httpsMatch = normalized.match(/^https?:\/\/([^/]+)\/(.+)$/);
-	if (httpsMatch) {
-		const [, host, path$2] = httpsMatch;
-		normalized = `${host.includes("@") ? host.split("@")[1] : host}/${path$2}`;
-	}
-	const gitMatch = normalized.match(/^git:\/\/([^/]+)\/(.+)$/);
-	if (gitMatch) {
-		const [, host, path$2] = gitMatch;
-		normalized = `${host}/${path$2}`;
-	}
-	return normalized.toLowerCase();
-}
-/**
-* Compares two git URLs to see if they point to the same repository.
-*/
-function gitUrlsMatch(url1, url2) {
-	return normalizeGitUrl(url1) === normalizeGitUrl(url2);
-}
-
 //#endregion
 //#region src/commands/task.ts
 const execAsync = promisify(exec);
@@ -5639,27 +5588,14 @@ async function resumeCommand(taskId) {
 		}
 		const { task, project } = taskData;
 		spinner.text = "Verifying repository...";
-		let localRemoteUrl;
 		try {
 			const { stdout } = await execAsync("git remote get-url origin");
-			localRemoteUrl = stdout.trim();
+			stdout.trim();
 		} catch (error$1) {
 			spinner.fail(chalk.red("Current directory is not a git repository"));
 			console.error(chalk.dim("Run this command from within the project repository"));
 			process.exit(1);
 		}
-		const projectRepoUrl = project.gitRepoUrl;
-		if (!projectRepoUrl) {
-			spinner.fail(chalk.red("Task project has no repository URL configured"));
-			process.exit(1);
-		}
-		if (!gitUrlsMatch(localRemoteUrl, projectRepoUrl)) {
-			spinner.fail(chalk.red("Repository mismatch"));
-			console.error(chalk.dim(`Local repository:   ${localRemoteUrl}`));
-			console.error(chalk.dim(`Project repository: ${projectRepoUrl}`));
-			console.error(chalk.dim("\nRun this command from within the correct project directory"));
-			process.exit(1);
-		}
 		spinner.text = "Fetching session data...";
 		const sessions = await apiClient$1.getTaskSessions(id);
 		if (!sessions || sessions.length === 0) {

package/package.json

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