zdev 0.1.5 → 0.2.1

package/dist/index.js

@@ -2663,6 +2663,8 @@ async function start(featureName, projectPath = ".", options = {}) {
     frontendPort: ports.frontend,
     convexPort: ports.convex,
     funnelPath: routePath,
+    worktreePath,
+    publicUrl: publicUrl || undefined,
     pids: {
       frontend: frontendPid,
       convex: convexPid
@@ -3069,6 +3071,184 @@ Commands:`);
   }
 }
 
+// src/commands/pr.ts
+import { resolve as resolve8, basename as basename4 } from "path";
+async function pr(featureName, projectPath = ".", options = {}) {
+  const fullPath = resolve8(projectPath);
+  let worktreePath = fullPath;
+  let allocation;
+  let projectName = getRepoName(fullPath) || basename4(fullPath);
+  const config = loadConfig();
+  if (featureName) {
+    const allocKey = `${projectName}-${featureName}`;
+    allocation = config.allocations[allocKey];
+    if (!allocation) {
+      const found = Object.entries(config.allocations).find(([key, alloc]) => key.endsWith(`-${featureName}`));
+      if (found) {
+        allocation = found[1];
+        projectName = allocation.project;
+      }
+    }
+    if (allocation) {
+      worktreePath = allocation.worktreePath || resolve8(config.worktreesDir, `${projectName}-${featureName}`);
+    }
+  } else {
+    const cwd = process.cwd();
+    const found = Object.entries(config.allocations).find(([_, alloc]) => alloc.worktreePath === cwd || cwd.startsWith(alloc.worktreePath || ""));
+    if (found) {
+      allocation = found[1];
+      featureName = found[0].split("-").slice(1).join("-");
+      projectName = allocation.project;
+      worktreePath = allocation.worktreePath || cwd;
+    }
+  }
+  if (!isGitRepo(worktreePath)) {
+    console.error(`❌ Not a git repository: ${worktreePath}`);
+    process.exit(1);
+  }
+  const branchResult = run("git", ["branch", "--show-current"], { cwd: worktreePath });
+  if (!branchResult.success || !branchResult.stdout.trim()) {
+    console.error("❌ Could not determine current branch");
+    process.exit(1);
+  }
+  const branch = branchResult.stdout.trim();
+  console.log(`\uD83D\uDC02 Creating PR for: ${branch}`);
+  if (allocation) {
+    console.log(`   Project: ${projectName}`);
+    console.log(`   Feature: ${featureName}`);
+  }
+  const ghCheck = run("which", ["gh"]);
+  if (!ghCheck.success) {
+    console.error("❌ GitHub CLI (gh) not found. Install: https://cli.github.com");
+    process.exit(1);
+  }
+  const authCheck = run("gh", ["auth", "status"], { cwd: worktreePath });
+  if (!authCheck.success) {
+    console.error("❌ Not authenticated with GitHub. Run: gh auth login");
+    process.exit(1);
+  }
+  console.log(`
+\uD83D\uDCE4 Pushing branch...`);
+  const pushResult = run("git", ["push", "-u", "origin", branch], { cwd: worktreePath });
+  if (!pushResult.success) {
+    if (!pushResult.stderr.includes("Everything up-to-date")) {
+      console.error(`   Failed to push: ${pushResult.stderr}`);
+      process.exit(1);
+    }
+    console.log(`   Already up to date`);
+  } else {
+    console.log(`   Pushed to origin/${branch}`);
+  }
+  const defaultBranch = run("git", ["symbolic-ref", "refs/remotes/origin/HEAD", "--short"], { cwd: worktreePath });
+  const baseBranch = defaultBranch.success ? defaultBranch.stdout.trim().replace("origin/", "") : "main";
+  const commitsResult = run("git", ["log", `origin/${baseBranch}..HEAD`, "--pretty=format:%s"], { cwd: worktreePath });
+  const commits = commitsResult.success ? commitsResult.stdout.trim().split(`
+`).filter(Boolean) : [];
+  const filesResult = run("git", ["diff", `origin/${baseBranch}..HEAD`, "--stat", "--stat-width=60"], { cwd: worktreePath });
+  const filesSummary = filesResult.success ? filesResult.stdout.trim() : "";
+  const diffStatResult = run("git", ["diff", `origin/${baseBranch}..HEAD`, "--shortstat"], { cwd: worktreePath });
+  const diffStat = diffStatResult.success ? diffStatResult.stdout.trim() : "";
+  let title = options.title;
+  if (!title) {
+    if (commits.length > 0) {
+      title = commits[0];
+    } else {
+      const featureForTitle = featureName || branch.replace(/^feature\//, "");
+      title = featureForTitle.split(/[-_]/).map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
+    }
+  }
+  let body = options.body || "";
+  if (allocation && allocation.publicUrl) {
+    body += `## Preview
+\uD83D\uDD17 ${allocation.publicUrl}
+
+`;
+  } else if (config.devDomain && featureName && projectName) {
+    const previewUrl = `https://${projectName}-${featureName}.${config.devDomain}`;
+    body += `## Preview
+\uD83D\uDD17 ${previewUrl}
+
+`;
+  }
+  if (commits.length > 0) {
+    body += `## Changes
+`;
+    commits.forEach((commit) => {
+      body += `- ${commit}
+`;
+    });
+    body += `
+`;
+  }
+  if (diffStat) {
+    body += `## Summary
+\`\`\`
+${diffStat}
+\`\`\`
+
+`;
+  }
+  if (!body.includes("Created with zdev")) {
+    body = body.trim() + `
+
+---
+*Created with [zdev](https://github.com/5hanth/zdev)*`;
+  }
+  const existingPr = run("gh", ["pr", "view", branch, "--json", "url"], { cwd: worktreePath });
+  if (existingPr.success) {
+    try {
+      const prData = JSON.parse(existingPr.stdout);
+      console.log(`
+✅ PR already exists!`);
+      console.log(`
+\uD83D\uDD17 ${prData.url}`);
+      return;
+    } catch {}
+  }
+  console.log(`
+\uD83D\uDCDD Creating pull request...`);
+  const prArgs = ["pr", "create", "--title", title, "--body", body];
+  if (options.draft) {
+    prArgs.push("--draft");
+  }
+  if (options.web) {
+    prArgs.push("--web");
+    const webResult = run("gh", prArgs, { cwd: worktreePath });
+    if (!webResult.success) {
+      console.error(`   Failed: ${webResult.stderr}`);
+      process.exit(1);
+    }
+    console.log(`   Opened in browser`);
+    return;
+  }
+  const prResult = run("gh", prArgs, { cwd: worktreePath });
+  if (!prResult.success) {
+    if (prResult.stderr.includes("already exists")) {
+      console.log(`   PR already exists for this branch`);
+      const viewResult = run("gh", ["pr", "view", "--json", "url"], { cwd: worktreePath });
+      if (viewResult.success) {
+        try {
+          const prData = JSON.parse(viewResult.stdout);
+          console.log(`
+\uD83D\uDD17 ${prData.url}`);
+        } catch {}
+      }
+      return;
+    }
+    console.error(`   Failed: ${prResult.stderr}`);
+    process.exit(1);
+  }
+  const prUrl = prResult.stdout.trim();
+  console.log(`
+✅ Pull request created!`);
+  console.log(`
+\uD83D\uDD17 ${prUrl}`);
+  if (allocation?.publicUrl) {
+    console.log(`
+\uD83D\uDCF1 Preview: ${allocation.publicUrl}`);
+  }
+}
+
 // src/index.ts
 import { readFileSync as readFileSync5 } from "fs";
 import { fileURLToPath } from "url";
