@tradejs/cli 3.0.1 → 3.1.1

package/dist/scripts/agentRun.js

@@ -37,7 +37,7 @@ var import_args = __toESM(require("args"));
 var import_chalk = __toESM(require("chalk"));
 var import_promises = __toESM(require("fs/promises"));
 var import_node_os = __toESM(require("os"));
-var import_node_path = __toESM(require("path"));
+var import_node_path2 = __toESM(require("path"));
 var import_node_child_process = require("child_process");
 var import_constants = require("@tradejs/core/constants");
 var import_aiEndpoints = require("@tradejs/core/aiEndpoints");
@@ -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) => {
@@ -232,18 +240,38 @@ ${diffText}`)) {
   return changedFiles;
 };
 
+// src/lib/researchRoots.ts
+var import_node_path = __toESM(require("path"));
+var SOURCE_REPOSITORY_ROOT_ENV = "TRADEJS_SOURCE_REPOSITORY_ROOT";
+var firstNonEmpty = (...values) => values.map((value) => String(value || "").trim()).find(Boolean);
+var resolveResearchRoots = (options = {}) => {
+  const cwd = import_node_path.default.resolve(options.cwd || process.cwd());
+  const env = options.env || process.env;
+  const projectRoot2 = import_node_path.default.resolve(
+    firstNonEmpty(options.projectRoot, env.PROJECT_CWD, cwd) || cwd
+  );
+  const sourceRepositoryRoot = import_node_path.default.resolve(
+    firstNonEmpty(
+      options.sourceRepositoryRoot,
+      env[SOURCE_REPOSITORY_ROOT_ENV],
+      cwd
+    ) || cwd
+  );
+  return { projectRoot: projectRoot2, sourceRepositoryRoot };
+};
+
 // 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");
 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 { projectRoot } = resolveResearchRoots();
+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.
@@ -320,7 +348,7 @@ var listFilesRecursive = async (targetPath) => {
     const entries = await import_promises.default.readdir(targetPath, { withFileTypes: true });
     const nested = await Promise.all(
       entries.map(async (entry) => {
-        const absolutePath = import_node_path.default.join(targetPath, entry.name);
+        const absolutePath = import_node_path2.default.join(targetPath, entry.name);
         if (entry.isDirectory()) {
           return listFilesRecursive(absolutePath);
         }
@@ -333,13 +361,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_path2.default.join(worktreePath, "src", strategy);
   const strategyFiles = await listFilesRecursive(strategyRoot);
   const files = strategyFiles.filter(
     (filePath) => /\.(ts|tsx|md)$/.test(filePath)
@@ -347,7 +369,7 @@ var collectStrategyContextFiles = async (worktreePath, strategy) => {
   return [...new Set(files)].sort((left, right) => left.localeCompare(right));
 };
 var renderFileContext = async (worktreePath, filePath) => {
-  const relativePath = import_node_path.default.relative(worktreePath, filePath).replace(/\\/g, "/");
+  const relativePath = import_node_path2.default.relative(worktreePath, filePath).replace(/\\/g, "/");
   const content = await import_promises.default.readFile(filePath, "utf8");
   return [
     `=== FILE: ${relativePath} ===`,
@@ -459,8 +481,8 @@ var requestAgentDiff = async (userName, messages) => {
   return normalized;
 };
 var applyDiff = async (worktreePath, diffText) => {
-  const tempDir = await import_promises.default.mkdtemp(import_node_path.default.join(import_node_os.default.tmpdir(), "tradejs-agent-"));
-  const patchPath = import_node_path.default.join(tempDir, "agent.patch");
+  const tempDir = await import_promises.default.mkdtemp(import_node_path2.default.join(import_node_os.default.tmpdir(), "tradejs-agent-"));
+  const patchPath = import_node_path2.default.join(tempDir, "agent.patch");
   try {
     await import_promises.default.writeFile(patchPath, diffText, "utf8");
     await runCommandOrThrow(
@@ -489,20 +511,17 @@ 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), {
       cwd: worktreePath,
       env: {
-        PROJECT_CWD: worktreePath,
+        PROJECT_CWD: projectRoot,
+        [SOURCE_REPOSITORY_ROOT_ENV]: worktreePath,
         DOTENV_CONFIG_PATH: process.env.DOTENV_CONFIG_PATH
       }
     });
@@ -605,9 +624,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 +645,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 +699,39 @@ 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 checkoutBase = import_node_path2.default.join(
+    projectRoot,
+    "data",
+    "cache",
+    "research-agent-checkouts"
+  );
+  await import_promises.default.mkdir(checkoutBase, { recursive: true });
+  const checkoutRoot = await import_promises.default.mkdtemp(import_node_path2.default.join(checkoutBase, "strategy-"));
+  const checkoutPath = import_node_path2.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 +757,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 +919,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);
     }
   }
 };