@tradejs/cli 3.0.1 → 3.1.0

package/dist/scripts/agentRun.js

@@ -117,6 +117,7 @@ ${chunk}`, {
 var RESEARCH_AGENT_MODEL = "openai/gpt-5.4";
 var RESEARCH_AGENT_REASONING_EFFORT = "medium";
 var RESEARCH_AGENT_BRANCH_PREFIX = "codex/research";
+var RESEARCH_AGENT_DEFAULT_GITHUB_ORGANIZATION = "TradeJS-Dev";
 var buildResearchAgentBranchName = (strategy, runId) => {
   const normalizedStrategy = strategy.trim().replace(/([a-z0-9])([A-Z])/g, "$1-$2").replace(/[^a-zA-Z0-9-]+/g, "-").replace(/^-+|-+$/g, "").toLowerCase();
   const normalizedRunId = runId.trim().replace(/[^a-zA-Z0-9-]+/g, "-").replace(/^-+|-+$/g, "").toLowerCase();
@@ -124,8 +125,15 @@ var buildResearchAgentBranchName = (strategy, runId) => {
 };
 var buildResearchAgentCommitMessage = (strategy, runId) => `Research agent: ${strategy} follow-up for ${runId}`;
 var buildResearchAgentPrTitle = (strategy, runId) => `Research agent: ${strategy} follow-up for ${runId}`;
+var getResearchAgentRepositoryName = (strategy) => {
+  if (strategy === "TrendLine" || strategy === "ReverseTrendLine") {
+    return "TradeJS-Strategy-TrendLine";
+  }
+  return `TradeJS-Strategy-${strategy}`;
+};
+var getResearchAgentRepository = (strategy, organization = RESEARCH_AGENT_DEFAULT_GITHUB_ORGANIZATION) => `${organization}/${getResearchAgentRepositoryName(strategy)}`;
 var getResearchAgentAllowedPathPrefixes = (strategy) => [
-  `packages/strategies/src/${strategy}/`
+  `src/${strategy}/`
 ];
 var parseGithubRepositoryFromRemote = (value) => {
   const trimmed = value.trim();
@@ -179,7 +187,7 @@ var buildResearchAgentPrBody = (params) => {
   lines.push("");
   lines.push("## Notes");
   lines.push("- Created automatically by the TradeJS research agent.");
-  lines.push("- Base branch: `stable`.");
+  lines.push("- Base branch: `main`.");
   return lines.join("\n");
 };
 var normalizeDiffOutput = (value) => {
@@ -235,7 +243,7 @@ ${diffText}`)) {
 // src/scripts/agentRun.ts
 import_args.default.example(
   "yarn cli:node8g agent-run --runId 1710000000000-trendline --strategy TrendLine",
-  "Run the OpenRouter-based research follow-up coding agent in a git worktree"
+  "Run the OpenRouter-based research follow-up coding agent in a strategy repository"
 );
 import_args.default.option(["U", "user"], "Use user config", "root");
 import_args.default.option(["r", "runId"], "Research run id");
@@ -243,7 +251,7 @@ import_args.default.option(["s", "strategy"], "Strategy name");
 import_args.default.option("json", "Print structured JSON summary", false);
 var flags = import_args.default.parse(process.argv);
 var projectRoot = String(process.env.PROJECT_CWD || process.cwd()).trim() || process.cwd();
-var AGENT_SYSTEM_PROMPT = `You are a senior TypeScript trading research coding agent working inside the TradeJS monorepo.
+var AGENT_SYSTEM_PROMPT = `You are a senior TypeScript trading research coding agent working inside a standalone TradeJS strategy repository.
 
 Output ONLY one of:
 1. A unified git diff relative to repo root that can be applied with git apply.
@@ -333,13 +341,7 @@ var listFilesRecursive = async (targetPath) => {
   }
 };
 var collectStrategyContextFiles = async (worktreePath, strategy) => {
-  const strategyRoot = import_node_path.default.join(
-    worktreePath,
-    "packages",
-    "strategies",
-    "src",
-    strategy
-  );
+  const strategyRoot = import_node_path.default.join(worktreePath, "src", strategy);
   const strategyFiles = await listFilesRecursive(strategyRoot);
   const files = strategyFiles.filter(
     (filePath) => /\.(ts|tsx|md)$/.test(filePath)
@@ -489,14 +491,10 @@ var getChangedFilesFromGit = async (worktreePath) => {
 };
 var runValidationSuite = async (worktreePath, agentRun) => {
   const commands = [
-    ["prettify", ["yarn", "prettify"]],
-    ["typecheck", ["yarn", "typecheck"]],
-    ["unit", ["yarn", "unit"]]
+    ["checks", ["yarn", "checks"]]
   ];
   agentRun.validation = {
-    prettify: "pending",
-    typecheck: "pending",
-    unit: "pending"
+    checks: "pending"
   };
   for (const [key, command] of commands) {
     const result = await runCommand(command[0], command.slice(1), {
@@ -605,9 +603,6 @@ var saveAgentRun = async (userName, runId, strategy, agentRun) => {
   });
 };
 var resolveGithubRepository = async (worktreePath) => {
-  if (process.env.AGENT_GITHUB_REPOSITORY?.trim()) {
-    return process.env.AGENT_GITHUB_REPOSITORY.trim();
-  }
   const remote = await runCommandOrThrow(
     "git",
     ["-C", worktreePath, "remote", "get-url", "origin"],
@@ -629,7 +624,7 @@ var createGithubPullRequest = async (params) => {
   if (!owner || !repo) {
     throw new Error(`Invalid GitHub repository value: ${repository}`);
   }
-  const baseBranch = process.env.AGENT_GITHUB_BASE_BRANCH?.trim() || "stable";
+  const baseBranch = process.env.AGENT_GITHUB_BASE_BRANCH?.trim() || "main";
   const head = `${owner}:${params.branchName}`;
   const headers = {
     Authorization: `Bearer ${token}`,
@@ -683,31 +678,34 @@ var createGithubPullRequest = async (params) => {
     reused: false
   };
 };
-var createWorktree = async (branchName) => {
-  const worktreeToken = branchName.replace(/[/:]+/g, "--");
-  const worktreeRoot = import_node_path.default.join(projectRoot, ".agent-worktrees");
-  const worktreePath = import_node_path.default.join(worktreeRoot, worktreeToken);
-  await import_promises.default.mkdir(worktreeRoot, { recursive: true });
-  await runCommand("git", ["worktree", "remove", "--force", worktreePath], {
-    cwd: projectRoot
-  });
-  await runCommandOrThrow("git", ["fetch", "origin", "stable"], {
-    cwd: projectRoot
-  });
+var createStrategyCheckout = async (strategy, branchName) => {
+  const organization = process.env.AGENT_GITHUB_ORGANIZATION?.trim() || "TradeJS-Dev";
+  const repository = getResearchAgentRepository(strategy, organization);
+  const baseBranch = process.env.AGENT_GITHUB_BASE_BRANCH?.trim() || "main";
+  const checkoutRoot = await import_promises.default.mkdtemp(
+    import_node_path.default.join(import_node_os.default.tmpdir(), "tradejs-strategy-agent-")
+  );
+  const checkoutPath = import_node_path.default.join(checkoutRoot, "repository");
   await runCommandOrThrow(
     "git",
-    ["worktree", "add", "-B", branchName, worktreePath, "origin/stable"],
-    {
-      cwd: projectRoot
-    }
+    [
+      "clone",
+      "--branch",
+      baseBranch,
+      "--single-branch",
+      `git@github.com:${repository}.git`,
+      checkoutPath
+    ],
+    { cwd: checkoutRoot }
   );
-  return worktreePath;
-};
-var cleanupWorktree = async (worktreePath) => {
-  await runCommand("git", ["worktree", "remove", "--force", worktreePath], {
-    cwd: projectRoot
-  });
+  await runCommandOrThrow(
+    "git",
+    ["-C", checkoutPath, "switch", "-c", branchName],
+    { cwd: checkoutPath }
+  );
+  return { checkoutPath, checkoutRoot, repository };
 };
+var cleanupStrategyCheckout = async (checkoutRoot) => import_promises.default.rm(checkoutRoot, { recursive: true, force: true });
 var main = async () => {
   const userName = String(flags.user || "root").trim() || "root";
   const requestedRunId = String(flags.runId || "").trim();
@@ -733,10 +731,17 @@ var main = async () => {
     summary: "Awaiting model patch",
     startedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
+  let checkoutRoot = "";
   let worktreePath = "";
   await saveAgentRun(userName, run.runId, run.strategy, agentRun);
   try {
-    worktreePath = await createWorktree(branchName);
+    const checkout = await createStrategyCheckout(run.strategy, branchName);
+    checkoutRoot = checkout.checkoutRoot;
+    worktreePath = checkout.checkoutPath;
+    agentRun.repository = checkout.repository;
+    await runCommandOrThrow("yarn", ["install", "--immutable"], {
+      cwd: worktreePath
+    });
     const userPrompt = await buildPrompt(worktreePath, run, allowedPrefixes);
     const messages = [
       { role: "system", content: AGENT_SYSTEM_PROMPT },
@@ -888,8 +893,8 @@ Return a corrected unified diff only. Keep the same allowed paths.`
     }
     process.exit(1);
   } finally {
-    if (worktreePath) {
-      await cleanupWorktree(worktreePath);
+    if (checkoutRoot) {
+      await cleanupStrategyCheckout(checkoutRoot);
     }
   }
 };