@@ -3114,6 +3294,14 @@ seedCmd.command("import [path]").description("Import seed data into current work
 program2.command("config").description("View and manage zdev configuration").option("-a, --add <pattern>", "Add a file pattern to auto-copy").option("-r, --remove <pattern>", "Remove a file pattern").option("-s, --set <key=value>", "Set a config value (devDomain, dockerHostIp, traefikConfigDir)").option("-l, --list", "List current configuration").action(async (options) => {
   await configCmd(options);
 });
+program2.command("pr [feature]").description("Create a pull request for a feature branch").option("-p, --project <path>", "Project path", ".").option("-t, --title <title>", "PR title (auto-generated if not specified)").option("-b, --body <body>", "PR body (preview URL auto-added)").option("-d, --draft", "Create as draft PR").option("-w, --web", "Open in browser instead of CLI").action(async (feature, options) => {
+  await pr(feature, options.project, {
+    title: options.title,
+    body: options.body,
+    draft: options.draft,
+    web: options.web
+  });
+});
 program2.command("status").description("Show zdev status (alias for list)").action(async () => {
   await list({});
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zdev",
-  "version": "0.1.5",
+  "version": "0.2.1",
   "description": "Multi-agent worktree development environment for cloud dev with preview URLs",
   "type": "module",
   "bin": {

package/src/commands/pr.ts

@@ -0,0 +1,234 @@
+import { existsSync, readFileSync } from "fs";
+import { resolve, basename } from "path";
+import { run, isGitRepo, getRepoName } from "../utils.js";
+import { loadConfig, type WorktreeAllocation } from "../config.js";
+
+export interface PrOptions {
+  title?: string;
+  body?: string;
+  draft?: boolean;
+  web?: boolean;
+}
+
+export async function pr(
+  featureName: string | undefined,
+  projectPath: string = ".",
+  options: PrOptions = {}
+): Promise<void> {
+  const fullPath = resolve(projectPath);
+
+  // Check if we're in a worktree or need to find one
+  let worktreePath = fullPath;
+  let allocation: WorktreeAllocation | undefined;
+  let projectName = getRepoName(fullPath) || basename(fullPath);
+
+  const config = loadConfig();
+
+  // If featureName provided, find the allocation
+  if (featureName) {
+    const allocKey = `${projectName}-${featureName}`;
+    allocation = config.allocations[allocKey];
+
+    if (!allocation) {
+      // Try to find by just feature name
+      const found = Object.entries(config.allocations).find(
+        ([key, alloc]) => key.endsWith(`-${featureName}`)
+      );
+      if (found) {
+        allocation = found[1];
+        projectName = allocation.project;
+      }
+    }
+
+    if (allocation) {
+      worktreePath = allocation.worktreePath || resolve(config.worktreesDir, `${projectName}-${featureName}`);
+    }
+  } else {
+    // Try to detect from current directory
+    const cwd = process.cwd();
+    const found = Object.entries(config.allocations).find(
+      ([_, alloc]) => alloc.worktreePath === cwd || cwd.startsWith(alloc.worktreePath || "")
+    );
+    if (found) {
+      allocation = found[1];
+      featureName = found[0].split("-").slice(1).join("-");
+      projectName = allocation.project;
+      worktreePath = allocation.worktreePath || cwd;
+    }
+  }
+
+  if (!isGitRepo(worktreePath)) {
+    console.error(`❌ Not a git repository: ${worktreePath}`);
+    process.exit(1);
+  }
+
+  // Get current branch
+  const branchResult = run("git", ["branch", "--show-current"], { cwd: worktreePath });
+  if (!branchResult.success || !branchResult.stdout.trim()) {
+    console.error("❌ Could not determine current branch");
+    process.exit(1);
+  }
+  const branch = branchResult.stdout.trim();
+
+  console.log(`🐂 Creating PR for: ${branch}`);
+  if (allocation) {
+    console.log(`   Project: ${projectName}`);
+    console.log(`   Feature: ${featureName}`);
+  }
+
+  // Check if gh CLI is available
+  const ghCheck = run("which", ["gh"]);
+  if (!ghCheck.success) {
+    console.error("❌ GitHub CLI (gh) not found. Install: https://cli.github.com");
+    process.exit(1);
+  }
+
+  // Check if authenticated
+  const authCheck = run("gh", ["auth", "status"], { cwd: worktreePath });
+  if (!authCheck.success) {
+    console.error("❌ Not authenticated with GitHub. Run: gh auth login");
+    process.exit(1);
+  }
+
+  // Push branch if not pushed
+  console.log(`\n📤 Pushing branch...`);
+  const pushResult = run("git", ["push", "-u", "origin", branch], { cwd: worktreePath });
+  if (!pushResult.success) {
+    // Check if it's just "already up to date"
+    if (!pushResult.stderr.includes("Everything up-to-date")) {
+      console.error(`   Failed to push: ${pushResult.stderr}`);
+      process.exit(1);
+    }
+    console.log(`   Already up to date`);
+  } else {
+    console.log(`   Pushed to origin/${branch}`);
+  }
+
+  // Get base branch for comparison
+  const defaultBranch = run("git", ["symbolic-ref", "refs/remotes/origin/HEAD", "--short"], { cwd: worktreePath });
+  const baseBranch = defaultBranch.success ? defaultBranch.stdout.trim().replace("origin/", "") : "main";
+
+  // Get commits since base branch
+  const commitsResult = run("git", ["log", `origin/${baseBranch}..HEAD`, "--pretty=format:%s"], { cwd: worktreePath });
+  const commits = commitsResult.success ? commitsResult.stdout.trim().split("\n").filter(Boolean) : [];
+
+  // Get files changed
+  const filesResult = run("git", ["diff", `origin/${baseBranch}..HEAD`, "--stat", "--stat-width=60"], { cwd: worktreePath });
+  const filesSummary = filesResult.success ? filesResult.stdout.trim() : "";
+
+  // Get short diff summary
+  const diffStatResult = run("git", ["diff", `origin/${baseBranch}..HEAD`, "--shortstat"], { cwd: worktreePath });
+  const diffStat = diffStatResult.success ? diffStatResult.stdout.trim() : "";
+
+  // Build PR title
+  let title = options.title;
+  if (!title) {
+    if (commits.length > 0) {
+      // Use first commit message as title
+      title = commits[0];
+    } else {
+      // Fallback to feature name
+      const featureForTitle = featureName || branch.replace(/^feature\//, "");
+      title = featureForTitle
+        .split(/[-_]/)
+        .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+        .join(" ");
+    }
+  }
+
+  // Build PR body
+  let body = options.body || "";
+  
+  // Add preview URL if we have allocation
+  if (allocation && allocation.publicUrl) {
+    body += `## Preview\n🔗 ${allocation.publicUrl}\n\n`;
+  } else if (config.devDomain && featureName && projectName) {
+    // Try to construct preview URL
+    const previewUrl = `https://${projectName}-${featureName}.${config.devDomain}`;
+    body += `## Preview\n🔗 ${previewUrl}\n\n`;
+  }
+
+  // Add commits section if we have commits
+  if (commits.length > 0) {
+    body += `## Changes\n`;
+    commits.forEach((commit) => {
+      body += `- ${commit}\n`;
+    });
+    body += "\n";
+  }
+
+  // Add files changed
+  if (diffStat) {
+    body += `## Summary\n\`\`\`\n${diffStat}\n\`\`\`\n\n`;
+  }
+
+  // Add footer
+  if (!body.includes("Created with zdev")) {
+    body = body.trim() + "\n\n---\n*Created with [zdev](https://github.com/5hanth/zdev)*";
+  }
+
+  // Check if PR already exists
+  const existingPr = run("gh", ["pr", "view", branch, "--json", "url"], { cwd: worktreePath });
+  if (existingPr.success) {
+    try {
+      const prData = JSON.parse(existingPr.stdout);
+      console.log(`\n✅ PR already exists!`);
+      console.log(`\n🔗 ${prData.url}`);
+      return;
+    } catch {
+      // Continue to create
+    }
+  }
+
+  // Create PR
+  console.log(`\n📝 Creating pull request...`);
+  
+  const prArgs = ["pr", "create", "--title", title, "--body", body];
+  
+  if (options.draft) {
+    prArgs.push("--draft");
+  }
+  
+  if (options.web) {
+    prArgs.push("--web");
+    const webResult = run("gh", prArgs, { cwd: worktreePath });
+    if (!webResult.success) {
+      console.error(`   Failed: ${webResult.stderr}`);
+      process.exit(1);
+    }
+    console.log(`   Opened in browser`);
+    return;
+  }
+
+  const prResult = run("gh", prArgs, { cwd: worktreePath });
+  
+  if (!prResult.success) {
+    // Check if it's because PR already exists
+    if (prResult.stderr.includes("already exists")) {
+      console.log(`   PR already exists for this branch`);
+      const viewResult = run("gh", ["pr", "view", "--json", "url"], { cwd: worktreePath });
+      if (viewResult.success) {
+        try {
+          const prData = JSON.parse(viewResult.stdout);
+          console.log(`\n🔗 ${prData.url}`);
+        } catch {
+          // Ignore
+        }
+      }
+      return;
+    }
+    console.error(`   Failed: ${prResult.stderr}`);
+    process.exit(1);
+  }
+
+  // Extract PR URL from output
+  const prUrl = prResult.stdout.trim();
+  
+  console.log(`\n✅ Pull request created!`);
+  console.log(`\n🔗 ${prUrl}`);
+
+  // Show preview URL again for easy access
+  if (allocation?.publicUrl) {
+    console.log(`\n📱 Preview: ${allocation.publicUrl}`);
+  }
+}

package/src/commands/start.ts

@@ -301,6 +301,8 @@ export async function start(
     frontendPort: ports.frontend,
     convexPort: ports.convex,
     funnelPath: routePath,
+    worktreePath,
+    publicUrl: publicUrl || undefined,
     pids: {
       frontend: frontendPid,
       convex: convexPid,

package/src/config.ts

@@ -15,6 +15,8 @@ export interface WorktreeAllocation {
   frontendPort: number;
   convexPort: number;
   funnelPath: string;
+  worktreePath?: string;  // Full path to worktree
+  publicUrl?: string;     // Public preview URL
   pids: {
     frontend?: number;
     convex?: number;

package/src/index.ts

@@ -8,6 +8,7 @@ import { list } from "./commands/list.js";
 import { clean } from "./commands/clean.js";
 import { seedExport, seedImport } from "./commands/seed.js";
 import { configCmd } from "./commands/config.js";
+import { pr } from "./commands/pr.js";
 import { readFileSync } from "fs";
 import { fileURLToPath } from "url";
 import { dirname, join } from "path";
@@ -124,6 +125,24 @@ program
     await configCmd(options);
   });
 
+// zdev pr
+program
+  .command("pr [feature]")
+  .description("Create a pull request for a feature branch")
+  .option("-p, --project <path>", "Project path", ".")
+  .option("-t, --title <title>", "PR title (auto-generated if not specified)")
+  .option("-b, --body <body>", "PR body (preview URL auto-added)")
+  .option("-d, --draft", "Create as draft PR")
+  .option("-w, --web", "Open in browser instead of CLI")
+  .action(async (feature, options) => {
+    await pr(feature, options.project, {
+      title: options.title,
+      body: options.body,
+      draft: options.draft,
+      web: options.web,
+    });
+  });
+
 // zdev status (alias for list)
 program
   .command("status")