whipped 0.1.1 → 0.2.0

package/README.md

@@ -194,7 +194,7 @@ Whipped can start a [Cloudflare Tunnel](https://developers.cloudflare.com/cloudf
 
 A standalone Chrome/Chromium extension for capturing UI context off any web page. Click the toolbar icon to enter select mode, then click any element to capture its React component and source location. It builds a ready-to-paste **YAML prompt** for your AI coding agent — no server connection required.
 
-Available at [github.com/nxnom/whipped-extension](https://github.com/nxnom/whipped-extension).
+Install from the [Chrome Web Store](https://chromewebstore.google.com/detail/codkafoociihebdklkpfjjoacenkkhci?utm_source=item-share-cb), or build from source at [github.com/nxnom/whipped-extension](https://github.com/nxnom/whipped-extension).
 
 ### Visual comments
 

package/dist/cli.js

@@ -18966,6 +18966,7 @@ function isCommandAvailable(args) {
     stdio: ["ignore", "pipe", "ignore"],
     timeout: 5e3
   });
+  if (result.error) return result.error.code !== "ENOENT";
   return result.status === 0 || result.status === null;
 }
 function getAvailableAgents() {
@@ -22530,10 +22531,11 @@ ${devSystemPromptResult.text}`;
     const conflictGitInstructions = conflictProjectConfig.gitInstructions?.trim() || DEFAULT_GIT_INSTRUCTIONS;
     let outputBuffer = "";
     let hookHandled = false;
+    const conflictSystemPrompt = buildConflictResolutionSystemPrompt(card, conflictedFiles, conflictGitInstructions);
     if (defaultAgent === "opencode") {
       const mcpSpec = buildWhippedMcpServerSpec(getMcpServerPath(), this.options.serverUrl, workspaceId);
       await writeOpencodeFiles(streamId, getServerPort(this.options.serverUrl), mcpSpec, {
-        appendSystemPrompt: CONFLICT_RESOLUTION_SYSTEM_PROMPT
+        appendSystemPrompt: conflictSystemPrompt
       }).catch(() => {
       });
     } else if (defaultAgent === "cursor") {
@@ -22543,7 +22545,7 @@ ${devSystemPromptResult.text}`;
     }
     const proc = spawnAgent({
       agentId: defaultAgent,
-      prompt: buildConflictResolutionPrompt(card, conflictedFiles, conflictGitInstructions),
+      prompt: buildTaskPrompt(),
       cwd: mergeWorktreePath,
       hookSettingsPath: defaultAgent === "claude" ? CLAUDE_TASK_SETTINGS_PATH : void 0,
       hookServerPort: defaultAgent === "codex" ? getServerPort(this.options.serverUrl) : void 0,
@@ -22552,7 +22554,7 @@ ${devSystemPromptResult.text}`;
         ...defaultAgent === "opencode" ? { [OPENCODE_CONFIG_DIR_ENV]: getOpencodeConfigDir(streamId) } : {},
         ...defaultAgent === "cursor" ? { [CURSOR_CONFIG_DIR_ENV]: getCursorConfigDir(streamId) } : {}
       },
-      appendSystemPrompt: defaultAgent !== "opencode" ? CONFLICT_RESOLUTION_SYSTEM_PROMPT : void 0,
+      appendSystemPrompt: defaultAgent !== "opencode" ? conflictSystemPrompt : void 0,
       onOutput: (data) => {
         outputBuffer += data;
         stateHub.broadcastTerminalOutput(workspaceId, streamId, data);
@@ -22714,27 +22716,27 @@ ${secretsSection}` : ""}${systemPrompt?.trim() ? `
 
 ${systemPrompt.trim()}` : ""}`;
 }
-var CONFLICT_RESOLUTION_SYSTEM_PROMPT = `You are a merge conflict resolution agent. Your only job is to resolve git merge conflicts.
+function buildConflictResolutionSystemPrompt(card, conflictedFiles, gitInstructions) {
+  return `You are a merge conflict resolution agent. Your only job is to resolve git merge conflicts.
 
 Rules:
 - Only edit files to remove conflict markers (<<<<<<< ======= >>>>>>>)
 - Preserve the intent of BOTH sides where possible; when in doubt keep the incoming (task) changes
 - Never refactor, rename, or change logic beyond resolving the conflict markers
-- Exit when done`;
-function buildConflictResolutionPrompt(card, conflictedFiles, gitInstructions) {
-  return `Resolve the git merge conflicts in this repository.
+- Exit when done
+
+## Task being merged
 
-Task being merged:
 ${card.description?.trim() ?? ""}
 
-Conflicted files:
+## Conflicted files
+
 ${conflictedFiles.map((f2) => `- ${f2}`).join("\n")}
 
-Resolve each conflict, preserving the task's intent. Then stage and commit
-the resolution. Write the commit message following the project's git
-conventions below \u2014 do not use a hard-coded template.
+Resolve each conflict, preserving the task's intent. Then stage and commit the resolution. Write the commit message following the project's git conventions below \u2014 do not use a hard-coded template.
 
 ## Git conventions
+
 ${gitInstructions}`;
 }
 function buildTaskPrompt() {
@@ -26831,8 +26833,8 @@ import { z as z9 } from "zod";
 // src/api/services/projects-service.ts
 init_runtime_config();
 init_api_contract();
-init_logger();
 import { spawnSync as spawnSync9 } from "node:child_process";
+init_logger();
 
 // src/state/projects-layout.ts
 init_db();
@@ -26888,14 +26890,31 @@ var saveProjectsLayoutData = (layout) => {
   return { ok: true };
 };
 var checkProjectPath = async (repoPath) => {
-  if (!repoPath.trim()) return { valid: false, isGitRepo: false, error: null, name: null, branch: null, remote: null };
+  if (!repoPath.trim())
+    return { valid: false, isGitRepo: false, error: null, name: null, branch: null, remote: null, branches: [] };
   const { statSync: statSync2 } = await import("node:fs");
   try {
     const stat2 = statSync2(repoPath);
     if (!stat2.isDirectory())
-      return { valid: false, isGitRepo: false, error: "Not a directory", name: null, branch: null, remote: null };
+      return {
+        valid: false,
+        isGitRepo: false,
+        error: "Not a directory",
+        name: null,
+        branch: null,
+        remote: null,
+        branches: []
+      };
   } catch {
-    return { valid: false, isGitRepo: false, error: "Path does not exist", name: null, branch: null, remote: null };
+    return {
+      valid: false,
+      isGitRepo: false,
+      error: "Path does not exist",
+      name: null,
+      branch: null,
+      remote: null,
+      branches: []
+    };
   }
   const r = spawnSync9("git", ["rev-parse", "--git-dir"], {
     cwd: repoPath,
@@ -26910,7 +26929,8 @@ var checkProjectPath = async (repoPath) => {
       error: "Not a git repository",
       name: null,
       branch: null,
-      remote: null
+      remote: null,
+      branches: []
     };
   const branchR = spawnSync9("git", ["rev-parse", "--abbrev-ref", "HEAD"], {
     cwd: repoPath,
@@ -26926,7 +26946,7 @@ var checkProjectPath = async (repoPath) => {
   const branch = branchR.status === 0 ? branchR.stdout.trim() : null;
   const rawRemote = remoteR.status === 0 ? remoteR.stdout.trim() : null;
   const remote = rawRemote ? rawRemote.replace(/^https?:\/\//, "").replace(/^git@([^:]+):/, "$1/").replace(/\.git$/, "") : null;
-  return { valid: true, isGitRepo: true, error: null, name, branch, remote };
+  return { valid: true, isGitRepo: true, error: null, name, branch, remote, branches: listLocalBranches(repoPath) };
 };
 var addProject = async (repoPath, initialConfig) => {
   const { statSync: statSync2 } = await import("node:fs");
@@ -28545,7 +28565,7 @@ process.on("uncaughtException", (err) => {
   if (err.code === "EPIPE" || err.code === "ECONNRESET") return;
   throw err;
 });
-var VERSION9 = true ? "0.1.1" : "0.0.0-dev";
+var VERSION9 = true ? "0.2.0" : "0.0.0-dev";
 async function isPortAvailable(port, host) {
   return new Promise((resolve5) => {
     const probe = createServer2();