@a5c-ai/babysitter-sdk 0.0.177-staging.a86ad18c → 0.0.177-staging.ec3ce00a

package/dist/cli/commands/plugin.d.ts

@@ -2,9 +2,9 @@
  * plugin:* commands — Manage plugins and marketplaces.
  *
  * Marketplace commands:
- *   plugin:add-marketplace      --marketplace-url <url> --scope global|project [--json]
- *   plugin:update-marketplace   --marketplace-name <name> --scope global|project [--json]
- *   plugin:list-plugins         --marketplace-name <name> --scope global|project [--json]
+ *   plugin:add-marketplace      --marketplace-url <url> [--global|--project] [--json]
+ *   plugin:update-marketplace   --marketplace-name <name> [--global|--project] [--json]
+ *   plugin:list-plugins         --marketplace-name <name> [--global|--project] [--json]
  *
  * Plugin commands:
  *   plugin:install, plugin:uninstall, plugin:update, plugin:configure,
@@ -22,6 +22,7 @@ export interface PluginCommandArgs {
     json: boolean;
     verbose?: boolean;
     runsDir?: string;
+    force?: boolean;
 }
 export declare function validateScope(scope: string | undefined): scope is PluginScope;
 export declare function requireArg(value: string | undefined, name: string, command: string, json: boolean): string | null;

package/dist/cli/commands/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/plugin.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AA6BH,OAAO,KAAK,EACV,WAAW,EAGZ,MAAM,qBAAqB,CAAC;AAM7B,MAAM,WAAW,iBAAiB;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC7B,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAMD,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,KAAK,IAAI,WAAW,CAEtB;AAED,wBAAgB,UAAU,CACxB,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,OAAO,GACZ,MAAM,GAAG,IAAI,CAWf;AAuBD;;;;GAIG;AACH,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,MAAM,CAAC,CAgDjB;AAED;;;;GAIG;AACH,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,MAAM,CAAC,CA+CjB;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,MAAM,CAAC,CA8EjB;AAMD,2CAA2C;AAC3C,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,MAAM,CAAC,CAgGjB;AAED,+CAA+C;AAC/C,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,MAAM,CAAC,CAoFjB;AAED,qDAAqD;AACrD,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,MAAM,CAAC,CAwIjB;AAED,qCAAqC;AACrC,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,MAAM,CAAC,CAgFjB;AAED,oDAAoD;AACpD,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,MAAM,CAAC,CAsEjB;AAED,qDAAqD;AACrD,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,MAAM,CAAC,CAiFjB;AAED,+CAA+C;AAC/C,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,MAAM,CAAC,CA0CjB"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/plugin.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AA8BH,OAAO,KAAK,EACV,WAAW,EAGZ,MAAM,qBAAqB,CAAC;AAM7B,MAAM,WAAW,iBAAiB;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC7B,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAMD,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,KAAK,IAAI,WAAW,CAEtB;AAED,wBAAgB,UAAU,CACxB,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,OAAO,GACZ,MAAM,GAAG,IAAI,CAWf;AAuCD;;;;GAIG;AACH,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,MAAM,CAAC,CAgDjB;AAED;;;;GAIG;AACH,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,MAAM,CAAC,CAiDjB;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,MAAM,CAAC,CAoFjB;AAMD,2CAA2C;AAC3C,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,MAAM,CAAC,CAsGjB;AAED,+CAA+C;AAC/C,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,MAAM,CAAC,CAoFjB;AAED,qDAAqD;AACrD,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,MAAM,CAAC,CA8IjB;AAED,qCAAqC;AACrC,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,MAAM,CAAC,CAsFjB;AAED,oDAAoD;AACpD,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,MAAM,CAAC,CAsEjB;AAED,qDAAqD;AACrD,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,MAAM,CAAC,CAsFjB;AAED,+CAA+C;AAC/C,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,MAAM,CAAC,CA0CjB"}

package/dist/cli/commands/plugin.js

@@ -3,9 +3,9 @@
  * plugin:* commands — Manage plugins and marketplaces.
  *
  * Marketplace commands:
- *   plugin:add-marketplace      --marketplace-url <url> --scope global|project [--json]
- *   plugin:update-marketplace   --marketplace-name <name> --scope global|project [--json]
- *   plugin:list-plugins         --marketplace-name <name> --scope global|project [--json]
+ *   plugin:add-marketplace      --marketplace-url <url> [--global|--project] [--json]
+ *   plugin:update-marketplace   --marketplace-name <name> [--global|--project] [--json]
+ *   plugin:list-plugins         --marketplace-name <name> [--global|--project] [--json]
  *
  * Plugin commands:
  *   plugin:install, plugin:uninstall, plugin:update, plugin:configure,
