thepopebot 1.2.76-beta.7 → 1.2.76-beta.8

package/lib/ai/index.js

@@ -182,10 +182,10 @@ async function* chatStream(threadId, message, attachments = [], options = {}) {
     }
 
     try {
-      await ensureWorkspaceRepo({ workspaceDir: repoDir, repo, branch, featureBranch });
+      const setupOutput = await ensureWorkspaceRepo({ workspaceDir: repoDir, repo, branch, featureBranch });
       ensureSkills(repoDir, isCodeMode ? 'code' : 'agent');
       if (needsSetup) {
-        const result = `Workspace ready on ${featureBranch || branch}`;
+        const result = setupOutput || `Workspace ready on ${featureBranch || branch}`;
         yield { type: 'tool-result', toolCallId: setupToolCallId, result };
         persistMessage(threadId, 'assistant', JSON.stringify({
           type: 'tool-invocation',

package/lib/ai/workspace-setup.js

@@ -32,20 +32,24 @@ export async function ensureWorkspaceRepo({ workspaceDir, repo, branch, featureB
   if (ghToken) env.GH_TOKEN = ghToken;
 
   const execOpts = { cwd: workspaceDir, env };
+  const log = [];
 
   // 1. Create workspace directory
   mkdirSync(workspaceDir, { recursive: true });
 
   // 2. Configure git to use GH_TOKEN for GitHub HTTPS URLs (mirrors setup-git.sh)
   if (ghToken) {
-    await run('gh', ['auth', 'setup-git'], execOpts);
+    const out = await run('gh', ['auth', 'setup-git'], execOpts);
+    if (out) log.push(out);
   }
 
   // 3. Clone if not already a git repo
   const hasGit = existsSync(path.join(workspaceDir, '.git'));
   if (!hasGit) {
     if (!repo) throw new Error('ensureWorkspaceRepo: repo is required for initial clone');
-    await run('git', ['clone', '--branch', branch || 'main', `https://github.com/${repo}`, '.'], execOpts);
+    const out = await run('git', ['clone', '--branch', branch || 'main', `https://github.com/${repo}`, '.'], execOpts);
+    log.push(`Cloned ${repo} (branch: ${branch || 'main'})`);
+    if (out) log.push(out);
   }
 
   // 3. Git identity (only if not already configured)
@@ -61,6 +65,7 @@ export async function ensureWorkspaceRepo({ workspaceDir, repo, branch, featureB
         const email = user.email || `${user.id}+${user.login}@users.noreply.github.com`;
         await run('git', ['config', 'user.name', name], execOpts);
         await run('git', ['config', 'user.email', email], execOpts);
+        log.push(`Git identity: ${name} <${email}>`);
       } catch (err) {
         console.error('[workspace-setup] Failed to set git identity:', err.message);
       }
@@ -68,7 +73,7 @@ export async function ensureWorkspaceRepo({ workspaceDir, repo, branch, featureB
   }
 
   // 4. Feature branch checkout
-  if (!featureBranch) return;
+  if (!featureBranch) return log.join('\n');
 
   // Already on the right branch locally?
   try {
@@ -77,8 +82,11 @@ export async function ensureWorkspaceRepo({ workspaceDir, repo, branch, featureB
     const current = await run('git', ['rev-parse', '--abbrev-ref', 'HEAD'], execOpts);
     if (current !== featureBranch) {
       await run('git', ['checkout', featureBranch], execOpts);
+      log.push(`Checked out ${featureBranch}`);
+    } else {
+      log.push(`Already on ${featureBranch}`);
     }
-    return;
+    return log.join('\n');
   } catch {
     // Branch doesn't exist locally — check remote
   }
@@ -88,15 +96,20 @@ export async function ensureWorkspaceRepo({ workspaceDir, repo, branch, featureB
     if (remoteCheck) {
       // Remote branch exists — checkout tracking it
       await run('git', ['checkout', '-B', featureBranch, `origin/${featureBranch}`], execOpts);
+      log.push(`Checked out ${featureBranch} (tracking origin)`);
     } else {
       // Create new branch and push
       await run('git', ['checkout', '-b', featureBranch], execOpts);
-      await run('git', ['push', '-u', 'origin', featureBranch], execOpts);
+      const pushOut = await run('git', ['push', '-u', 'origin', featureBranch], execOpts);
+      log.push(`Created and pushed ${featureBranch}`);
+      if (pushOut) log.push(pushOut);
     }
   } catch (err) {
     console.error('[workspace-setup] Feature branch error:', err.message);
     throw err;
   }
+
+  return log.join('\n');
 }
 
 /**

package/lib/chat/components/code-mode-toggle.js

@@ -200,7 +200,7 @@ function WorkspaceBar({
       repoName && /* @__PURE__ */ jsx("span", { className: "shrink-0 cursor-default hidden md:inline", title: repo, children: repoName }),
       branch && /* @__PURE__ */ jsxs(Fragment, { children: [
         /* @__PURE__ */ jsx("span", { className: "shrink-0 text-muted-foreground/30 hidden md:inline", children: "/" }),
-        /* @__PURE__ */ jsx("div", { className: "shrink-0 max-w-[120px]", children: /* @__PURE__ */ jsx(
+        /* @__PURE__ */ jsx("div", { className: "min-w-0 max-w-[120px] md:max-w-[160px]", children: /* @__PURE__ */ jsx(
           Combobox,
           {
             options: branches.map((b) => ({ value: b.name, label: b.name })),

package/lib/chat/components/code-mode-toggle.jsx

@@ -225,7 +225,7 @@ export function WorkspaceBar({
         {branch && (
           <>
             <span className="shrink-0 text-muted-foreground/30 hidden md:inline">/</span>
-            <div className="shrink-0 max-w-[120px]">
+            <div className="min-w-0 max-w-[120px] md:max-w-[160px]">
               <Combobox
                 options={branches.map((b) => ({ value: b.name, label: b.name }))}
                 value={branch}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thepopebot",
-  "version": "1.2.76-beta.7",
+  "version": "1.2.76-beta.8",
   "type": "module",
   "description": "Create autonomous AI agents with a two-layer architecture: Next.js Event Handler + Docker Agent.",
   "bin": {