bosun 0.41.7 → 0.41.9

package/workflow/workflow-templates.mjs

@@ -1422,8 +1422,3 @@ export function installRecommendedTemplates(engine, overridesById = {}) {
     .map((template) => template.id);
   return installTemplateSet(engine, recommendedIds, overridesById);
 }
-
-
-
-
-

package/workflow-templates/github.mjs

@@ -1622,6 +1622,8 @@ export const GITHUB_KANBAN_SYNC_TEMPLATE = {
     node("fetch-pr-state", "action.run_command", "Fetch Bosun PR State", {
       command: [
         "node -e \"",
+        "const fs=require('fs');",
+        "const path=require('path');",
         "const {execFileSync}=require('child_process');",
         "const hours=Number('{{lookbackHours}}')||24;",
         "const repoScope=String('{{repoScope}}'||'auto').trim();",
@@ -1630,18 +1632,79 @@ export const GITHUB_KANBAN_SYNC_TEMPLATE = {
         "  try{const o=execFileSync('gh',args,{encoding:'utf8',stdio:['pipe','pipe','pipe']}).trim();return o?JSON.parse(o):[];}",
         "  catch{return [];}",
         "}",
-        "const merged=ghJson(['pr','list','--state','merged','--label','bosun-attached','--json','number,title,body,headRefName,mergedAt','--limit','50']);",
-        "const open=ghJson(['pr','list','--state','open','--label','bosun-attached','--json','number,title,body,headRefName,isDraft','--limit','50']);",
+        "function configPath(){",
+        "  const home=String(process.env.BOSUN_HOME||process.env.VK_PROJECT_DIR||'').trim();",
+        "  return home?path.join(home,'bosun.config.json'):path.join(process.cwd(),'bosun.config.json');",
+        "}",
+        "function collectReposFromConfig(){",
+        "  const repos=[];",
+        "  try{",
+        "    const cfg=JSON.parse(fs.readFileSync(configPath(),'utf8'));",
+        "    const workspaces=Array.isArray(cfg?.workspaces)?cfg.workspaces:[];",
+        "    if(workspaces.length>0){",
+        "      const active=String(cfg?.activeWorkspace||'').trim().toLowerCase();",
+        "      const activeWs=active?workspaces.find(w=>String(w?.id||'').trim().toLowerCase()===active):null;",
+        "      const wsList=activeWs?[activeWs]:workspaces;",
+        "      for(const ws of wsList){",
+        "        for(const repo of (Array.isArray(ws?.repos)?ws.repos:[])){",
+        "          const slug=typeof repo==='string'?String(repo).trim():String(repo?.slug||'').trim();",
+        "          if(slug) repos.push(slug);",
+        "        }",
+        "      }",
+        "    }",
+        "    if(repos.length===0){",
+        "      for(const repo of (Array.isArray(cfg?.repos)?cfg.repos:[])){",
+        "        const slug=typeof repo==='string'?String(repo).trim():String(repo?.slug||'').trim();",
+        "        if(slug) repos.push(slug);",
+        "      }",
+        "    }",
+        "  }catch{}",
+        "  return repos;",
+        "}",
+        "function resolveRepoTargets(){",
+        "  if(repoScope&&repoScope!=='auto'&&repoScope!=='all'&&repoScope!=='current'){",
+        "    return [...new Set(repoScope.split(',').map(v=>v.trim()).filter(Boolean))];",
+        "  }",
+        "  if(repoScope==='current') return [''];",
+        "  const fromConfig=collectReposFromConfig();",
+        "  if(fromConfig.length>0) return [...new Set(fromConfig)];",
+        "  const envRepo=String(process.env.GITHUB_REPOSITORY||'').trim();",
+        "  if(envRepo) return [envRepo];",
+        "  return [''];",
+        "}",
+        "function parseRepoFromUrl(url){",
+        "  const raw=String(url||'');",
+        "  const marker='github.com/';",
+        "  const idx=raw.toLowerCase().indexOf(marker);",
+        "  if(idx<0) return '';",
+        "  const tail=raw.slice(idx+marker.length).split('/');",
+        "  if(tail.length<2) return '';",
+        "  const owner=String(tail[0]||'').trim();",
+        "  const repo=String(tail[1]||'').trim();",
+        "  return owner&&repo?(owner+'/'+repo):'';",
+        "}",
         "function extractTaskId(pr){",
         "  const src=String((pr.body||'')+'\\n'+(pr.title||''));",
         "  const m=src.match(/(?:Bosun-Task|VE-Task|Task-ID|task[_-]?id)[:\\s]+([a-zA-Z0-9_-]{4,64})/i);",
         "  return m?m[1].trim():null;",
         "}",
+        "const repoTargets=resolveRepoTargets();",
+        "const merged=[];",
+        "const open=[];",
+        "for(const target of repoTargets){",
+        "  const repo=String(target||'').trim();",
+        "  const mergedArgs=['pr','list','--state','merged','--label','bosun-attached','--json','number,title,body,headRefName,mergedAt,url','--limit','50'];",
+        "  const openArgs=['pr','list','--state','open','--label','bosun-attached','--json','number,title,body,headRefName,isDraft,url','--limit','50'];",
+        "  if(repo){ mergedArgs.push('--repo',repo); openArgs.push('--repo',repo); }",
+        "  for(const pr of ghJson(mergedArgs)){ merged.push({...pr,__repo:repo||parseRepoFromUrl(pr?.url)||String(process.env.GITHUB_REPOSITORY||'').trim()}); }",
+        "  for(const pr of ghJson(openArgs)){ open.push({...pr,__repo:repo||parseRepoFromUrl(pr?.url)||String(process.env.GITHUB_REPOSITORY||'').trim()}); }",
+        "}",
         "const recentMerged=merged.filter(p=>!p.mergedAt||new Date(p.mergedAt)>=new Date(since));",
         "console.log(JSON.stringify({",
         "  repoScope,",
-        "  merged:recentMerged.map(p=>({n:p.number,title:p.title,branch:p.headRefName,taskId:extractTaskId(p)})),",
-        "  open:open.filter(p=>!p.isDraft).map(p=>({n:p.number,title:p.title,branch:p.headRefName,taskId:extractTaskId(p)})),",
+        "  reposScanned: repoTargets.length,",
+        "  merged:recentMerged.map(p=>({n:p.number,repo:p.__repo||'',title:p.title,branch:p.headRefName,taskId:extractTaskId(p)})),",
+        "  open:open.filter(p=>!p.isDraft).map(p=>({n:p.number,repo:p.__repo||'',title:p.title,branch:p.headRefName,taskId:extractTaskId(p)})),",
         "}));",
         "\"",
       ].join(" "),
@@ -1667,27 +1730,54 @@ export const GITHUB_KANBAN_SYNC_TEMPLATE = {
         "const merged=Array.isArray(data.merged)?data.merged:[];",
         "const open=Array.isArray(data.open)?data.open:[];",
         "const updates=[]; const unresolved=[];",
+        "const maxBuffer=25*1024*1024;",
+        "const cliPath=fs.existsSync('cli.mjs')?'cli.mjs':'';",
         "const taskCli=['task-cli.mjs','task/task-cli.mjs'].find(p=>fs.existsSync(p))||'';",
-        "if(!taskCli){",
-        "  console.log(JSON.stringify({updated:0,unresolved:[{reason:'task_cli_missing'}],needsAgent:true}));",
+        "const taskRunner=cliPath?'cli':(taskCli?'task-cli':'');",
+        "if(!taskRunner){",
+        "  console.log(JSON.stringify({updated:0,unresolved:[{reason:'task_command_missing'}],needsAgent:true}));",
         "  process.exit(0);",
         "}",
-        "function runTask(args){return execFileSync('node',[taskCli,...args],{encoding:'utf8',stdio:['pipe','pipe','pipe']}).trim();}",
-        "function parseJsonObject(raw){const txt=String(raw||'').trim();if(!txt)return null;try{return JSON.parse(txt);}catch{}const lines=txt.split(/\\r?\\n/).map(s=>s.trim()).filter(Boolean);for(let i=lines.length-1;i>=0;i--){const line=lines[i];if(!(line.startsWith('{')||line.startsWith('[')))continue;try{return JSON.parse(line);}catch{}}const start=txt.indexOf('{');const end=txt.lastIndexOf('}');if(start>=0&&end>start){try{return JSON.parse(txt.slice(start,end+1));}catch{}}return null;}",
+        "function runTask(args){const cmdArgs=taskRunner==='cli'?['cli.mjs','task',...args,'--config-dir','.bosun','--repo-root','.']:[taskCli,...args];return execFileSync('node',cmdArgs,{encoding:'utf8',stdio:['pipe','pipe','pipe'],maxBuffer}).trim();}",
+        "function parseJsonObject(raw){const txt=String(raw||'').trim();if(!txt)return null;try{return JSON.parse(txt);}catch{}const lines=txt.split(/\\r?\\n/);for(let start=0;start<lines.length;start++){const token=lines[start].trim();if(!(token==='['||token==='{'||token.startsWith('[{')||token.startsWith('{\"')||token.startsWith('[\"')))continue;const candidate=lines.slice(start).join('\\n').trim();try{return JSON.parse(candidate);}catch{}}const compact=lines.map(s=>s.trim()).filter(Boolean);for(let i=compact.length-1;i>=0;i--){const line=compact[i];if(!(line.startsWith('{')||line.startsWith('[')))continue;try{return JSON.parse(line);}catch{}}const start=txt.indexOf('{');const end=txt.lastIndexOf('}');if(start>=0&&end>start){try{return JSON.parse(txt.slice(start,end+1));}catch{}}return null;}",
+        "let taskListCache=null;",
+        "function normalizeRepo(value){return String(value||'').trim().toLowerCase();}",
+        "function listTasks(){",
+        "  if(Array.isArray(taskListCache)) return taskListCache;",
+        "  try{const raw=runTask(['list','--json']);const tasks=parseJsonObject(raw);taskListCache=Array.isArray(tasks)?tasks:[];return taskListCache;}catch{taskListCache=[];return taskListCache;}",
+        "}",
+        "function resolveTaskId(item){",
+        "  const explicit=String(item?.taskId||'').trim();",
+        "  if(explicit) return explicit;",
+        "  const branch=String(item?.branch||'').trim();",
+        "  if(!branch) return '';",
+        "  const repo=normalizeRepo(item?.repo);",
+        "  const matches=listTasks().filter((task)=>{",
+        "    const taskBranch=String(task?.branchName||'').trim();",
+        "    if(taskBranch!==branch) return false;",
+        "    const taskRepo=normalizeRepo(task?.repository||'');",
+        "    if(!repo || !taskRepo) return true;",
+        "    return taskRepo===repo;",
+        "  });",
+        "  if(matches.length===1) return String(matches[0]?.id||'').trim();",
+        "  const exactRepo=matches.find((task)=>normalizeRepo(task?.repository||'')===repo);",
+        "  return exactRepo?String(exactRepo?.id||'').trim():'';",
+        "}",
         "function getTaskSnapshot(id){",
         "  try{const raw=runTask(['get',id,'--json']);const task=parseJsonObject(raw);return {status:task?.status||null,reviewStatus:task?.reviewStatus||null};}catch{return {status:null,reviewStatus:null};}",
         "}",
         "for(const item of merged){",
-        "  const id=String(item?.taskId||'').trim();",
-        "  if(!id) continue;",
+        "  const id=resolveTaskId(item);",
+        "  if(!id){unresolved.push({taskId:null,repo:String(item?.repo||''),branch:String(item?.branch||''),status:'done',reason:'task_lookup_failed'});continue;}",
         "  try{runTask(['update',id,'--status','done']);updates.push({taskId:id,status:'done'});}catch(e){unresolved.push({taskId:id,status:'done',error:String(e?.message||e)});}",
         "}",
         "for(const item of open){",
-        "  const id=String(item?.taskId||'').trim();",
-        "  if(!id) continue;",
-        "  try{const snap=getTaskSnapshot(id);const current=snap?.status;const review=String(snap?.reviewStatus||'').toLowerCase();if(current==='inreview'||current==='done'){updates.push({taskId:id,status:current,skipped:true});continue;}if(current==='todo'||current==='inprogress'){const reason=(review==='changes_requested'||review==='change_requested'||review==='requested_changes')?'changes_requested_pending_fix':'local_progress_state';updates.push({taskId:id,status:current,skipped:true,reason});continue;}runTask(['update',id,'--status','inreview']);updates.push({taskId:id,status:'inreview'});}catch(e){unresolved.push({taskId:id,status:'inreview',error:String(e?.message||e)});}",
+        "  const id=resolveTaskId(item);",
+        "  if(!id){unresolved.push({taskId:null,repo:String(item?.repo||''),branch:String(item?.branch||''),status:'inreview',reason:'task_lookup_failed'});continue;}",
+        "  try{const snap=getTaskSnapshot(id);const current=String(snap?.status||'').trim().toLowerCase();const review=String(snap?.reviewStatus||'').toLowerCase();if(current==='inreview'||current==='done'){updates.push({taskId:id,status:current,skipped:true});continue;}runTask(['update',id,'--status','inreview']);updates.push({taskId:id,status:'inreview',fromStatus:current||null,reviewStatus:review||null});}catch(e){unresolved.push({taskId:id,status:'inreview',error:String(e?.message||e)});}",
         "}",
-        "console.log(JSON.stringify({updated:updates.length,updates,unresolved,needsAgent:unresolved.length>0}));",
+        "const actionableUnresolved=unresolved.filter((item)=>String(item?.taskId||'').trim());",
+        "console.log(JSON.stringify({updated:updates.length,updates,unresolved,needsAgent:actionableUnresolved.length>0}));",
         "\"",
       ].join(" "),
       continueOnError: true,
@@ -1703,7 +1793,8 @@ export const GITHUB_KANBAN_SYNC_TEMPLATE = {
         "(()=>{try{" +
         "const raw=$ctx.getNodeOutput('sync-programmatic')?.output||'{}';" +
         "const d=JSON.parse(raw);" +
-        "return d?.needsAgent===true || (Array.isArray(d?.unresolved)&&d.unresolved.length>0);" +
+        "const actionable=Array.isArray(d?.unresolved)?d.unresolved.some((item)=>String(item?.taskId||'').trim()):false;" +
+        "return d?.needsAgent===true || actionable;" +
         "}catch{return true;}})()",
     }, { x: 400, y: 615 }),
 
@@ -2002,4 +2093,3 @@ export const SDK_CONFLICT_RESOLVER_TEMPLATE = {
     },
   },
 };
-

package/workspace/worktree-manager.mjs

@@ -599,7 +599,7 @@ class WorktreeManager {
     const detection = detectProjectStack(worktreePath);
     if (!detection?.primary) return;
 
-    const plan = buildBootstrapPlan(worktreePath, policy, detection);
+    const plan = buildBootstrapPlan(worktreePath, policy, detection, this.repoRoot);
     ensureWorktreeSharedPaths(this.repoRoot, worktreePath, plan.sharedPaths);
 
     const signature = buildBootstrapSignature(plan);