@@ -54,7 +54,7 @@ function requireArg(value, name, command, json) {
 }
 function requireScope(scope, command, json) {
     if (!validateScope(scope)) {
-        const msg = `[${command}] --scope (global|project) is required`;
+        const msg = `[${command}] --global or --project is required`;
         if (json) {
             console.log(JSON.stringify({ error: "missing_argument", message: msg }));
         }
@@ -65,6 +65,18 @@ function requireScope(scope, command, json) {
     }
     return true;
 }
+/**
+ * Resolves the marketplace name when not explicitly provided.
+ * If only one marketplace is cloned for the given scope, returns its name.
+ * Otherwise returns null (caller should require the flag).
+ */
+async function autoResolveMarketplace(scope, projectDir) {
+    const marketplaces = await (0, marketplace_1.listMarketplaces)(scope, projectDir);
+    if (marketplaces.length === 1) {
+        return marketplaces[0];
+    }
+    return null;
+}
 // ============================================================================
 // Marketplace Handlers
 // ============================================================================
@@ -74,7 +86,7 @@ function requireScope(scope, command, json) {
  * Requires: marketplaceUrl, scope
  */
 async function handlePluginAddMarketplace(args) {
-    const { marketplaceUrl, marketplacePath, marketplaceBranch, scope, json } = args;
+    const { marketplaceUrl, marketplacePath, marketplaceBranch, scope, json, force } = args;
     const url = requireArg(marketplaceUrl, "--marketplace-url", "plugin:add-marketplace", json);
     if (!url)
         return 1;
@@ -82,7 +94,7 @@ async function handlePluginAddMarketplace(args) {
         return 1;
     const projectDir = scope === "project" ? process.cwd() : undefined;
     try {
-        const targetDir = await (0, marketplace_1.cloneMarketplace)(marketplaceUrl, scope, projectDir, marketplacePath, marketplaceBranch);
+        const targetDir = await (0, marketplace_1.cloneMarketplace)(marketplaceUrl, scope, projectDir, marketplacePath, marketplaceBranch, force);
         if (json) {
             console.log(JSON.stringify({
                 success: true,
@@ -113,7 +125,7 @@ async function handlePluginAddMarketplace(args) {
  * Requires: marketplaceName, scope
  */
 async function handlePluginUpdateMarketplace(args) {
-    const { marketplaceName, scope, json } = args;
+    const { marketplaceName, marketplaceBranch, scope, json } = args;
     const name = requireArg(marketplaceName, "--marketplace-name", "plugin:update-marketplace", json);
     if (!name)
         return 1;
@@ -121,16 +133,18 @@ async function handlePluginUpdateMarketplace(args) {
         return 1;
     const projectDir = scope === "project" ? process.cwd() : undefined;
     try {
-        await (0, marketplace_1.updateMarketplace)(marketplaceName, scope, projectDir);
+        await (0, marketplace_1.updateMarketplace)(marketplaceName, scope, projectDir, marketplaceBranch);
         if (json) {
             console.log(JSON.stringify({
                 success: true,
                 marketplace: marketplaceName,
                 scope,
+                ...(marketplaceBranch ? { branch: marketplaceBranch } : {}),
             }, null, 2));
         }
         else {
-            console.log(`Marketplace "${marketplaceName}" updated successfully (scope: ${scope}).`);
+            const branchInfo = marketplaceBranch ? ` (branch: ${marketplaceBranch})` : "";
+            console.log(`Marketplace "${marketplaceName}" updated successfully${branchInfo} (scope: ${scope}).`);
         }
         return 0;
     }
@@ -151,13 +165,18 @@ async function handlePluginUpdateMarketplace(args) {
  * Requires: marketplaceName, scope
  */
 async function handlePluginListPlugins(args) {
-    const { marketplaceName, scope, json } = args;
-    const name = requireArg(marketplaceName, "--marketplace-name", "plugin:list-plugins", json);
-    if (!name)
-        return 1;
+    const { scope, json } = args;
+    let { marketplaceName } = args;
     if (!requireScope(scope, "plugin:list-plugins", json))
         return 1;
     const projectDir = scope === "project" ? process.cwd() : undefined;
+    // Auto-resolve marketplace when not provided and only one exists
+    if (!marketplaceName) {
+        marketplaceName = await autoResolveMarketplace(scope, projectDir) ?? undefined;
+    }
+    const name = requireArg(marketplaceName, "--marketplace-name", "plugin:list-plugins", json);
+    if (!name)
+        return 1;
     try {
         const plugins = await (0, marketplace_1.listMarketplacePlugins)(marketplaceName, scope, projectDir);
         if (json) {
@@ -202,19 +221,24 @@ async function handlePluginListPlugins(args) {
 // ============================================================================
 /** Install a plugin from a marketplace. */
 async function handlePluginInstall(args) {
-    const { pluginName, marketplaceName, scope, pluginVersion, json } = args;
+    const { pluginName, marketplaceBranch, scope, pluginVersion, json } = args;
+    let { marketplaceName } = args;
     const plugin = requireArg(pluginName, "--plugin-name", "plugin:install", json);
     if (!plugin)
         return 1;
-    const marketplace = requireArg(marketplaceName, "--marketplace-name", "plugin:install", json);
-    if (!marketplace)
-        return 1;
     if (!requireScope(scope, "plugin:install", json))
         return 1;
     const projectDir = scope === "project" ? process.cwd() : undefined;
+    // Auto-resolve marketplace when not provided and only one exists
+    if (!marketplaceName) {
+        marketplaceName = await autoResolveMarketplace(scope, projectDir) ?? undefined;
+    }
+    const marketplace = requireArg(marketplaceName, "--marketplace-name", "plugin:install", json);
+    if (!marketplace)
+        return 1;
     try {
-        // Update marketplace to ensure latest
-        await (0, marketplace_1.updateMarketplace)(marketplaceName, scope, projectDir);
+        // Update marketplace to ensure latest (and optionally switch branch)
+        await (0, marketplace_1.updateMarketplace)(marketplaceName, scope, projectDir, marketplaceBranch);
         // Determine version: use provided or read latestVersion from manifest
         let version = pluginVersion;
         if (!version) {
@@ -348,16 +372,21 @@ async function handlePluginUninstall(args) {
 }
 /** Update an installed plugin to a newer version. */
 async function handlePluginUpdate(args) {
-    const { pluginName, marketplaceName, scope, pluginVersion, json } = args;
+    const { pluginName, marketplaceBranch, scope, pluginVersion, json } = args;
+    let { marketplaceName } = args;
     const plugin = requireArg(pluginName, "--plugin-name", "plugin:update", json);
     if (!plugin)
         return 1;
-    const marketplace = requireArg(marketplaceName, "--marketplace-name", "plugin:update", json);
-    if (!marketplace)
-        return 1;
     if (!requireScope(scope, "plugin:update", json))
         return 1;
     const projectDir = scope === "project" ? process.cwd() : undefined;
+    // Auto-resolve marketplace when not provided and only one exists
+    if (!marketplaceName) {
+        marketplaceName = await autoResolveMarketplace(scope, projectDir) ?? undefined;
+    }
+    const marketplace = requireArg(marketplaceName, "--marketplace-name", "plugin:update", json);
+    if (!marketplace)
+        return 1;
     try {
         // Read registry to get currently installed version
         const registry = await (0, registry_1.readPluginRegistry)(scope, projectDir);
@@ -366,8 +395,8 @@ async function handlePluginUpdate(args) {
             throw new Error(`Plugin "${pluginName}" is not installed in the ${scope} registry`);
         }
         const installedVersion = entry.version;
-        // Update marketplace to get latest
-        await (0, marketplace_1.updateMarketplace)(marketplaceName, scope, projectDir);
+        // Update marketplace to get latest (and optionally switch branch)
+        await (0, marketplace_1.updateMarketplace)(marketplaceName, scope, projectDir, marketplaceBranch);
         // Determine target version
         let targetVersion = pluginVersion;
         if (!targetVersion) {
@@ -448,16 +477,21 @@ async function handlePluginUpdate(args) {
 }
 /** Configure an installed plugin. */
 async function handlePluginConfigure(args) {
-    const { pluginName, marketplaceName, scope, json } = args;
+    const { pluginName, scope, json } = args;
+    let { marketplaceName } = args;
     const plugin = requireArg(pluginName, "--plugin-name", "plugin:configure", json);
     if (!plugin)
         return 1;
-    const marketplace = requireArg(marketplaceName, "--marketplace-name", "plugin:configure", json);
-    if (!marketplace)
-        return 1;
     if (!requireScope(scope, "plugin:configure", json))
         return 1;
     const projectDir = scope === "project" ? process.cwd() : undefined;
+    // Auto-resolve marketplace when not provided and only one exists
+    if (!marketplaceName) {
+        marketplaceName = await autoResolveMarketplace(scope, projectDir) ?? undefined;
+    }
+    const marketplace = requireArg(marketplaceName, "--marketplace-name", "plugin:configure", json);
+    if (!marketplace)
+        return 1;
     try {
         // Resolve plugin package path
         const packagePath = await (0, marketplace_1.resolvePluginPackagePath)(marketplaceName, pluginName, scope, projectDir);
@@ -575,8 +609,14 @@ async function handlePluginUpdateRegistry(args) {
     const projectDir = scope === "project" ? process.cwd() : undefined;
     try {
         const registry = await (0, registry_1.readPluginRegistry)(scope, projectDir);
-        // Resolve the plugin package path for the registry entry
-        const packagePath = await (0, marketplace_1.resolvePluginPackagePath)(marketplaceName, pluginName, scope, projectDir);
+        // Try to resolve the plugin package path, but don't fail if marketplace is unavailable
+        let packagePath = "";
+        try {
+            packagePath = await (0, marketplace_1.resolvePluginPackagePath)(marketplaceName, pluginName, scope, projectDir);
+        }
+        catch {
+            // Marketplace may not exist or plugin may not be listed yet — that's OK
+        }
         const now = new Date().toISOString();
         const existingEntry = (0, registry_1.getPluginEntry)(registry, pluginName);
         const entry = {

package/dist/cli/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":";AAKA,OAAO,EAAE,sBAAsB,IAAI,6BAA6B,EAAoB,MAAM,oBAAoB,CAAC;AAwhB/G;;;;;;;;;GASG;AACH,iBAAS,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CA8BlE;AAOD,2EAA2E;AAC3E,QAAA,MAAM,sBAAsB,sCAAgC,CAAC;AAy+C7D,OAAO,EAAE,aAAa,IAAI,cAAc,EAAE,sBAAsB,IAAI,uBAAuB,EAAE,CAAC;AAE9F,wBAAgB,mBAAmB;eAEf,MAAM,EAAE,GAA2B,OAAO,CAAC,MAAM,CAAC;kBAgQpD,MAAM;EAIvB"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":";AAKA,OAAO,EAAE,sBAAsB,IAAI,6BAA6B,EAAoB,MAAM,oBAAoB,CAAC;AAmiB/G;;;;;;;;;GASG;AACH,iBAAS,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CA8BlE;AAOD,2EAA2E;AAC3E,QAAA,MAAM,sBAAsB,sCAAgC,CAAC;AAy+C7D,OAAO,EAAE,aAAa,IAAI,cAAc,EAAE,sBAAsB,IAAI,uBAAuB,EAAE,CAAC;AAE9F,wBAAgB,mBAAmB;eAEf,MAAM,EAAE,GAA2B,OAAO,CAAC,MAAM,CAAC;kBA6QpD,MAAM;EAIvB"}

package/dist/cli/main.js

@@ -85,7 +85,7 @@ const USAGE = `Usage:
   babysitter session:iteration-message --iteration <n> [--run-id <id>] [--runs-dir <dir>] [--plugin-root <dir>] [--json]
   babysitter skill:discover --plugin-root <dir> [--run-id <id>] [--cache-ttl <seconds>] [--runs-dir <dir>] [--include-remote] [--summary-only] [--process-path <path>] [--json]
   babysitter hook:log --hook-type <type> --log-file <path> [--json]
-  babysitter hook:run --hook-type <stop|session-start> [--harness <claude-code>] [--plugin-root <dir>] [--state-dir <dir>] [--runs-dir <dir>] [--json] [--verbose]
+  babysitter hook:run --hook-type <stop|session-start> [--harness <claude-code|codex|gemini-cli>] [--plugin-root <dir>] [--state-dir <dir>] [--runs-dir <dir>] [--json] [--verbose]
   babysitter skill:fetch-remote --source-type <github|well-known> --url <url> [--json]
   babysitter profile:read --user|--project [--dir <dir>] [--json]
   babysitter profile:write --user|--project --input <file> [--dir <dir>] [--json]
@@ -97,8 +97,8 @@ const USAGE = `Usage:
   babysitter plugin:configure [<pluginName>] [--plugin-name <name>] [--global|--project] [--json] [--verbose]
   babysitter plugin:list-installed [--global|--project] [--json] [--verbose]
   babysitter plugin:list-plugins --marketplace-name <name> [--global|--project] [--json] [--verbose]
-  babysitter plugin:add-marketplace --marketplace-url <url> [--marketplace-path <path>] [--marketplace-branch <ref>] [--global|--project] [--json] [--verbose]
-  babysitter plugin:update-marketplace --marketplace-name <name> [--global|--project] [--json] [--verbose]
+  babysitter plugin:add-marketplace --marketplace-url <url> [--marketplace-path <path>] [--marketplace-branch <ref>] [--force] [--global|--project] [--json] [--verbose]
+  babysitter plugin:update-marketplace --marketplace-name <name> [--marketplace-branch <ref>] [--global|--project] [--json] [--verbose]
   babysitter plugin:update-registry [<pluginName>] [--plugin-name <name>] [--plugin-version <ver>] [--global|--project] [--json] [--verbose]
   babysitter plugin:remove-from-registry [<pluginName>] [--plugin-name <name>] [--global|--project] [--json] [--verbose]
   babysitter health [--json] [--verbose]
@@ -275,7 +275,13 @@ function parseArgs(argv) {
         }
         // Session command flags
         if (arg === "--session-id") {
-            parsed.sessionId = expectFlagValue(rest, ++i, "--session-id");
+            // Tolerate empty/missing value — the harness adapter can auto-detect
+            // session ID from CLAUDE_ENV_FILE or CLAUDE_SESSION_ID env var.
+            const next = rest[i + 1];
+            if (next && !next.startsWith("-")) {
+                parsed.sessionId = next;
+                i++;
+            }
             continue;
         }
         if (arg === "--state-dir") {
@@ -407,6 +413,10 @@ function parseArgs(argv) {
             parsed.marketplaceBranch = expectFlagValue(rest, ++i, "--marketplace-branch");
             continue;
         }
+        if (arg === "--force") {
+            parsed.pluginForce = true;
+            continue;
+        }
         if (arg === "--global") {
             parsed.pluginScope = "global";
             continue;
@@ -1935,7 +1945,19 @@ function createBabysitterCli() {
                 if (parsed.command === "task:show") {
                     return await handleTaskShow(parsed);
                 }
-                // Session commands
+                // Session commands — auto-resolve sessionId via harness adapter if not
+                // explicitly provided (e.g. from CLAUDE_ENV_FILE written by session-start hook).
+                if (!parsed.sessionId && parsed.command?.startsWith("session:")) {
+                    const sessionAdapter = parsed.harness
+                        ? (0, harness_1.getAdapterByName)(parsed.harness)
+                        : (0, harness_1.getAdapter)();
+                    if (sessionAdapter) {
+                        const resolved = sessionAdapter.resolveSessionId(parsed);
+                        if (resolved) {
+                            parsed.sessionId = resolved;
+                        }
+                    }
+                }
                 if (parsed.command === "session:init") {
                     return await (0, session_1.handleSessionInit)({
                         sessionId: parsed.sessionId,
@@ -2074,6 +2096,7 @@ function createBabysitterCli() {
                         marketplaceBranch: parsed.marketplaceBranch,
                         pluginVersion: parsed.pluginVersion,
                         scope: parsed.pluginScope,
+                        force: parsed.pluginForce,
                         json: parsed.json,
                         verbose: parsed.verbose,
                         runsDir: parsed.runsDir,

package/dist/cli/resolveInputPath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveInputPath.d.ts","sourceRoot":"","sources":["../../src/cli/resolveInputPath.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CASxD;AA4DD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAgC1D"}
+{"version":3,"file":"resolveInputPath.d.ts","sourceRoot":"","sources":["../../src/cli/resolveInputPath.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAiBxD;AA4DD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAgC1D"}

package/dist/cli/resolveInputPath.js

@@ -57,12 +57,17 @@ const node_fs_1 = require("node:fs");
  * // => "C:\\project\\.a5c\\runs\\01RUN"
  */
 function collapseDoubledA5cRuns(p) {
-    // Match both forward and back-slash variants
-    const pattern = /([/\\]?\.a5c[/\\]runs)[/\\]\.a5c[/\\]runs([/\\]|$)/;
     let result = p;
-    // Collapse repeatedly in case of triple+ duplication
-    while (pattern.test(result)) {
-        result = result.replace(pattern, "$1$2");
+    // Collapse .a5c/runs/.a5c/runs/ → .a5c/runs/
+    const runsPattern = /([/\\]?\.a5c[/\\]runs)[/\\]\.a5c[/\\]runs([/\\]|$)/;
+    while (runsPattern.test(result)) {
+        result = result.replace(runsPattern, "$1$2");
+    }
+    // Collapse .a5c/.a5c/ → .a5c/ (e.g. when CLI runs from .a5c/ with relative
+    // --runs-dir .a5c/runs, producing /project/.a5c/.a5c/runs/)
+    const a5cPattern = /([/\\]\.a5c)[/\\]\.a5c([/\\])/;
+    while (a5cPattern.test(result)) {
+        result = result.replace(a5cPattern, "$1$2");
     }
     return result;
 }

package/dist/harness/codex.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Codex harness adapter.
+ *
+ * Extends the SDK harness layer with "codex" support while reusing the
+ * mature Claude stop/session-start hook handlers. The Codex adapter maps
+ * Codex-specific environment conventions to the generic adapter interface.
+ */
+import type { HarnessAdapter } from "./types";
+export declare function createCodexAdapter(): HarnessAdapter;
+//# sourceMappingURL=codex.d.ts.map

package/dist/harness/codex.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../src/harness/codex.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EACV,cAAc,EAIf,MAAM,SAAS,CAAC;AA+CjB,wBAAgB,kBAAkB,IAAI,cAAc,CAgFnD"}

package/dist/harness/codex.js

@@ -0,0 +1,150 @@
+"use strict";
+/**
+ * Codex harness adapter.
+ *
+ * Extends the SDK harness layer with "codex" support while reusing the
+ * mature Claude stop/session-start hook handlers. The Codex adapter maps
+ * Codex-specific environment conventions to the generic adapter interface.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createCodexAdapter = createCodexAdapter;
+const path = __importStar(require("node:path"));
+const node_fs_1 = require("node:fs");
+const claudeCode_1 = require("./claudeCode");
+function resolveCodexPluginRoot(args = {}) {
+    const root = args.pluginRoot || process.env.CODEX_PLUGIN_ROOT;
+    return root ? path.resolve(root) : undefined;
+}
+function resolveCodexStateDir(args) {
+    if (args.stateDir)
+        return path.resolve(args.stateDir);
+    if (process.env.BABYSITTER_STATE_DIR) {
+        return path.resolve(process.env.BABYSITTER_STATE_DIR);
+    }
+    const pluginRoot = resolveCodexPluginRoot(args);
+    if (pluginRoot) {
+        // Codex plugins conventionally live under ".codex", while state is in ".a5c".
+        return path.resolve(pluginRoot, "..", ".a5c");
+    }
+    return path.resolve(".a5c");
+}
+function resolveCodexSessionId(parsed) {
+    if (parsed.sessionId)
+        return parsed.sessionId;
+    // Codex injects CODEX_THREAD_ID; keep CODEX_SESSION_ID as legacy fallback.
+    if (process.env.CODEX_THREAD_ID)
+        return process.env.CODEX_THREAD_ID;
+    if (process.env.CODEX_SESSION_ID)
+        return process.env.CODEX_SESSION_ID;
+    const envFile = process.env.CODEX_ENV_FILE;
+    if (!envFile)
+        return undefined;
+    try {
+        const content = (0, node_fs_1.readFileSync)(envFile, "utf-8");
+        const match = content.match(/(?:^|\n)\s*(?:export\s+)?(?:CODEX_THREAD_ID|CODEX_SESSION_ID)="([^"]+)"/);
+        return match?.[1] || undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function createCodexAdapter() {
+    const claude = (0, claudeCode_1.createClaudeCodeAdapter)();
+    return {
+        name: "codex",
+        isActive() {
+            return !!(process.env.CODEX_THREAD_ID ||
+                process.env.CODEX_SESSION_ID ||
+                process.env.CODEX_ENV_FILE ||
+                process.env.CODEX_PLUGIN_ROOT);
+        },
+        resolveSessionId(parsed) {
+            return resolveCodexSessionId(parsed);
+        },
+        resolveStateDir(args) {
+            return resolveCodexStateDir(args);
+        },
+        resolvePluginRoot(args) {
+            return resolveCodexPluginRoot(args);
+        },
+        bindSession(opts) {
+            const stateDir = resolveCodexStateDir({
+                stateDir: opts.stateDir,
+                pluginRoot: opts.pluginRoot,
+            });
+            return claude.bindSession({
+                ...opts,
+                stateDir,
+            });
+        },
+        handleStopHook(args) {
+            const pluginRoot = resolveCodexPluginRoot(args);
+            const stateDir = resolveCodexStateDir({
+                stateDir: args.stateDir,
+                pluginRoot,
+            });
+            return claude.handleStopHook({
+                ...args,
+                pluginRoot,
+                stateDir,
+            });
+        },
+        handleSessionStartHook(args) {
+            const pluginRoot = resolveCodexPluginRoot(args);
+            const stateDir = resolveCodexStateDir({
+                stateDir: args.stateDir,
+                pluginRoot,
+            });
+            return claude.handleSessionStartHook({
+                ...args,
+                pluginRoot,
+                stateDir,
+            });
+        },
+        findHookDispatcherPath(startCwd) {
+            const pluginRoot = resolveCodexPluginRoot();
+            if (pluginRoot) {
+                const candidate = path.join(pluginRoot, "hooks", "hook-dispatcher.sh");
+                if ((0, node_fs_1.existsSync)(candidate))
+                    return candidate;
+            }
+            const local = path.join(path.resolve(startCwd), ".codex", "hooks", "hook-dispatcher.sh");
+            if ((0, node_fs_1.existsSync)(local))
+                return local;
+            return null;
+        },
+    };
+}

package/dist/harness/index.d.ts

@@ -1,5 +1,6 @@
 export type { HarnessAdapter, SessionBindOptions, SessionBindResult, HookHandlerArgs, } from "./types";
 export { createClaudeCodeAdapter } from "./claudeCode";
+export { createCodexAdapter } from "./codex";
 export { createGeminiCliAdapter } from "./geminiCli";
 export { createNullAdapter } from "./nullAdapter";
 export { detectAdapter, getAdapterByName, listSupportedHarnesses, getAdapter, setAdapter, resetAdapter, } from "./registry";

package/dist/harness/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/harness/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,cAAc,EACd,kBAAkB,EAClB,iBAAiB,EACjB,eAAe,GAChB,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,sBAAsB,EACtB,UAAU,EACV,UAAU,EACV,YAAY,GACb,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/harness/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,cAAc,EACd,kBAAkB,EAClB,iBAAiB,EACjB,eAAe,GAChB,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,sBAAsB,EACtB,UAAU,EACV,UAAU,EACV,YAAY,GACb,MAAM,YAAY,CAAC"}

package/dist/harness/index.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resetAdapter = exports.setAdapter = exports.getAdapter = exports.listSupportedHarnesses = exports.getAdapterByName = exports.detectAdapter = exports.createNullAdapter = exports.createGeminiCliAdapter = exports.createClaudeCodeAdapter = void 0;
+exports.resetAdapter = exports.setAdapter = exports.getAdapter = exports.listSupportedHarnesses = exports.getAdapterByName = exports.detectAdapter = exports.createNullAdapter = exports.createGeminiCliAdapter = exports.createCodexAdapter = exports.createClaudeCodeAdapter = void 0;
 var claudeCode_1 = require("./claudeCode");
 Object.defineProperty(exports, "createClaudeCodeAdapter", { enumerable: true, get: function () { return claudeCode_1.createClaudeCodeAdapter; } });
+var codex_1 = require("./codex");
+Object.defineProperty(exports, "createCodexAdapter", { enumerable: true, get: function () { return codex_1.createCodexAdapter; } });
 var geminiCli_1 = require("./geminiCli");
 Object.defineProperty(exports, "createGeminiCliAdapter", { enumerable: true, get: function () { return geminiCli_1.createGeminiCliAdapter; } });
 var nullAdapter_1 = require("./nullAdapter");

package/dist/harness/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/harness/registry.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAkB9C;;;GAGG;AACH,wBAAgB,aAAa,IAAI,cAAc,CAK9C;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAKpE;AAED;;GAEG;AACH,wBAAgB,sBAAsB,IAAI,MAAM,EAAE,CAEjD;AAQD;;GAEG;AACH,wBAAgB,UAAU,IAAI,cAAc,CAK3C;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,CAExD;AAED;;GAEG;AACH,wBAAgB,YAAY,IAAI,IAAI,CAEnC"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/harness/registry.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAoB9C;;;GAGG;AACH,wBAAgB,aAAa,IAAI,cAAc,CAK9C;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAKpE;AAED;;GAEG;AACH,wBAAgB,sBAAsB,IAAI,MAAM,EAAE,CAEjD;AAQD;;GAEG;AACH,wBAAgB,UAAU,IAAI,cAAc,CAK3C;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,CAExD;AAED;;GAEG;AACH,wBAAgB,YAAY,IAAI,IAAI,CAEnC"}

package/dist/harness/registry.js

@@ -14,12 +14,14 @@ exports.getAdapter = getAdapter;
 exports.setAdapter = setAdapter;
 exports.resetAdapter = resetAdapter;
 const claudeCode_1 = require("./claudeCode");
+const codex_1 = require("./codex");
 const geminiCli_1 = require("./geminiCli");
 const nullAdapter_1 = require("./nullAdapter");
 // ---------------------------------------------------------------------------
 // Registry of known adapters (ordered by priority)
 // ---------------------------------------------------------------------------
 const knownAdapters = [
+    (0, codex_1.createCodexAdapter)(),
     (0, claudeCode_1.createClaudeCodeAdapter)(),
     (0, geminiCli_1.createGeminiCliAdapter)(),
 ];

package/dist/plugins/marketplace.d.ts

@@ -24,17 +24,21 @@ export declare function deriveMarketplaceName(url: string): string;
  * @param projectDir - Required when scope is 'project'
  * @param manifestPath - Optional relative path to marketplace.json within the repo
  * @param branch - Optional git branch/tag/ref to clone (defaults to the repo's default branch)
+ * @param force - If true, removes existing clone and re-clones
  * @returns The directory the marketplace was cloned into
  */
-export declare function cloneMarketplace(url: string, scope: PluginScope, projectDir?: string, manifestPath?: string, branch?: string): Promise<string>;
+export declare function cloneMarketplace(url: string, scope: PluginScope, projectDir?: string, manifestPath?: string, branch?: string, force?: boolean): Promise<string>;
 /**
  * Updates a previously cloned marketplace by pulling latest changes.
+ * When a branch is specified, switches to that branch first (fetching it
+ * even in shallow clones).
  *
  * @param marketplaceName - Name of the marketplace directory
  * @param scope - Whether to look in global or project marketplaces dir
  * @param projectDir - Required when scope is 'project'
+ * @param branch - Optional branch/tag/ref to switch to before pulling
  */
-export declare function updateMarketplace(marketplaceName: string, scope: PluginScope, projectDir?: string): Promise<void>;
+export declare function updateMarketplace(marketplaceName: string, scope: PluginScope, projectDir?: string, branch?: string): Promise<void>;
 /**
  * Reads and parses the marketplace manifest from a cloned marketplace.
  *

package/dist/plugins/marketplace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marketplace.d.ts","sourceRoot":"","sources":["../../src/plugins/marketplace.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,OAAO,EACL,mBAAmB,EACnB,sBAAsB,EACtB,WAAW,EAIZ,MAAM,SAAS,CAAC;AAIjB;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAazD;AAED;;;;;;;;;GASG;AACH,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,WAAW,EAClB,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,MAAM,EACrB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,CA6CjB;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,WAAW,EAClB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CAmBf;AA+JD;;;;;;;;;GASG;AACH,wBAAsB,uBAAuB,CAC3C,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,WAAW,EAClB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,mBAAmB,CAAC,CAO9B;AAED;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAC1C,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,WAAW,EAClB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,sBAAsB,EAAE,CAAC,CASnC;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,WAAW,EAClB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAejB;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,WAAW,EAClB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,EAAE,CAAC,CAcnB"}
+{"version":3,"file":"marketplace.d.ts","sourceRoot":"","sources":["../../src/plugins/marketplace.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,OAAO,EACL,mBAAmB,EACnB,sBAAsB,EACtB,WAAW,EAIZ,MAAM,SAAS,CAAC;AAIjB;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAazD;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,WAAW,EAClB,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,MAAM,EACrB,MAAM,CAAC,EAAE,MAAM,EACf,KAAK,CAAC,EAAE,OAAO,GACd,OAAO,CAAC,MAAM,CAAC,CAiDjB;AAED;;;;;;;;;GASG;AACH,wBAAsB,iBAAiB,CACrC,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,WAAW,EAClB,UAAU,CAAC,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAoCf;AA+JD;;;;;;;;;GASG;AACH,wBAAsB,uBAAuB,CAC3C,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,WAAW,EAClB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,mBAAmB,CAAC,CAO9B;AAED;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAC1C,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,WAAW,EAClB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,sBAAsB,EAAE,CAAC,CASnC;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,WAAW,EAClB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAejB;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,WAAW,EAClB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,EAAE,CAAC,CAcnB"}

package/dist/plugins/marketplace.js

@@ -53,9 +53,10 @@ function deriveMarketplaceName(url) {
  * @param projectDir - Required when scope is 'project'
  * @param manifestPath - Optional relative path to marketplace.json within the repo
  * @param branch - Optional git branch/tag/ref to clone (defaults to the repo's default branch)
+ * @param force - If true, removes existing clone and re-clones
  * @returns The directory the marketplace was cloned into
  */
-async function cloneMarketplace(url, scope, projectDir, manifestPath, branch) {
+async function cloneMarketplace(url, scope, projectDir, manifestPath, branch, force) {
     const name = deriveMarketplaceName(url);
     const marketplacesDir = (0, paths_1.getMarketplacesDir)(scope, projectDir);
     const targetDir = node_path_1.default.join(marketplacesDir, name);
@@ -64,7 +65,12 @@ async function cloneMarketplace(url, scope, projectDir, manifestPath, branch) {
     // Check if already cloned
     try {
         await node_fs_1.promises.access(targetDir);
-        throw new Error(`Marketplace "${name}" already exists at ${targetDir}. Use updateMarketplace() to refresh.`);
+        if (force) {
+            await node_fs_1.promises.rm(targetDir, { recursive: true, force: true });
+        }
+        else {
+            throw new Error(`Marketplace "${name}" already exists at ${targetDir}. Use --force to replace or plugin:update-marketplace to refresh.`);
+        }
     }
     catch (error) {
         if (!(0, types_1.isNodeError)(error) || error.code !== "ENOENT") {
@@ -92,12 +98,15 @@ async function cloneMarketplace(url, scope, projectDir, manifestPath, branch) {
 }
 /**
  * Updates a previously cloned marketplace by pulling latest changes.
+ * When a branch is specified, switches to that branch first (fetching it
+ * even in shallow clones).
  *
  * @param marketplaceName - Name of the marketplace directory
  * @param scope - Whether to look in global or project marketplaces dir
  * @param projectDir - Required when scope is 'project'
+ * @param branch - Optional branch/tag/ref to switch to before pulling
  */
-async function updateMarketplace(marketplaceName, scope, projectDir) {
+async function updateMarketplace(marketplaceName, scope, projectDir, branch) {
     const dir = (0, paths_1.getMarketplaceDir)(marketplaceName, scope, projectDir);
     try {
         await node_fs_1.promises.access(dir);
@@ -106,6 +115,25 @@ async function updateMarketplace(marketplaceName, scope, projectDir) {
         throw new Error(`Marketplace "${marketplaceName}" not found at ${dir}. Clone it first.`);
     }
     try {
+        if (branch) {
+            // Fetch the specific branch (works with shallow clones)
+            await execFile("git", ["-C", dir, "fetch", "--depth", "1", "origin", branch]);
+            // Switch to the branch, creating it locally if needed
+            try {
+                await execFile("git", ["-C", dir, "checkout", branch]);
+            }
+            catch {
+                // Branch doesn't exist locally — create from FETCH_HEAD
+                // Stash any local changes first (e.g. .babysitter-manifest-path)
+                try {
+                    await execFile("git", ["-C", dir, "stash"]);
+                }
+                catch {
+                    // Nothing to stash
+                }
+                await execFile("git", ["-C", dir, "checkout", "-B", branch, "FETCH_HEAD"]);
+            }
+        }
         await execFile("git", ["-C", dir, "pull", "--ff-only"]);
     }
     catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a5c-ai/babysitter-sdk",
-  "version": "0.0.177-staging.a86ad18c",
+  "version": "0.0.177-staging.ec3ce00a",
   "description": "Storage and run-registry primitives for event-sourced babysitter workflows.",
   "license": "UNLICENSED",
   "type": "commonjs",