@xagent/x-cli 1.1.100 → 1.1.101

package/README.md

@@ -1,4 +1,4 @@
-## 1.1.100 – Logo Assets & NPM Publication Complete
+## 1.1.101 – Logo Assets & NPM Publication Complete
 
 ✅ **Live on NPM**: [@xagent/one-shot](https://www.npmjs.com/package/@xagent/one-shot) - Fully published and ready for global installation
 

package/dist/index.js

@@ -18638,7 +18638,7 @@ var init_package = __esm({
     package_default = {
       type: "module",
       name: "@xagent/one-shot",
-      version: "1.1.100",
+      version: "1.1.101",
       description: "An open-source AI agent that brings advanced AI capabilities directly into your terminal with automatic documentation updates.",
       main: "dist/index.js",
       module: "dist/index.js",
@@ -20682,514 +20682,23 @@ ${pushResult.error || "Git push failed"}
       setChatHistory((prev) => [...prev, userEntry]);
       setIsProcessing(true);
       try {
-        const branchResult = await agent.executeBashCommand("git branch --show-current");
-        const currentBranch = branchResult.output?.trim() || "unknown";
-        const qualityCheckEntry = {
-          type: "assistant",
-          content: "\u{1F50D} **Running pre-push quality checks...**",
-          timestamp: /* @__PURE__ */ new Date()
-        };
-        setChatHistory((prev) => [...prev, qualityCheckEntry]);
-        const tsCheckEntry = {
-          type: "assistant",
-          content: "\u{1F4DD} Checking TypeScript...",
-          timestamp: /* @__PURE__ */ new Date()
-        };
-        setChatHistory((prev) => [...prev, tsCheckEntry]);
-        const tsResult = await agent.executeBashCommand("npm run typecheck");
-        if (tsResult.success) {
-          const tsSuccessEntry = {
-            type: "tool_result",
-            content: "\u2705 TypeScript check passed",
-            timestamp: /* @__PURE__ */ new Date(),
-            toolCall: {
-              id: `ts_check_${Date.now()}`,
-              type: "function",
-              function: {
-                name: "bash",
-                arguments: JSON.stringify({ command: "npm run typecheck" })
-              }
-            },
-            toolResult: tsResult
-          };
-          setChatHistory((prev) => [...prev, tsSuccessEntry]);
-        } else {
-          const tsFailEntry = {
-            type: "assistant",
-            content: `\u274C **TypeScript check failed**
-
-${tsResult.error || tsResult.output}`,
-            timestamp: /* @__PURE__ */ new Date()
-          };
-          setChatHistory((prev) => [...prev, tsFailEntry]);
-          setIsProcessing(false);
-          clearInput();
-          return true;
-        }
-        const lintCheckEntry = {
-          type: "assistant",
-          content: "\u{1F9F9} Running ESLint...",
-          timestamp: /* @__PURE__ */ new Date()
-        };
-        setChatHistory((prev) => [...prev, lintCheckEntry]);
-        const lintResult = await agent.executeBashCommand("npm run lint");
-        const lintSuccessEntry = {
-          type: "tool_result",
-          content: "\u2705 ESLint check completed (warnings allowed)",
-          timestamp: /* @__PURE__ */ new Date(),
-          toolCall: {
-            id: `lint_check_${Date.now()}`,
-            type: "function",
-            function: {
-              name: "bash",
-              arguments: JSON.stringify({ command: "npm run lint" })
-            }
-          },
-          toolResult: lintResult
-        };
-        setChatHistory((prev) => [...prev, lintSuccessEntry]);
-        const statusResult = await agent.executeBashCommand("git status --porcelain");
-        if (!statusResult.success) {
-          const errorEntry = {
-            type: "assistant",
-            content: "\u274C **Git Error**\n\nUnable to check git status. Are you in a git repository?",
-            timestamp: /* @__PURE__ */ new Date()
-          };
-          setChatHistory((prev) => [...prev, errorEntry]);
-          setIsProcessing(false);
-          clearInput();
-          return true;
-        }
-        if (!statusResult.output || statusResult.output.trim() === "") {
-          const noChangesEntry = {
-            type: "assistant",
-            content: "\u{1F4CB} **No Changes to Push**\n\nWorking directory is clean. No commits to push.",
-            timestamp: /* @__PURE__ */ new Date()
-          };
-          setChatHistory((prev) => [...prev, noChangesEntry]);
-          setIsProcessing(false);
-          clearInput();
-          return true;
-        }
-        const prePullAddResult = await agent.executeBashCommand("git add .");
-        if (!prePullAddResult.success) {
-          const errorEntry = {
-            type: "assistant",
-            content: `\u274C **Failed to stage changes**
-
-${prePullAddResult.error || "Unknown error"}`,
-            timestamp: /* @__PURE__ */ new Date()
-          };
-          setChatHistory((prev) => [...prev, errorEntry]);
-          setIsProcessing(false);
-          clearInput();
-          return true;
-        }
-        const stashResult = await agent.executeBashCommand("git stash push --include-untracked --message 'smart-push temporary stash'");
-        if (!stashResult.success) {
-          const errorEntry = {
-            type: "assistant",
-            content: `\u274C **Failed to stash changes**
-
-${stashResult.error || "Unknown error"}`,
-            timestamp: /* @__PURE__ */ new Date()
-          };
-          setChatHistory((prev) => [...prev, errorEntry]);
-          setIsProcessing(false);
-          clearInput();
-          return true;
-        }
-        const pullEntry = {
-          type: "assistant",
-          content: "\u{1F504} Pulling latest changes...",
-          timestamp: /* @__PURE__ */ new Date()
-        };
-        setChatHistory((prev) => [...prev, pullEntry]);
-        const rebaseCheck = await agent.executeBashCommand("test -d .git/rebase-apply -o -d .git/rebase-merge -o -f .git/MERGE_HEAD && echo 'ongoing' || echo 'clean'");
-        if (rebaseCheck.output?.includes("ongoing")) {
-          const cleanupEntry = {
-            type: "assistant",
-            content: "\u26A0\uFE0F Git operation in progress - cleaning up...",
-            timestamp: /* @__PURE__ */ new Date()
-          };
-          setChatHistory((prev) => [...prev, cleanupEntry]);
-          await agent.executeBashCommand("git rebase --abort 2>/dev/null || git merge --abort 2>/dev/null || true");
-        }
-        let pullResult = await agent.executeBashCommand(`git pull --rebase origin ${currentBranch}`);
-        if (!pullResult.success) {
-          pullResult = await agent.executeBashCommand(`git pull origin ${currentBranch}`);
-          if (pullResult.success) {
-            const mergeFallbackEntry = {
-              type: "assistant",
-              content: "\u26A0\uFE0F Rebase failed, fell back to merge",
-              timestamp: /* @__PURE__ */ new Date()
-            };
-            setChatHistory((prev) => [...prev, mergeFallbackEntry]);
-          }
-        }
-        if (pullResult.success) {
-          const pullSuccessEntry = {
-            type: "tool_result",
-            content: pullResult.output?.includes("Successfully rebased") ? "\u2705 Successfully rebased local changes" : "\u2705 Successfully pulled latest changes",
-            timestamp: /* @__PURE__ */ new Date()
-          };
-          setChatHistory((prev) => [...prev, pullSuccessEntry]);
-          const popStashResult = await agent.executeBashCommand("git stash pop");
-          if (!popStashResult.success) {
-            const errorEntry = {
-              type: "assistant",
-              content: `\u26A0\uFE0F **Failed to restore stashed changes**
-
-${popStashResult.error || "Unknown error"}
-
-\u{1F4A1} Your changes may be lost. Check git stash list.`,
-              timestamp: /* @__PURE__ */ new Date()
-            };
-            setChatHistory((prev) => [...prev, errorEntry]);
-            setIsProcessing(false);
-            clearInput();
-            return true;
-          } else {
-            const popSuccessEntry = {
-              type: "tool_result",
-              content: "\u2705 Changes restored from stash",
-              timestamp: /* @__PURE__ */ new Date()
-            };
-            setChatHistory((prev) => [...prev, popSuccessEntry]);
-          }
-        } else {
-          const pullFailEntry = {
-            type: "assistant",
-            content: `\u274C **Pull failed**
-
-${pullResult.error || pullResult.output}
-
-\u{1F4A1} Check git status and resolve any conflicts`,
-            timestamp: /* @__PURE__ */ new Date()
-          };
-          setChatHistory((prev) => [...prev, pullFailEntry]);
-          setIsProcessing(false);
-          clearInput();
-          return true;
-        }
-        const addResult = await agent.executeBashCommand("git add .");
-        if (!addResult.success) {
-          const errorEntry = {
-            type: "assistant",
-            content: `\u274C **Failed to stage changes**
-
-${addResult.error || "Unknown error"}`,
-            timestamp: /* @__PURE__ */ new Date()
-          };
-          setChatHistory((prev) => [...prev, errorEntry]);
-          setIsProcessing(false);
-          clearInput();
-          return true;
-        }
-        const addEntry = {
-          type: "tool_result",
-          content: "\u2705 Changes staged successfully",
-          timestamp: /* @__PURE__ */ new Date(),
-          toolCall: {
-            id: `git_add_${Date.now()}`,
-            type: "function",
-            function: {
-              name: "bash",
-              arguments: JSON.stringify({ command: "git add ." })
-            }
-          },
-          toolResult: addResult
-        };
-        setChatHistory((prev) => [...prev, addEntry]);
-        const diffResult = await agent.executeBashCommand("git diff --cached");
-        const maxDiffLength = 5e4;
-        const truncatedDiff = diffResult.output ? diffResult.output.length > maxDiffLength ? diffResult.output.substring(0, maxDiffLength) + "\n... (truncated due to length)" : diffResult.output : "No staged changes shown";
-        const commitPrompt = `Generate a concise, professional git commit message for these changes:
-
-Git Status:
-${statusResult.output}
-
-Git Diff (staged changes):
-${truncatedDiff}
-
-Follow conventional commit format (feat:, fix:, docs:, etc.) and keep it under 72 characters.
-Respond with ONLY the commit message, no additional text.`;
-        let commitMessage = "";
-        let streamingEntry = null;
-        let accumulatedCommitContent = "";
-        let lastCommitUpdateTime = Date.now();
-        try {
-          for await (const chunk of agent.processUserMessageStream(commitPrompt)) {
-            if (chunk.type === "content" && chunk.content) {
-              accumulatedCommitContent += chunk.content;
-              const now = Date.now();
-              if (now - lastCommitUpdateTime >= 150) {
-                commitMessage += accumulatedCommitContent;
-                if (!streamingEntry) {
-                  const newEntry = {
-                    type: "assistant",
-                    content: `\u{1F916} Generating commit message...
-
-${commitMessage}`,
-                    timestamp: /* @__PURE__ */ new Date(),
-                    isStreaming: true
-                  };
-                  setChatHistory((prev) => [...prev, newEntry]);
-                  streamingEntry = newEntry;
-                } else {
-                  setChatHistory(
-                    (prev) => prev.map(
-                      (entry, idx) => idx === prev.length - 1 && entry.isStreaming ? {
-                        ...entry,
-                        content: `\u{1F916} Generating commit message...
-
-${commitMessage}`
-                      } : entry
-                    )
-                  );
-                }
-                accumulatedCommitContent = "";
-                lastCommitUpdateTime = now;
-              }
-            } else if (chunk.type === "done") {
-              if (streamingEntry) {
-                setChatHistory(
-                  (prev) => prev.map(
-                    (entry) => entry.isStreaming ? {
-                      ...entry,
-                      content: `\u2705 Generated commit message: "${commitMessage.trim()}"`,
-                      isStreaming: false
-                    } : entry
-                  )
-                );
-              }
-              break;
-            }
-          }
-        } catch (error) {
-          commitMessage = "feat: update files";
-          const errorEntry = {
-            type: "assistant",
-            content: `\u26A0\uFE0F **AI commit message generation failed**: ${error.message}
-
-Using fallback message: "${commitMessage}"`,
-            timestamp: /* @__PURE__ */ new Date()
-          };
-          setChatHistory((prev) => [...prev, errorEntry]);
-          if (streamingEntry) {
-            setChatHistory(
-              (prev) => prev.map(
-                (entry) => entry.isStreaming ? { ...entry, isStreaming: false } : entry
-              )
-            );
-          }
-        }
-        const cleanCommitMessage = commitMessage.trim().replace(/^["']|["']$/g, "");
-        const commitCommand = `git commit -m "${cleanCommitMessage}"`;
-        const commitResult = await agent.executeBashCommand(commitCommand);
-        const commitEntry = {
+        const result = await agent.executeBashCommand("npm run smart-push");
+        const resultEntry = {
           type: "tool_result",
-          content: commitResult.success ? `\u2705 **Commit Created**: ${commitResult.output?.split("\n")[0] || "Commit successful"}` : `\u274C **Commit Failed**: ${commitResult.error || "Unknown error"}`,
+          content: result.success ? "\u{1F389} Smart Push Completed Successfully!" : `\u274C Smart Push Failed: ${result.error}`,
           timestamp: /* @__PURE__ */ new Date(),
           toolCall: {
-            id: `git_commit_${Date.now()}`,
+            id: `smart_push_${Date.now()}`,
             type: "function",
-            function: {
-              name: "bash",
-              arguments: JSON.stringify({ command: commitCommand })
-            }
+            function: { name: "bash", arguments: JSON.stringify({ command: "npm run smart-push" }) }
           },
-          toolResult: commitResult
+          toolResult: result
         };
-        setChatHistory((prev) => [...prev, commitEntry]);
-        if (commitResult.success) {
-          const pushResult = await agent.executeBashCommand("git push");
-          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]);
-            const verificationEntry = {
-              type: "assistant",
-              content: "\u{1F50D} **Running post-push verification...**",
-              timestamp: /* @__PURE__ */ new Date()
-            };
-            setChatHistory((prev) => [...prev, verificationEntry]);
-            const statusCheckResult = await agent.executeBashCommand("git status --porcelain");
-            if (statusCheckResult.success && statusCheckResult.output?.trim() === "") {
-              const statusOkEntry = {
-                type: "tool_result",
-                content: "\u2705 **Git Status**: Working directory clean",
-                timestamp: /* @__PURE__ */ new Date()
-              };
-              setChatHistory((prev) => [...prev, statusOkEntry]);
-            } else {
-              const statusIssueEntry = {
-                type: "assistant",
-                content: `\u26A0\uFE0F **Git Status Issues Detected**:
-
-${statusCheckResult.output || "Unknown status"}`,
-                timestamp: /* @__PURE__ */ new Date()
-              };
-              setChatHistory((prev) => [...prev, statusIssueEntry]);
-            }
-            const waitEntry = {
-              type: "assistant",
-              content: "\u23F3 **Waiting for CI/NPM publishing...** (10 seconds)",
-              timestamp: /* @__PURE__ */ new Date()
-            };
-            setChatHistory((prev) => [...prev, waitEntry]);
-            await new Promise((resolve8) => setTimeout(resolve8, 1e4));
-            const localPackageResult = await agent.executeBashCommand(`node -p "require('./package.json').name" 2>/dev/null || echo 'no-package'`);
-            const localName = localPackageResult.success && localPackageResult.output?.trim() !== "no-package" ? localPackageResult.output?.trim() : null;
-            if (localName) {
-              const localVersionResult = await agent.executeBashCommand(`node -p "require('./package.json').version"`);
-              const localVersion = localVersionResult.success ? localVersionResult.output?.trim() : "unknown";
-              const npmCheckResult = await agent.executeBashCommand(`npm view ${localName} version 2>/dev/null || echo 'not-found'`);
-              if (npmCheckResult.success && npmCheckResult.output?.trim() && npmCheckResult.output?.trim() !== "not-found") {
-                const npmVersion = npmCheckResult.output.trim();
-                if (npmVersion === localVersion) {
-                  const npmConfirmEntry = {
-                    type: "tool_result",
-                    content: `\u2705 **NPM Package Confirmed**: ${localName} v${npmVersion} published successfully`,
-                    timestamp: /* @__PURE__ */ new Date()
-                  };
-                  setChatHistory((prev) => [...prev, npmConfirmEntry]);
-                } else {
-                  const npmPendingEntry = {
-                    type: "assistant",
-                    content: `\u23F3 **NPM Status**: Local ${localName} v${localVersion}, NPM v${npmVersion}. Publishing may still be in progress.`,
-                    timestamp: /* @__PURE__ */ new Date()
-                  };
-                  setChatHistory((prev) => [...prev, npmPendingEntry]);
-                }
-              } else {
-                const npmSkipEntry = {
-                  type: "assistant",
-                  content: `\u2139\uFE0F **NPM Check Skipped**: Package ${localName} not found on NPM (may not be published yet)`,
-                  timestamp: /* @__PURE__ */ new Date()
-                };
-                setChatHistory((prev) => [...prev, npmSkipEntry]);
-              }
-            } else {
-              const npmSkipEntry = {
-                type: "assistant",
-                content: `\u2139\uFE0F **NPM Check Skipped**: No package.json found or not an NPM package`,
-                timestamp: /* @__PURE__ */ new Date()
-              };
-              setChatHistory((prev) => [...prev, npmSkipEntry]);
-            }
-            const finalSuccessEntry = {
-              type: "assistant",
-              content: "\u{1F389} **Smart Push Complete**: All verifications passed!",
-              timestamp: /* @__PURE__ */ new Date()
-            };
-            setChatHistory((prev) => [...prev, finalSuccessEntry]);
-          } 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 ${currentBranch}`);
-                  if (prResult.success) {
-                    const prUrl = prResult.output?.match(/https:\/\/github\.com\/[^\s]+/)?.[0];
-                    const prSuccessEntry = {
-                      type: "tool_result",
-                      content: `\u2705 **Pull Request Created Successfully!**
-
-\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 \`${currentBranch}\`
-\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]);
-              }
-            } 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]);
-            }
-          }
-        }
+        setChatHistory((prev) => [...prev, resultEntry]);
       } catch (error) {
         const errorEntry = {
           type: "assistant",
-          content: `\u274C **Smart Push Failed**
-
-${error instanceof Error ? error.message : String(error)}`,
+          content: `\u274C Smart Push Failed: ${error instanceof Error ? error.message : String(error)}`,
           timestamp: /* @__PURE__ */ new Date()
         };
         setChatHistory((prev) => [...prev, errorEntry]);
@@ -24529,7 +24038,7 @@ var require_package = __commonJS({
     module.exports = {
       type: "module",
       name: "@xagent/one-shot",
-      version: "1.1.100",
+      version: "1.1.101",
       description: "An open-source AI agent that brings advanced AI capabilities directly into your terminal with automatic documentation updates.",
       main: "dist/index.js",
       module: "dist/index.js",