@jive-ai/cli 0.0.36 → 0.0.38

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

@@ -3357,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");
@@ -3436,7 +3430,7 @@ async function createGraphQLClient() {
 
 //#endregion
 //#region package.json
-var version = "0.0.36";
+var version = "0.0.38";
 
 //#endregion
 //#region src/runner/index.ts
@@ -5139,18 +5133,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 });
@@ -5565,42 +5573,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);
@@ -5630,27 +5602,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.36",
+  "version": "0.0.38",
   "main": "index.js",
   "files": [
     "dist",