agentbox-app 0.1.12 → 0.1.16

package/main/agent-updates.mjs

@@ -2,11 +2,11 @@
 // started only by the app's Update now action, never by a poll or terminal open.
 import fs from 'node:fs';
 import os from 'node:os';
-import path from 'node:path';
 import {execFile} from 'node:child_process';
 import {promisify} from 'node:util';
 import {TaskTerminals,terminalEnv} from './task-terminals.mjs';
-import {codexLaunchEnv} from './codex-launch-env.mjs';
+import { harnessFor } from './harnesses.mjs';
+import { harnessDefinition } from '../shared/harness-definitions.mjs';
 const exec=promisify(execFile);
 const valid=v=>typeof v==='string'&&/^\d+\.\d+\.\d+$/.test(v);
 export function newerVersion(installed,latest){
@@ -15,28 +15,15 @@ export function newerVersion(installed,latest){
  for(let i=0;i<3;i++){if(b[i]!==a[i])return b[i]>a[i];}return false;
 }
 export function updatePlan({engine,bin,real,home=os.homedir(),channel='latest'}){
- if(!['claude','codex'].includes(engine)||!path.isAbsolute(bin||'')||!real)return null;
- const name=engine==='claude'?'Claude Code':'Codex';
- const brew=real.match(/^(\/opt\/homebrew|\/usr\/local)\/Caskroom\/(claude-code(?:@latest)?|codex)\//);
- if(brew&&((engine==='claude'&&brew[2].startsWith('claude-code'))||(engine==='codex'&&brew[2]==='codex')))
-  return {name,file:`${brew[1]}/bin/brew`,args:['upgrade','--cask',brew[2]],feed:`https://formulae.brew.sh/api/cask/${brew[2]}.json`,format:'brew'};
- const pkg=engine==='claude'?'@anthropic-ai/claude-code':'@openai/codex';
- const tail=`/lib/node_modules/${pkg}/`;
- const at=real.indexOf(tail);
- if(at>0){const prefix=real.slice(0,at);return {name,file:path.join(prefix,'bin/npm'),args:['install','--global','--prefix',prefix,`${pkg}@${channel}`],env:{PATH:`${prefix}/bin:${process.env.PATH||''}`},feed:`https://registry.npmjs.org/${pkg}/${channel}`,format:'npm'};}
- if(engine==='claude'&&real.startsWith(path.join(home,'.local/share/claude/versions')+'/'))return {name,file:bin,args:['update'],feed:`https://downloads.claude.ai/claude-code-releases/${channel}`,format:'text'};
- const standalone=real.match(/^(.*)\/packages\/standalone\/(?:releases|current)\//);
- if(engine==='codex'&&standalone)return {name,file:'/bin/bash',args:['-o','pipefail','-c','/usr/bin/curl -fsSL --connect-timeout 10 --max-time 60 https://chatgpt.com/codex/install.sh | /bin/sh'],env:{CODEX_HOME:standalone[1],CODEX_INSTALL_DIR:path.dirname(bin)},feed:'https://releases.openai.com/codex/channels/latest',format:'codex'};
- return null;
+ if(!harnessDefinition(engine))return null;
+ return harnessFor(engine).updatePlan({bin,real,home,channel});
 }
-const json=file=>{try{return JSON.parse(fs.readFileSync(file,'utf8'))}catch{return {}}};
 export async function installedAgent(engine,config){
- const bin=engine==='codex'?config.codexBin:config.claudeBin;
+ const harness=harnessFor(engine), bin=harness.binary(config);
  if(!bin)throw Error('This agent is not installed.');
  const home=config.home||os.homedir();
- const settings=engine==='claude'?json(path.join(process.env.CLAUDE_CONFIG_DIR||path.join(home,'.claude'),'settings.json')):{};
- const cleanEnv=terminalEnv();
- const env=engine==='codex'?codexLaunchEnv(bin,cleanEnv):cleanEnv;
+ const settings=harness.updateSettings({home});
+ const env=harness.launchEnv(bin,terminalEnv());
  // Version inspection must not itself auto-update anything.
  const {stdout}=await exec(bin,['--version'],{timeout:8000,maxBuffer:16384,env:{...env,DISABLE_AUTOUPDATER:'1'}});
  const version=stdout.match(/\b\d+\.\d+\.\d+(?:-[\w.-]+)?\b/)?.[0];
@@ -59,7 +46,7 @@ export class AgentUpdates{
  }
  status(engine){return this.entries.get(engine)||{engine,state:'unknown'};}
  check(engine,force=false){
-  if(!['claude','codex'].includes(engine))return Promise.reject(Error('Unknown agent.'));
+  if(!harnessDefinition(engine))return Promise.reject(Error('Unknown agent.'));
   if(this.starts.has(engine)||this.status(engine).state==='running')return Promise.resolve(this.status(engine));
   if(this.checks.has(engine))return this.checks.get(engine);
   const saved=this.status(engine);if(!force&&saved.checkedAt&&this.now()-saved.checkedAt<3600000)return Promise.resolve(saved);
@@ -105,7 +92,7 @@ export class AgentUpdates{
   if(!this.plans.has(engine))throw Error('Click Update now first.');
   switch(p.action){
    case 'open':return this.terminals.read(engine,0);
-   case 'read':return this.terminals.read(engine,p.offset);
+   case 'read':return this.terminals.read(engine,p.offset,p.wait);
    case 'write':return this.terminals.write(engine,p.data);
    case 'resize':return this.terminals.resize(engine,p.cols,p.rows);
    case 'close':return this.terminals.close(engine);