@tarcisiopgs/lisa 0.9.3 → 0.9.5

package/dist/index.js

@@ -2,7 +2,7 @@
 
 // src/cli.ts
 import { execSync as execSync4 } from "child_process";
-import { existsSync as existsSync6, readdirSync, readFileSync as readFileSync6 } from "fs";
+import { existsSync as existsSync7, readdirSync, readFileSync as readFileSync6 } from "fs";
 import { join as join8, resolve as resolvePath } from "path";
 import * as clack from "@clack/prompts";
 import { defineCommand, runMain } from "citty";
@@ -331,7 +331,7 @@ function banner() {
 }
 
 // src/loop.ts
-import { appendFileSync as appendFileSync6, readFileSync as readFileSync5, unlinkSync as unlinkSync4 } from "fs";
+import { appendFileSync as appendFileSync6, existsSync as existsSync6, readFileSync as readFileSync5, unlinkSync as unlinkSync4 } from "fs";
 import { join as join7, resolve as resolve5 } from "path";
 import { execa as execa3 } from "execa";
 
@@ -554,6 +554,96 @@ Do NOT update README.md for:
 If an update is needed, keep the existing README style and structure. Include the README change in the same commit as the implementation.
 `;
 }
+function buildWorktreeMultiRepoPrompt(issue, config2) {
+  const workspace = resolve3(config2.workspace);
+  const repoBlock = config2.repos.map((r) => {
+    const absPath = resolve3(workspace, r.path);
+    return [
+      `- **${r.name}**: \`${absPath}\``,
+      `  - Base branch: \`${r.base_branch}\``,
+      `  - Worktrees dir: \`${join(absPath, ".worktrees")}\``
+    ].join("\n");
+  }).join("\n\n");
+  const readmeBlock = buildReadmeInstructions();
+  const manifestPath = join(workspace, ".lisa-manifest.json");
+  return `You are an autonomous implementation agent working in a multi-repository workspace.
+Your job is to determine the correct repository, create an English-named branch, implement the issue, commit, and write a manifest file.
+
+You are in the workspace: \`${workspace}\`
+
+## Issue
+
+- **ID:** ${issue.id}
+- **Title:** ${issue.title}
+- **URL:** ${issue.url}
+
+### Description
+
+${issue.description}
+
+## Available Repositories
+
+${repoBlock}
+
+## Instructions
+
+1. **Identify the correct repository**: Read the issue title and description carefully.
+   Determine which single repository above is the right target. Consider:
+   - File paths or module names mentioned in the description
+   - Technologies and frameworks referenced
+   - The nature of the change (e.g., API endpoint \u2192 api repo, UI component \u2192 frontend repo)
+
+2. **Choose an English branch name**: Create a slug in English following:
+   \`feat/${issue.id.toLowerCase()}-short-english-description\`
+   The description part MUST be in English regardless of the issue title language.
+   Example: for "${issue.id} Implementar rate limiting na API" \u2192 \`feat/${issue.id.toLowerCase()}-add-rate-limiting-to-api\`
+
+3. **Set up the worktree**: In the chosen repo, run:
+   \`\`\`
+   git fetch origin <base_branch>
+   git worktree add -b <your-english-branch> <repoPath>/.worktrees/<your-english-branch> origin/<base_branch>
+   cd <repoPath>/.worktrees/<your-english-branch>
+   \`\`\`
+
+4. **Implement**: Work inside the worktree. Follow the issue description exactly:
+   - Read all relevant files listed in the description first (if present)
+   - Follow the implementation instructions exactly
+   - Verify each acceptance criteria (if present)
+   - Respect any stack or technical constraints (if present)
+${readmeBlock}
+5. **Validate**: Run the project's linter/typecheck/tests if available:
+   - Check \`package.json\` for lint, typecheck, check, or test scripts.
+   - Run whichever validation scripts exist (e.g., \`npm run lint\`, \`npm run typecheck\`, \`npm run test\`).
+   - Fix any errors before proceeding.
+
+6. **Commit (do NOT push)**: Make atomic commits with conventional commit messages.
+   Do NOT run \`git push\` \u2014 the caller handles pushing.
+   **IMPORTANT \u2014 Language rules:**
+   - All commit messages MUST be in English.
+   - Use conventional commits format: \`feat: ...\`, \`fix: ...\`, \`refactor: ...\`, \`chore: ...\`
+
+7. **Write the manifest**: After committing, create \`${manifestPath}\` with JSON:
+   \`\`\`json
+   {
+     "repoPath": "<absolute path to the chosen repo>",
+     "branch": "<your English branch name>",
+     "prTitle": "<PR title in English, conventional commit format>"
+   }
+   \`\`\`
+   Do NOT commit this file.
+
+## Rules
+
+- **ALL git commits, branch names, PR titles, and PR descriptions MUST be in English.**
+- The issue description may be in any language \u2014 read it for context but write all code artifacts in English.
+- Do NOT push \u2014 the caller handles that.
+- Do NOT create pull requests \u2014 the caller handles that.
+- Do NOT update the issue tracker \u2014 the caller handles that.
+- Do NOT install new dependencies unless the issue explicitly requires it.
+- If you get stuck or the issue is unclear, STOP and explain why.
+- One issue only. Do not pick up additional issues.
+- If the repo has a CLAUDE.md, read it first and follow its conventions.`;
+}
 function buildWorktreePrompt(issue, testRunner) {
   const testBlock = buildTestInstructions(testRunner ?? null);
   const readmeBlock = buildReadmeInstructions();
@@ -586,21 +676,26 @@ ${testBlock}${readmeBlock}
    - Run whichever validation scripts exist (e.g., \`npm run lint\`, \`npm run typecheck\`).
    - Fix any errors before proceeding.
 
-3. **Commit & Push**: Make atomic commits with conventional commit messages.
-   Push the branch to origin.
+3. **Commit**: Make atomic commits with conventional commit messages.
+   **Branch name must be in English.** The branch was pre-created with an auto-generated name.
+   If that name contains non-English words, rename it before committing:
+   \`git branch -m <current-name> feat/${issue.id.toLowerCase()}-short-english-slug\`
+   Do NOT push \u2014 the caller handles pushing.
    **IMPORTANT \u2014 Language rules:**
    - All commit messages MUST be in English.
    - Use conventional commits format: \`feat: ...\`, \`fix: ...\`, \`refactor: ...\`, \`chore: ...\`
 
-4. **PR Metadata**: Before finishing, create a file named \`.pr-title\` at the repository root
-   containing a single line with the PR title in **English** using conventional commit format
-   (e.g., \`feat: add user authentication\`, \`fix: resolve null pointer in login flow\`).
-   This file is used by the caller to create the pull request. Do NOT commit this file.
+4. **Write manifest**: Create \`.lisa-manifest.json\` in the **current directory** with JSON:
+   \`\`\`json
+   {"branch": "<final English branch name>", "prTitle": "<English PR title, conventional commit format>"}
+   \`\`\`
+   Do NOT commit this file.
 
 ## Rules
 
-- **ALL git commits, PR titles, and PR descriptions MUST be in English.**
+- **ALL git commits, branch names, PR titles, and PR descriptions MUST be in English.**
 - The issue description may be in any language \u2014 read it for context but write all code artifacts in English.
+- Do NOT push \u2014 the caller handles that.
 - Do NOT install new dependencies unless the issue explicitly requires it.
 - If you get stuck or the issue is unclear, STOP and explain why.
 - One issue only. Do not pick up additional issues.
@@ -616,6 +711,7 @@ function buildBranchPrompt(issue, config2, testRunner) {
   const baseBranchInstruction = config2.repos.length > 0 ? "From the repo's base branch (listed above)" : `From \`${config2.base_branch}\``;
   const testBlock = buildTestInstructions(testRunner ?? null);
   const readmeBlock = buildReadmeInstructions();
+  const manifestPath = join(workspace, ".lisa-manifest.json");
   return `You are an autonomous implementation agent. Your job is to implement a single
 issue, validate it, commit, and push the branch.
 
@@ -635,8 +731,10 @@ ${issue.description}
 ${repoEntries}
    - If it references multiple repos, pick the PRIMARY one (the one with the most files listed).
 
-2. **Create a branch**: ${baseBranchInstruction}, create a branch named after the issue
-   (e.g., \`feat/${issue.id.toLowerCase()}-short-description\`).
+2. **Create a branch**: ${baseBranchInstruction}, create a branch with an **English** slug:
+   \`feat/${issue.id.toLowerCase()}-short-english-description\`
+   The description MUST be in English \u2014 translate or summarize the issue title if it's in another language.
+   Example: "Implementar rate limiting na API" \u2192 \`feat/${issue.id.toLowerCase()}-add-rate-limiting-to-api\`
 
 3. **Implement**: Follow the issue description exactly:
    - Read all relevant files listed in the description first (if present)
@@ -655,10 +753,11 @@ ${testBlock}${readmeBlock}
    - All commit messages MUST be in English.
    - Use conventional commits format: \`feat: ...\`, \`fix: ...\`, \`refactor: ...\`, \`chore: ...\`
 
-6. **PR Metadata**: Before finishing, create a file named \`.pr-title\` at the repository root
-   containing a single line with the PR title in **English** using conventional commit format
-   (e.g., \`feat: add user authentication\`, \`fix: resolve null pointer in login flow\`).
-   This file is used by the caller to create the pull request. Do NOT commit this file.
+6. **Write manifest**: Before finishing, create \`${manifestPath}\` with JSON:
+   \`\`\`json
+   {"repoPath": "<absolute path to this repo>", "branch": "<branch name>", "prTitle": "<English PR title, conventional commit format>"}
+   \`\`\`
+   Do NOT commit this file.
 
 ## Rules
 
@@ -1677,6 +1776,22 @@ function cleanupPrTitle(cwd) {
   } catch {
   }
 }
+var MANIFEST_FILE = ".lisa-manifest.json";
+function readLisaManifest(dir) {
+  const manifestPath = join7(dir, MANIFEST_FILE);
+  if (!existsSync6(manifestPath)) return null;
+  try {
+    return JSON.parse(readFileSync5(manifestPath, "utf-8").trim());
+  } catch {
+    return null;
+  }
+}
+function cleanupManifest(dir) {
+  try {
+    unlinkSync4(join7(dir, MANIFEST_FILE));
+  } catch {
+  }
+}
 function installSignalHandlers() {
   const cleanup = async (signal) => {
     if (shuttingDown) {
@@ -1942,6 +2057,9 @@ async function runTestValidation(cwd) {
   }
 }
 async function runWorktreeSession(config2, issue, logFile, session, models) {
+  if (config2.repos.length > 1) {
+    return runWorktreeMultiRepoSession(config2, issue, logFile, session, models);
+  }
   const workspace = resolve5(config2.workspace);
   const repoPath = determineRepoPath(config2.repos, issue, workspace) ?? workspace;
   const defaultBranch = resolveBaseBranch(config2, repoPath);
@@ -2026,17 +2144,33 @@ ${result.output}
     await cleanupWorktree(repoPath, worktreePath);
     return { success: false, providerUsed: result.providerUsed, prUrls: [], fallback: result };
   }
+  const manifest = readLisaManifest(worktreePath);
+  let effectiveBranch = branchName;
+  if (manifest?.branch && manifest.branch !== branchName) {
+    log(`Renaming branch to English name: ${manifest.branch}`);
+    try {
+      await execa3("git", ["branch", "-m", branchName, manifest.branch], { cwd: worktreePath });
+      effectiveBranch = manifest.branch;
+      ok(`Branch renamed to ${effectiveBranch}`);
+    } catch (err) {
+      warn(
+        `Branch rename failed, using original: ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+  }
   try {
-    await execa3("git", ["push", "-u", "origin", branchName], { cwd: worktreePath });
+    await execa3("git", ["push", "-u", "origin", effectiveBranch], { cwd: worktreePath });
   } catch (err) {
     error(
       `Failed to push branch to remote: ${err instanceof Error ? err.message : String(err)}`
     );
+    cleanupManifest(worktreePath);
     await cleanupWorktree(repoPath, worktreePath);
     return { success: false, providerUsed: result.providerUsed, prUrls: [], fallback: result };
   }
-  const prTitle = readPrTitle(worktreePath) ?? issue.title;
+  const prTitle = manifest?.prTitle ?? readPrTitle(worktreePath) ?? issue.title;
   cleanupPrTitle(worktreePath);
+  cleanupManifest(worktreePath);
   const prUrls = [];
   try {
     const repoInfo = await getRepoInfo(worktreePath);
@@ -2044,7 +2178,7 @@ ${result.output}
       {
         owner: repoInfo.owner,
         repo: repoInfo.repo,
-        head: branchName,
+        head: effectiveBranch,
         base: defaultBranch,
         title: prTitle,
         body: buildPrBody(issue, result.providerUsed)
@@ -2060,8 +2194,98 @@ ${result.output}
   ok(`Session ${session} complete for ${issue.id}`);
   return { success: true, providerUsed: result.providerUsed, prUrls, fallback: result };
 }
+async function runWorktreeMultiRepoSession(config2, issue, logFile, session, models) {
+  const workspace = resolve5(config2.workspace);
+  cleanupManifest(workspace);
+  const prompt = buildWorktreeMultiRepoPrompt(issue, config2);
+  log(`Multi-repo worktree session for ${issue.id} (agent selects repo and branch name)`);
+  log(`Implementing (agent selects repo)... (log: ${logFile})`);
+  initLogFile(logFile);
+  const result = await runWithFallback(models, prompt, {
+    logFile,
+    cwd: workspace,
+    guardrailsDir: workspace,
+    issueId: issue.id,
+    overseer: config2.overseer
+  });
+  try {
+    appendFileSync6(
+      logFile,
+      `
+${"=".repeat(80)}
+Provider used: ${result.providerUsed}
+Full output:
+${result.output}
+`
+    );
+  } catch {
+  }
+  if (!result.success) {
+    error(`Session ${session} failed for ${issue.id}. Check ${logFile}`);
+    cleanupManifest(workspace);
+    return { success: false, providerUsed: result.providerUsed, prUrls: [], fallback: result };
+  }
+  const manifest = readLisaManifest(workspace);
+  if (!manifest?.repoPath || !manifest.branch) {
+    error(
+      `Agent did not produce a valid .lisa-manifest.json (requires repoPath + branch) for ${issue.id}. Aborting.`
+    );
+    cleanupManifest(workspace);
+    return { success: false, providerUsed: result.providerUsed, prUrls: [], fallback: result };
+  }
+  ok(`Provider chose repo: ${manifest.repoPath}, branch: ${manifest.branch}`);
+  const worktreePath = join7(manifest.repoPath, ".worktrees", manifest.branch);
+  const baseBranch = resolveBaseBranch(config2, manifest.repoPath);
+  const hasWorktree = existsSync6(worktreePath);
+  const effectiveCwd = hasWorktree ? worktreePath : manifest.repoPath;
+  if (!hasWorktree) {
+    warn(`Worktree not found at ${worktreePath} \u2014 using repo root for git operations`);
+  }
+  const testsPassed = await runTestValidation(effectiveCwd);
+  if (!testsPassed) {
+    error(`Tests failed for ${issue.id}. Blocking PR creation.`);
+    if (hasWorktree) await cleanupWorktree(manifest.repoPath, worktreePath);
+    cleanupManifest(workspace);
+    return { success: false, providerUsed: result.providerUsed, prUrls: [], fallback: result };
+  }
+  try {
+    await execa3("git", ["push", "-u", "origin", manifest.branch], { cwd: effectiveCwd });
+  } catch (err) {
+    error(
+      `Failed to push branch to remote: ${err instanceof Error ? err.message : String(err)}`
+    );
+    if (hasWorktree) await cleanupWorktree(manifest.repoPath, worktreePath);
+    cleanupManifest(workspace);
+    return { success: false, providerUsed: result.providerUsed, prUrls: [], fallback: result };
+  }
+  const prTitle = manifest.prTitle ?? issue.title;
+  const prUrls = [];
+  try {
+    const repoInfo = await getRepoInfo(effectiveCwd);
+    const pr = await createPullRequest(
+      {
+        owner: repoInfo.owner,
+        repo: repoInfo.repo,
+        head: manifest.branch,
+        base: baseBranch,
+        title: prTitle,
+        body: buildPrBody(issue, result.providerUsed)
+      },
+      config2.github
+    );
+    ok(`PR created: ${pr.html_url}`);
+    prUrls.push(pr.html_url);
+  } catch (err) {
+    error(`Failed to create PR: ${err instanceof Error ? err.message : String(err)}`);
+  }
+  cleanupManifest(workspace);
+  if (hasWorktree) await cleanupWorktree(manifest.repoPath, worktreePath);
+  ok(`Session ${session} complete for ${issue.id}`);
+  return { success: true, providerUsed: result.providerUsed, prUrls, fallback: result };
+}
 async function runBranchSession(config2, issue, logFile, session, models) {
   const workspace = resolve5(config2.workspace);
+  cleanupManifest(workspace);
   const testRunner = detectTestRunner(workspace);
   if (testRunner) {
     log(`Detected test runner: ${testRunner}`);
@@ -2118,20 +2342,27 @@ ${result.output}
   const testsPassed = await runTestValidation(workspace);
   if (!testsPassed) {
     error(`Tests failed for ${issue.id}. Blocking PR creation.`);
+    cleanupManifest(workspace);
     return { success: false, providerUsed: result.providerUsed, prUrls: [], fallback: result };
   }
-  const detected = await detectFeatureBranches(
-    config2.repos,
-    issue.id,
-    workspace,
-    config2.base_branch
-  );
+  const manifest = readLisaManifest(workspace);
+  let detected;
+  if (manifest?.repoPath && manifest.branch) {
+    ok(`Using manifest: repo=${manifest.repoPath}, branch=${manifest.branch}`);
+    detected = [{ repoPath: manifest.repoPath, branch: manifest.branch }];
+  } else {
+    if (manifest) {
+      warn(`Manifest found but missing repoPath or branch \u2014 falling back to detection`);
+    }
+    detected = await detectFeatureBranches(config2.repos, issue.id, workspace, config2.base_branch);
+  }
+  cleanupManifest(workspace);
   if (detected.length === 0) {
     error(`Could not detect feature branch for ${issue.id} \u2014 skipping PR creation`);
     ok(`Session ${session} complete for ${issue.id}`);
     return { success: true, providerUsed: result.providerUsed, prUrls: [], fallback: result };
   }
-  const prTitle = readPrTitle(workspace) ?? issue.title;
+  const prTitle = manifest?.prTitle ?? readPrTitle(workspace) ?? issue.title;
   cleanupPrTitle(workspace);
   const prUrls = [];
   for (const { repoPath, branch } of detected) {
@@ -2290,8 +2521,8 @@ var status = defineCommand({
     console.log(`  In progress: ${pc2.bold(config2.source_config.in_progress)}`);
     console.log(`  Done:        ${pc2.bold(config2.source_config.done)}`);
     console.log(`  Logs:        ${pc2.dim(config2.logs.dir)}`);
-    const { readdirSync: readdirSync2, existsSync: existsSync7 } = await import("fs");
-    if (existsSync7(config2.logs.dir)) {
+    const { readdirSync: readdirSync2, existsSync: existsSync8 } = await import("fs");
+    if (existsSync8(config2.logs.dir)) {
       const logs = readdirSync2(config2.logs.dir).filter((f) => f.endsWith(".log"));
       console.log(`
 ${pc2.cyan("Sessions:")} ${logs.length} log file(s) found`);
@@ -2526,12 +2757,12 @@ async function detectGitHubMethod() {
 }
 async function detectGitRepos() {
   const cwd = process.cwd();
-  if (existsSync6(join8(cwd, ".git"))) {
+  if (existsSync7(join8(cwd, ".git"))) {
     clack.log.info(`Detected git repository in current directory.`);
     return [];
   }
   const entries = readdirSync(cwd, { withFileTypes: true });
-  const gitDirs = entries.filter((e) => e.isDirectory() && existsSync6(join8(cwd, e.name, ".git"))).map((e) => e.name);
+  const gitDirs = entries.filter((e) => e.isDirectory() && existsSync7(join8(cwd, e.name, ".git"))).map((e) => e.name);
   if (gitDirs.length === 0) {
     return [];
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tarcisiopgs/lisa",
-	"version": "0.9.3",
+	"version": "0.9.5",
 	"description": "Deterministic autonomous issue resolver — structured AI agent loop for Linear/Trello",
 	"license": "MIT",
 	"type": "module",