@xagent/x-cli 1.1.67 → 1.1.69

package/README.md

@@ -1,4 +1,6 @@
-## 1.1.67 – Logo Assets & NPM Publication Complete
+<!-- Test comment for PR creation -->
+
+## 1.1.69 – Logo Assets & NPM Publication Complete
 
 ✅ **Live on NPM**: [@xagent/x-cli](https://www.npmjs.com/package/@xagent/x-cli) - Fully published and ready for global installation
 
@@ -45,6 +47,16 @@ A conversational AI CLI tool powered by Grok with **Claude Code-level intelligen
 - **📋 User Approval Workflow**: Complete plan review and confirmation before execution
 - **⚡ Performance Optimized**: Fast exploration (1-15 seconds) with intelligent caching and filtering
 
+### 🚀 **P5: Research → Recommend → Execute → Auto-Doc Workflow** (Latest)
+
+- **🤖 Research Phase**: Intelligent context loading from `.agent/` docs with Issues/Options analysis
+- **💡 Recommend Phase**: Structured decision framework with trade-offs, effort/risk analysis, and confidence scoring
+- **⚡ Execute Phase**: Sequential TODO execution with adaptive recovery, real-time diffs, and safety guarantees
+- **📝 Auto-Doc Phase**: Automatic completion documentation with lesson learning and SOP candidate detection
+- **🛡️ Safety First**: All changes have patches, backups, and git commits; adaptive error recovery
+- **🔄 Resilient**: Handles execution failures gracefully with re-planning capabilities
+- **📚 Knowledge Base**: Builds institutional memory through automatic documentation accumulation
+
 ### 🎨 **P4: UX Refinement - Claude Code Feel**
 
 - **🎭 Enhanced Welcome Banner**: Professional ASCII art with context-aware status display
@@ -1078,14 +1090,14 @@ To add yourself as a contributor:
 
 - **[@unblock-everything](https://github.com/unblock-everything)** — [x.ai](https://x.ai) — Cold-ass honkey 😎
 - **[@Bucko89](https://github.com/Bucko89)** — [GMA](https://getmyagencies.com) — Grinding daily
-- **[@base-buzz](https://github.com/base-buzz)** — [Meta](team.meta.com)
+- **[@base-buzz](https://github.com/base-buzz)** — [BaseBUzz](team.basebuzz.com)
 
 _Want to see your name here? Check out our [Contributing Guide](CONTRIBUTING.md) and submit a pull request!_
 
 ### How to Contribute
 
 1. **Fork** the repository on GitHub
-2. **Clone** your fork locally: `git clone https://github.com/yourusername/x-cli-hurry-mode.git`
+2. **Clone** your fork locally: `git clone https://github.com/yourusername/x-cli.git`
 3. **Create** a feature branch: `git checkout -b feature/your-feature-name`
 4. **Make** your changes and commit them: `git commit -m "feat: add awesome feature"`
 5. **Push** to your fork: `git push origin feature/your-feature-name`
@@ -1102,3 +1114,5 @@ _Want to see your name here? Check out our [Contributing Guide](CONTRIBUTING.md)
 - 💡 **Feature requests** - Suggest new functionality
 
 Join our growing community of AI-powered terminal enthusiasts!
+
+# Test: Branch Protection Rules Test

package/dist/index.js

@@ -7039,10 +7039,10 @@ var DependencyAnalyzerTool = class {
     const circularDeps = [];
     const visited = /* @__PURE__ */ new Set();
     const visiting = /* @__PURE__ */ new Set();
-    const dfs = (filePath, path30) => {
+    const dfs = (filePath, path31) => {
       if (visiting.has(filePath)) {
-        const cycleStart = path30.indexOf(filePath);
-        const cycle = path30.slice(cycleStart).concat([filePath]);
+        const cycleStart = path31.indexOf(filePath);
+        const cycle = path31.slice(cycleStart).concat([filePath]);
         circularDeps.push({
           cycle: cycle.map((fp) => graph.nodes.get(fp)?.filePath || fp),
           severity: cycle.length <= 2 ? "error" : "warning",
@@ -7058,7 +7058,7 @@ var DependencyAnalyzerTool = class {
       if (node) {
         for (const dependency of node.dependencies) {
           if (graph.nodes.has(dependency)) {
-            dfs(dependency, [...path30, filePath]);
+            dfs(dependency, [...path31, filePath]);
           }
         }
       }
@@ -9030,10 +9030,10 @@ Current working directory: ${process.cwd()}`
             return await this.textEditor.view(args.path, range);
           } catch (error) {
             console.warn(`view_file tool failed, falling back to bash: ${error.message}`);
-            const path30 = args.path;
-            let command = `cat "${path30}"`;
+            const path31 = args.path;
+            let command = `cat "${path31}"`;
             if (args.start_line && args.end_line) {
-              command = `sed -n '${args.start_line},${args.end_line}p' "${path30}"`;
+              command = `sed -n '${args.start_line},${args.end_line}p' "${path31}"`;
             }
             return await this.bash.execute(command);
           }
@@ -14655,7 +14655,7 @@ ${guardrail.createdFrom ? `- Created from incident: ${guardrail.createdFrom}` :
 var package_default = {
   type: "module",
   name: "@xagent/x-cli",
-  version: "1.1.67",
+  version: "1.1.69",
   description: "An open-source AI agent that brings the power of Grok directly into your terminal.",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -14684,6 +14684,7 @@ var package_default = {
     "dev:watch": "npm run build && node --watch dist/index.js",
     start: "node dist/index.js",
     local: "npm run build && npm link && node dist/index.js",
+    "test:workflow": "node scripts/test-workflow.js",
     "start:bun": "bun run dist/index.js",
     lint: "eslint . --ext .js,.jsx,.ts,.tsx",
     typecheck: "tsc --noEmit",
@@ -16501,23 +16502,109 @@ ${commitMessage}`
         setChatHistory((prev) => [...prev, commitEntry]);
         if (commitResult.success) {
           const pushResult = await agent.executeBashCommand("git push");
-          const pushEntry = {
-            type: "tool_result",
-            content: pushResult.success ? `\u{1F680} **Push Successful**: ${pushResult.output?.split("\n")[0] || "Changes pushed to remote"}` : `\u274C **Push Failed**: ${pushResult.error || "Unknown error"}
+          if (pushResult.success) {
+            const pushEntry = {
+              type: "tool_result",
+              content: `\u{1F680} **Push Successful**: ${pushResult.output?.split("\n")[0] || "Changes pushed to remote"}`,
+              timestamp: /* @__PURE__ */ new Date(),
+              toolCall: {
+                id: `git_push_${Date.now()}`,
+                type: "function",
+                function: {
+                  name: "bash",
+                  arguments: JSON.stringify({ command: "git push" })
+                }
+              },
+              toolResult: pushResult
+            };
+            setChatHistory((prev) => [...prev, pushEntry]);
+          } else {
+            const pushError = pushResult.error || pushResult.output || "";
+            if (pushError.includes("protected branch") || pushError.includes("Changes must be made through a pull request") || pushError.includes("GH006")) {
+              const branchProtectionEntry = {
+                type: "assistant",
+                content: "\u{1F6E1}\uFE0F **Branch Protection Detected**: Direct pushes to this branch are blocked.\n\n\u{1F504} **Creating PR workflow...**",
+                timestamp: /* @__PURE__ */ new Date()
+              };
+              setChatHistory((prev) => [...prev, branchProtectionEntry]);
+              const featureBranch = `feature/${(/* @__PURE__ */ new Date()).toISOString().slice(0, 19).replace(/[:-]/g, "").replace("T", "-")}-smart-push`;
+              const createBranchResult = await agent.executeBashCommand(`git checkout -b ${featureBranch}`);
+              if (createBranchResult.success) {
+                const pushBranchResult = await agent.executeBashCommand(`git push -u origin ${featureBranch}`);
+                if (pushBranchResult.success) {
+                  const branchSuccessEntry = {
+                    type: "tool_result",
+                    content: `\u2705 **Feature Branch Created**: \`${featureBranch}\`
+
+\u{1F4CB} **Attempting to create Pull Request...**`,
+                    timestamp: /* @__PURE__ */ new Date()
+                  };
+                  setChatHistory((prev) => [...prev, branchSuccessEntry]);
+                  const prResult = await agent.executeBashCommand(`gh pr create --title "${cleanCommitMessage}" --body "Auto-generated PR from smart-push" --head ${featureBranch} --base main`);
+                  if (prResult.success) {
+                    const prUrl = prResult.output?.match(/https:\/\/github\.com\/[^\s]+/)?.[0];
+                    const prSuccessEntry = {
+                      type: "tool_result",
+                      content: `\u2705 **Pull Request Created Successfully!**
 
-Try running \`git push\` manually.`,
-            timestamp: /* @__PURE__ */ new Date(),
-            toolCall: {
-              id: `git_push_${Date.now()}`,
-              type: "function",
-              function: {
-                name: "bash",
-                arguments: JSON.stringify({ command: "git push" })
+\u{1F517} **PR URL**: ${prUrl || "Check GitHub for the link"}
+
+\u{1F3AF} **Next Steps**:
+\u2022 Review the PR on GitHub
+\u2022 Wait for CI checks to pass
+\u2022 Request approval and merge`,
+                      timestamp: /* @__PURE__ */ new Date()
+                    };
+                    setChatHistory((prev) => [...prev, prSuccessEntry]);
+                  } else {
+                    const prManualEntry = {
+                      type: "assistant",
+                      content: `\u26A0\uFE0F **PR Creation Failed**: GitHub CLI may not be available.
+
+\u{1F4A1} **Create PR Manually**:
+\u2022 Go to GitHub repository
+\u2022 Create PR from \`${featureBranch}\` \u2192 \`main\`
+\u2022 Title: \`${cleanCommitMessage}\``,
+                      timestamp: /* @__PURE__ */ new Date()
+                    };
+                    setChatHistory((prev) => [...prev, prManualEntry]);
+                  }
+                } else {
+                  const pushFailEntry = {
+                    type: "tool_result",
+                    content: `\u274C **Failed to push feature branch**: ${pushBranchResult.error}`,
+                    timestamp: /* @__PURE__ */ new Date()
+                  };
+                  setChatHistory((prev) => [...prev, pushFailEntry]);
+                }
+              } else {
+                const branchFailEntry = {
+                  type: "tool_result",
+                  content: `\u274C **Failed to create feature branch**: ${createBranchResult.error}`,
+                  timestamp: /* @__PURE__ */ new Date()
+                };
+                setChatHistory((prev) => [...prev, branchFailEntry]);
               }
-            },
-            toolResult: pushResult
-          };
-          setChatHistory((prev) => [...prev, pushEntry]);
+            } else {
+              const pushFailEntry = {
+                type: "tool_result",
+                content: `\u274C **Push Failed**: ${pushResult.error || "Unknown error"}
+
+Try running \`git push\` manually.`,
+                timestamp: /* @__PURE__ */ new Date(),
+                toolCall: {
+                  id: `git_push_${Date.now()}`,
+                  type: "function",
+                  function: {
+                    name: "bash",
+                    arguments: JSON.stringify({ command: "git push" })
+                  }
+                },
+                toolResult: pushResult
+              };
+              setChatHistory((prev) => [...prev, pushFailEntry]);
+            }
+          }
         }
       } catch (error) {
         const errorEntry = {
@@ -19311,6 +19398,119 @@ function createMCPCommand() {
   });
   return mcpCommand;
 }
+var CONTEXT_BUDGET_BYTES = 280 * 1024;
+var MAX_SUMMARY_LENGTH = 2e3;
+function loadMarkdownDirectory(dirPath) {
+  if (!fs__default.existsSync(dirPath)) {
+    return "";
+  }
+  const files = fs__default.readdirSync(dirPath).filter((file) => file.endsWith(".md")).sort();
+  let content = "";
+  for (const file of files) {
+    const filePath = path7__default.join(dirPath, file);
+    try {
+      const fileContent = fs__default.readFileSync(filePath, "utf-8");
+      content += `
+
+=== ${file} ===
+
+${fileContent}`;
+    } catch (error) {
+      console.warn(`Failed to read ${filePath}:`, error);
+    }
+  }
+  return content;
+}
+function extractDateFromFilename(filename) {
+  const match = filename.match(/^(\d{4}-\d{2}-\d{2})/);
+  if (match) {
+    return new Date(match[1]);
+  }
+  return /* @__PURE__ */ new Date(0);
+}
+function summarizeContent(content, maxLength = MAX_SUMMARY_LENGTH) {
+  if (content.length <= maxLength) {
+    return content;
+  }
+  const truncated = content.substring(0, maxLength);
+  const lastNewline = truncated.lastIndexOf("\n\n");
+  if (lastNewline > maxLength * 0.8) {
+    return truncated.substring(0, lastNewline);
+  }
+  return truncated + "\n\n[...content truncated for context budget...]";
+}
+function loadTaskFiles(tasksDir, maxBudget) {
+  if (!fs__default.existsSync(tasksDir)) {
+    return [];
+  }
+  const files = fs__default.readdirSync(tasksDir).filter((file) => file.endsWith(".md")).map((filename) => {
+    const filePath = path7__default.join(tasksDir, filename);
+    const content = fs__default.readFileSync(filePath, "utf-8");
+    return {
+      filename,
+      content,
+      size: Buffer.byteLength(content, "utf-8"),
+      date: extractDateFromFilename(filename),
+      isSummarized: false
+    };
+  }).sort((a, b) => b.date.getTime() - a.date.getTime());
+  const result = [];
+  let usedBudget = 0;
+  for (const file of files) {
+    let finalContent = file.content;
+    let isSummarized = false;
+    if (usedBudget + file.size > maxBudget) {
+      finalContent = summarizeContent(file.content);
+      const summarizedSize = Buffer.byteLength(finalContent, "utf-8");
+      if (usedBudget + summarizedSize > maxBudget) {
+        continue;
+      }
+      usedBudget += summarizedSize;
+      isSummarized = true;
+    } else {
+      usedBudget += file.size;
+    }
+    result.push({
+      ...file,
+      content: finalContent,
+      isSummarized
+    });
+  }
+  return result;
+}
+function loadContext(agentDir = ".agent") {
+  const systemContent = loadMarkdownDirectory(path7__default.join(agentDir, "system"));
+  const sopContent = loadMarkdownDirectory(path7__default.join(agentDir, "sop"));
+  const systemSize = Buffer.byteLength(systemContent, "utf-8");
+  const sopSize = Buffer.byteLength(sopContent, "utf-8");
+  const taskBudget = Math.max(0, CONTEXT_BUDGET_BYTES - systemSize - sopSize);
+  const tasks = loadTaskFiles(path7__default.join(agentDir, "tasks"), taskBudget);
+  const totalSize = systemSize + sopSize + tasks.reduce((sum, task) => sum + Buffer.byteLength(task.content, "utf-8"), 0);
+  const warnings = [];
+  if (totalSize > CONTEXT_BUDGET_BYTES) {
+    warnings.push(`Context size (${(totalSize / 1024).toFixed(1)}KB) exceeds budget (${CONTEXT_BUDGET_BYTES / 1024}KB)`);
+  }
+  return {
+    system: systemContent,
+    sop: sopContent,
+    tasks,
+    totalSize,
+    warnings
+  };
+}
+function formatContextStatus(pack) {
+  const taskCount = pack.tasks.length;
+  const summarizedCount = pack.tasks.filter((t) => t.isSummarized).length;
+  const sizeKB = (pack.totalSize / 1024).toFixed(1);
+  let status = `[x-cli] Context: loaded system docs, sop docs, ${taskCount} task docs (~${sizeKB} KB).`;
+  if (summarizedCount > 0) {
+    status += ` Summarized ${summarizedCount} older tasks for context budget.`;
+  }
+  if (pack.warnings.length > 0) {
+    status += ` Warnings: ${pack.warnings.join("; ")}`;
+  }
+  return status;
+}
 
 // src/index.ts
 dotenv.config();
@@ -19603,6 +19803,15 @@ program.name("grok").description(
     if (!options.quiet) {
       console.log("\u{1F916} Starting X CLI Conversational Assistant...\n");
     }
+    if (!options.quiet) {
+      try {
+        const contextPack = loadContext();
+        const statusMessage = formatContextStatus(contextPack);
+        console.log(statusMessage);
+      } catch (error) {
+        console.warn("\u26A0\uFE0F Failed to load .agent/ context:", error instanceof Error ? error.message : String(error));
+      }
+    }
     ensureUserSettingsDirectory();
     checkAutoCompact();
     checkStartupUpdates();