cortex-agents 2.2.0 → 2.3.1

package/dist/tools/task.js

@@ -3,6 +3,7 @@ import * as fs from "fs";
 import * as path from "path";
 import { detectWorktreeInfo } from "../utils/worktree-detect.js";
 import { findPlanContent, extractPlanSections, buildPrBodyFromPlan, } from "../utils/plan-extract.js";
+import { git, gh, which } from "../utils/shell.js";
 const PROTECTED_BRANCHES = ["main", "master", "develop", "production", "staging"];
 const DOCS_DIR = "docs";
 // ─── Helpers ─────────────────────────────────────────────────────────────────
@@ -11,10 +12,8 @@ const DOCS_DIR = "docs";
  */
 async function checkGhCli(cwd) {
     // Check if gh exists
-    try {
-        await Bun.$ `which gh`.quiet().text();
-    }
-    catch {
+    const ghPath = await which("gh");
+    if (!ghPath) {
         return {
             ok: false,
             error: "GitHub CLI (gh) is not installed. Install it from https://cli.github.com/ and run `gh auth login`.",
@@ -22,7 +21,7 @@ async function checkGhCli(cwd) {
     }
     // Check if authenticated
     try {
-        await Bun.$ `gh auth status`.cwd(cwd).quiet().text();
+        await gh(cwd, "auth", "status");
     }
     catch {
         return {
@@ -37,8 +36,8 @@ async function checkGhCli(cwd) {
  */
 async function checkRemote(cwd) {
     try {
-        const remotes = await Bun.$ `git -C ${cwd} remote -v`.quiet().text();
-        if (!remotes.includes("origin")) {
+        const { stdout } = await git(cwd, "remote", "-v");
+        if (!stdout.includes("origin")) {
             return {
                 ok: false,
                 error: "No 'origin' remote configured. Add one with: git remote add origin <url>",
@@ -74,14 +73,14 @@ function checkDocsExist(worktree) {
  */
 async function getCommitLog(cwd, baseBranch) {
     try {
-        const log = await Bun.$ `git -C ${cwd} log ${baseBranch}..HEAD --oneline`.quiet().text();
-        return log.trim();
+        const { stdout } = await git(cwd, "log", `${baseBranch}..HEAD`, "--oneline");
+        return stdout.trim();
     }
     catch {
         // If base branch doesn't exist locally, try origin/<base>
         try {
-            const log = await Bun.$ `git -C ${cwd} log origin/${baseBranch}..HEAD --oneline`.quiet().text();
-            return log.trim();
+            const { stdout } = await git(cwd, "log", `origin/${baseBranch}..HEAD`, "--oneline");
+            return stdout.trim();
         }
         catch {
             return "";
@@ -126,7 +125,7 @@ export const finalize = tool({
         const warnings = [];
         // ── 1. Validate: git repo ─────────────────────────────────
         try {
-            await Bun.$ `git -C ${cwd} rev-parse --git-dir`.quiet().text();
+            await git(cwd, "rev-parse", "--git-dir");
         }
         catch {
             return "✗ Error: Not in a git repository.";
@@ -150,8 +149,8 @@ Create a feature/bugfix branch first with branch_create or worktree_create.`;
             else {
                 // Try to detect default branch from origin
                 try {
-                    const defaultRef = await Bun.$ `git -C ${cwd} symbolic-ref refs/remotes/origin/HEAD`.quiet().text();
-                    baseBranch = defaultRef.trim().replace("refs/remotes/origin/", "");
+                    const { stdout } = await git(cwd, "symbolic-ref", "refs/remotes/origin/HEAD");
+                    baseBranch = stdout.trim().replace("refs/remotes/origin/", "");
                 }
                 catch {
                     baseBranch = "main"; // Sensible default
@@ -181,7 +180,7 @@ Create a feature/bugfix branch first with branch_create or worktree_create.`;
         }
         // ── 6. Stage all changes ──────────────────────────────────
         try {
-            await Bun.$ `git -C ${cwd} add -A`.quiet();
+            await git(cwd, "add", "-A");
         }
         catch (error) {
             return `✗ Error staging changes: ${error.message || error}`;
@@ -191,15 +190,15 @@ Create a feature/bugfix branch first with branch_create or worktree_create.`;
         let commitSkipped = false;
         try {
             // Check if there's anything to commit
-            const status = await Bun.$ `git -C ${cwd} status --porcelain`.quiet().text();
-            if (!status.trim()) {
+            const { stdout: statusOut } = await git(cwd, "status", "--porcelain");
+            if (!statusOut.trim()) {
                 commitSkipped = true;
                 output.push("No new changes to commit (working tree clean)");
             }
             else {
-                await Bun.$ `git -C ${cwd} commit -m ${commitMessage}`.quiet();
-                const hash = await Bun.$ `git -C ${cwd} rev-parse --short HEAD`.quiet().text();
-                commitHash = hash.trim();
+                await git(cwd, "commit", "-m", commitMessage);
+                const { stdout: hashOut } = await git(cwd, "rev-parse", "--short", "HEAD");
+                commitHash = hashOut.trim();
                 output.push(`Committed: ${commitHash} — ${commitMessage}`);
             }
         }
@@ -208,7 +207,7 @@ Create a feature/bugfix branch first with branch_create or worktree_create.`;
         }
         // ── 8. Push to origin ─────────────────────────────────────
         try {
-            await Bun.$ `git -C ${cwd} push -u origin ${branchName}`.quiet();
+            await git(cwd, "push", "-u", "origin", branchName);
             output.push(`Pushed to origin/${branchName}`);
         }
         catch (error) {
@@ -243,49 +242,29 @@ All previous steps succeeded (changes committed). Try pushing manually:
         let prUrl = "";
         try {
             // Check if PR already exists for this branch
-            const existingPr = await Bun.$ `gh pr view ${branchName} --json url --jq .url`
-                .cwd(cwd).quiet().nothrow().text();
+            const { stdout: existingPr } = await gh(cwd, "pr", "view", branchName, "--json", "url", "--jq", ".url");
             if (existingPr.trim()) {
                 prUrl = existingPr.trim();
                 output.push(`PR already exists: ${prUrl}`);
             }
             else {
-                // Create new PR
-                const draftFlag = draft ? "--draft" : "";
-                // Use a heredoc-style approach via stdin to handle complex body content
-                const bodyFile = path.join(cwd, ".cortex", ".pr-body-tmp.md");
-                const cortexDir = path.join(cwd, ".cortex");
-                if (!fs.existsSync(cortexDir)) {
-                    fs.mkdirSync(cortexDir, { recursive: true });
-                }
-                fs.writeFileSync(bodyFile, prBodyContent);
-                try {
-                    const createArgs = [
-                        "gh", "pr", "create",
-                        "--base", baseBranch,
-                        "--title", finalPrTitle,
-                        "--body-file", bodyFile,
-                    ];
-                    if (draft)
-                        createArgs.push("--draft");
-                    const result = await Bun.$ `gh pr create --base ${baseBranch} --title ${finalPrTitle} --body-file ${bodyFile} ${draft ? "--draft" : ""}`.cwd(cwd).quiet().text();
-                    prUrl = result.trim();
-                    output.push(`PR created: ${prUrl}`);
-                }
-                finally {
-                    // Clean up temp file
-                    if (fs.existsSync(bodyFile)) {
-                        fs.unlinkSync(bodyFile);
-                    }
-                }
+                prUrl = await createPr(cwd, baseBranch, finalPrTitle, prBodyContent, draft);
+                output.push(`PR created: ${prUrl}`);
             }
         }
-        catch (error) {
-            // PR creation failed but everything else succeeded
-            output.push(`⚠ PR creation failed: ${error.message || error}`);
-            output.push("");
-            output.push("Changes are committed and pushed. Create the PR manually:");
-            output.push(`  gh pr create --base ${baseBranch} --title "${finalPrTitle}"`);
+        catch {
+            // PR doesn't exist yet, create it
+            try {
+                prUrl = await createPr(cwd, baseBranch, finalPrTitle, prBodyContent, draft);
+                output.push(`PR created: ${prUrl}`);
+            }
+            catch (error) {
+                // PR creation failed but everything else succeeded
+                output.push(`⚠ PR creation failed: ${error.message || error}`);
+                output.push("");
+                output.push("Changes are committed and pushed. Create the PR manually:");
+                output.push(`  gh pr create --base ${baseBranch} --title "${finalPrTitle}"`);
+            }
         }
         // ── Build final output ────────────────────────────────────
         let finalOutput = `✓ Task finalized\n\n`;
@@ -300,3 +279,32 @@ All previous steps succeeded (changes committed). Try pushing manually:
         return finalOutput;
     },
 });
+/**
+ * Create a PR using gh CLI with array-based args (no shell injection).
+ * Uses a temp body file to avoid shell escaping issues with PR body content.
+ */
+async function createPr(cwd, baseBranch, title, body, draft) {
+    const bodyFile = path.join(cwd, ".cortex", ".pr-body-tmp.md");
+    const cortexDir = path.join(cwd, ".cortex");
+    if (!fs.existsSync(cortexDir)) {
+        fs.mkdirSync(cortexDir, { recursive: true });
+    }
+    fs.writeFileSync(bodyFile, body);
+    try {
+        const createArgs = [
+            "pr", "create",
+            "--base", baseBranch,
+            "--title", title,
+            "--body-file", bodyFile,
+        ];
+        if (draft)
+            createArgs.push("--draft");
+        const { stdout } = await gh(cwd, ...createArgs);
+        return stdout.trim();
+    }
+    finally {
+        if (fs.existsSync(bodyFile)) {
+            fs.unlinkSync(bodyFile);
+        }
+    }
+}

package/dist/tools/worktree.d.ts

@@ -1,7 +1,11 @@
 import type { PluginInput } from "@opencode-ai/plugin";
 type Client = PluginInput["client"];
 type Shell = PluginInput["$"];
-export declare const create: {
+/**
+ * Factory function that creates the worktree_create tool with access
+ * to the OpenCode client for toast notifications.
+ */
+export declare function createCreate(client: Client): {
     description: string;
     args: {
         name: import("zod").ZodString;
@@ -25,7 +29,11 @@ export declare const list: {
     args: {};
     execute(args: Record<string, never>, context: import("@opencode-ai/plugin").ToolContext): Promise<string>;
 };
-export declare const remove: {
+/**
+ * Factory function that creates the worktree_remove tool with access
+ * to the OpenCode client for toast notifications and PTY cleanup.
+ */
+export declare function createRemove(client: Client): {
     description: string;
     args: {
         name: import("zod").ZodString;

package/dist/tools/worktree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../../src/tools/worktree.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAQvD,KAAK,MAAM,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;AACpC,KAAK,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;AAE9B,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;CA8DjB,CAAC;AAEH,eAAO,MAAM,IAAI;;;;CAiCf,CAAC;AAEH,eAAO,MAAM,MAAM;;;;;;;;;;CA4DjB,CAAC;AAEH,eAAO,MAAM,IAAI;;;;;;;;CAgDf,CAAC;AA4VH;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK;;;;;;;;;;;;;;;;;;;;EAoIxD"}
+{"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../../src/tools/worktree.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAiBvD,KAAK,MAAM,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;AACpC,KAAK,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;AAE9B;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM;;;;;;;;;;;;;;;;;;EAuF1C;AAED,eAAO,MAAM,IAAI;;;;CAiCf,CAAC;AAEH;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM;;;;;;;;;;EAkI1C;AAED,eAAO,MAAM,IAAI;;;;;;;;CAgDf,CAAC;AAkUH;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK;;;;;;;;;;;;;;;;;;;;EAsIxD"}