mlai-code 0.3.3 → 0.3.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/package.json +1 -1
- package/src/checkpoints.mjs +217 -0
- package/src/cli.mjs +153 -26
- package/src/cloud.mjs +2 -0
- package/src/engine.mjs +1 -1
- package/src/headless.mjs +25 -9
- package/src/home.mjs +3 -2
- package/src/host.mjs +141 -13
- package/src/ide-quick.mjs +147 -0
- package/src/ide.mjs +182 -0
- package/src/netbox.mjs +1 -1
- package/src/parity.mjs +17 -0
- package/src/relay.mjs +1 -1
- package/src/render.mjs +9 -2
- package/src/runtime.mjs +2 -0
- package/src/server.mjs +46 -7
- package/src/session.mjs +31 -8
- package/src/tui/acp.mjs +121 -19
- package/src/tui/app.mjs +2 -1
- package/src/tui/chat.mjs +35 -10
- package/src/tui/cmd-config.mjs +3 -1
- package/src/tui/cmd-core.mjs +9 -5
- package/src/tui/cmd-extensibility.mjs +5 -0
- package/src/tui/extensions-local.mjs +2 -0
- package/src/tui/mcp-config.mjs +22 -4
- package/src/tui/review-cli.mjs +15 -4
- package/src/tui/snapshots.mjs +57 -16
- package/src/two-words.mjs +14 -8
- package/src/view-sync.mjs +48 -0
- package/src/winenv.mjs +1 -1
- package/src/workspace-api.mjs +21 -4
- package/vendor/client-sdk/index.cjs +2 -1
- package/vendor/cloud-cli/mlai.mjs +23 -11
- package/worker/architecture_worker.py +33 -4
- package/worker/browser_tool.py +19 -1
- package/worker/chat_fork.py +4 -1
- package/worker/checkpoints.py +71 -8
- package/worker/command_safety.py +56 -3
- package/worker/connected_turn.py +30 -0
- package/worker/conversation.py +81 -11
- package/worker/git_sync.py +4 -4
- package/worker/image_generation.py +2 -2
- package/worker/kimi_bridge.py +247 -27
- package/worker/kimi_gates.py +25 -6
- package/worker/kimi_hook.py +153 -12
- package/worker/media_tools.py +4 -1
- package/worker/mlai_hooks.py +222 -3
- package/worker/mlai_mcp.py +26 -6
- package/worker/mlai_review/README.md +35 -0
- package/worker/mlai_review/__init__.py +1 -0
- package/worker/mlai_review/__main__.py +261 -0
- package/worker/mlai_review/_compat.py +29 -0
- package/worker/mlai_review/analysis/__init__.py +3 -0
- package/worker/mlai_review/analysis/detect.py +50 -0
- package/worker/mlai_review/analysis/main.py +128 -0
- package/worker/mlai_review/analysis/messages.py +8 -0
- package/worker/mlai_review/analysis/tools.py +194 -0
- package/worker/mlai_review/application/__init__.py +1 -0
- package/worker/mlai_review/application/asking.py +53 -0
- package/worker/mlai_review/application/challengers.py +142 -0
- package/worker/mlai_review/application/context_builder.py +194 -0
- package/worker/mlai_review/application/errors.py +17 -0
- package/worker/mlai_review/application/feedback.py +52 -0
- package/worker/mlai_review/application/matching.py +46 -0
- package/worker/mlai_review/application/messages.py +41 -0
- package/worker/mlai_review/application/ports.py +222 -0
- package/worker/mlai_review/application/prompts.py +342 -0
- package/worker/mlai_review/application/review_service.py +200 -0
- package/worker/mlai_review/application/reviewers.py +438 -0
- package/worker/mlai_review/application/streaming.py +91 -0
- package/worker/mlai_review/application/tools.py +138 -0
- package/worker/mlai_review/application/usage.py +145 -0
- package/worker/mlai_review/application/write_check.py +46 -0
- package/worker/mlai_review/contracts/__init__.py +5 -0
- package/worker/mlai_review/contracts/analysis.py +57 -0
- package/worker/mlai_review/contracts/review.py +42 -0
- package/worker/mlai_review/domain/__init__.py +4 -0
- package/worker/mlai_review/domain/changes.py +77 -0
- package/worker/mlai_review/domain/context.py +147 -0
- package/worker/mlai_review/domain/diagnostics.py +239 -0
- package/worker/mlai_review/domain/feedback.py +216 -0
- package/worker/mlai_review/domain/findings.py +505 -0
- package/worker/mlai_review/domain/lifecycle.py +85 -0
- package/worker/mlai_review/domain/partition.py +42 -0
- package/worker/mlai_review/domain/relations.py +166 -0
- package/worker/mlai_review/domain/relevance.py +202 -0
- package/worker/mlai_review/domain/report.py +99 -0
- package/worker/mlai_review/domain/structure.py +56 -0
- package/worker/mlai_review/domain/writes.py +86 -0
- package/worker/mlai_review/eval.py +221 -0
- package/worker/mlai_review/eval_cases/clean-rename.json +11 -0
- package/worker/mlai_review/eval_cases/missing-ownership-check.json +22 -0
- package/worker/mlai_review/eval_cases/off-by-one.json +22 -0
- package/worker/mlai_review/eval_cases/sql-injection.json +20 -0
- package/worker/mlai_review/feedback_report.py +60 -0
- package/worker/mlai_review/infrastructure/__init__.py +1 -0
- package/worker/mlai_review/infrastructure/analysis/__init__.py +1 -0
- package/worker/mlai_review/infrastructure/analysis/none.py +12 -0
- package/worker/mlai_review/infrastructure/analysis/translate.py +17 -0
- package/worker/mlai_review/infrastructure/github/__init__.py +0 -0
- package/worker/mlai_review/infrastructure/github/client.py +445 -0
- package/worker/mlai_review/infrastructure/github/feedback.py +212 -0
- package/worker/mlai_review/infrastructure/github/http.py +31 -0
- package/worker/mlai_review/infrastructure/github/rendering.py +398 -0
- package/worker/mlai_review/infrastructure/github/token.py +20 -0
- package/worker/mlai_review/infrastructure/local/__init__.py +1 -0
- package/worker/mlai_review/infrastructure/local/analyzer.py +48 -0
- package/worker/mlai_review/infrastructure/local/events.py +100 -0
- package/worker/mlai_review/infrastructure/local/git_reader.py +233 -0
- package/worker/mlai_review/infrastructure/local/publisher.py +138 -0
- package/worker/mlai_review/infrastructure/messages.py +54 -0
- package/worker/mlai_review/infrastructure/models/__init__.py +0 -0
- package/worker/mlai_review/infrastructure/models/openai_compatible.py +269 -0
- package/worker/mlai_review/infrastructure/structure/__init__.py +1 -0
- package/worker/mlai_review/infrastructure/structure/heuristic.py +186 -0
- package/worker/mlai_review/infrastructure/structure/tree_sitter.py +186 -0
- package/worker/mlai_review/infrastructure/workspace/__init__.py +1 -0
- package/worker/mlai_review/infrastructure/workspace/local.py +105 -0
- package/worker/mlai_review/infrastructure/workspace/memory.py +77 -0
- package/worker/mlai_review/infrastructure/workspace/paths.py +17 -0
- package/worker/mlai_review/pipeline.py +89 -0
- package/worker/mlai_review/runtime.py +194 -0
- package/worker/mlai_review/settings.py +139 -0
- package/worker/preview.py +15 -0
- package/worker/product_facts.py +3 -1
- package/worker/repo_policy.py +5 -0
- package/worker/roles.py +29 -2
- package/worker/runner.py +126 -18
- package/worker/runtime_control.py +64 -3
- package/worker/secret_scan.py +3 -2
- package/worker/server_memory.py +122 -0
- package/worker/subagents.py +6 -2
- package/worker/tool_catalog.py +1 -1
- package/worker/verification.py +113 -8
package/src/ide.mjs
ADDED
|
@@ -0,0 +1,182 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Editor plugin support for the engine host (VS Code, JetBrains, ACP clients): request validation for the extra
|
|
3
|
+
* session fields, editor context rendered into the task, the model picker list, and cloud handoff with a preview.
|
|
4
|
+
* Everything here is used only by sessions an editor creates; terminal and desktop sessions are unchanged.
|
|
5
|
+
*/
|
|
6
|
+
import {execFile} from 'node:child_process';
|
|
7
|
+
import {readFile,stat} from 'node:fs/promises';
|
|
8
|
+
import {realpathSync} from 'node:fs';
|
|
9
|
+
import path from 'node:path';
|
|
10
|
+
import {FALLBACK_MODELS} from './tui/chat.mjs';
|
|
11
|
+
import {localModelsForPicker} from './local-models.mjs';
|
|
12
|
+
import {githubRepo,changedFiles,recap,sendToCloud,chatUrl} from './tui/handoff.mjs';
|
|
13
|
+
|
|
14
|
+
export class IdeError extends Error{constructor(message,status=400,code){super(message);this.status=status;this.code=code}}
|
|
15
|
+
/**
|
|
16
|
+
* One spelling per folder: real path, resolved, and on Windows case-insensitive with backslashes. Editors send the
|
|
17
|
+
* folder as they see it (Windows drive case and slashes, 8.3 names; macOS /var for /private/var); session roots
|
|
18
|
+
* come from git.
|
|
19
|
+
*/
|
|
20
|
+
export function folderKey(p){
|
|
21
|
+
let r=path.resolve(String(p));try{r=realpathSync.native(r)}catch{}
|
|
22
|
+
return process.platform==='win32'?r.replace(/\//g,'\\').toLowerCase():r;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
export const CLIENT_KINDS=['vscode','jetbrains','acp'];
|
|
26
|
+
const NAME=/^[A-Za-z0-9_-]{1,64}$/;
|
|
27
|
+
const MODEL_ID=/^[\w.:@/-]{1,160}$/;
|
|
28
|
+
const isObj=v=>v&&typeof v==='object'&&!Array.isArray(v);
|
|
29
|
+
const str=(v,n)=>typeof v==='string'?v.slice(0,n):'';
|
|
30
|
+
|
|
31
|
+
export function validClient(c){
|
|
32
|
+
if(c==null)return null;
|
|
33
|
+
if(!isObj(c)||!CLIENT_KINDS.includes(c.kind))throw new IdeError('client.kind must be vscode, jetbrains or acp');
|
|
34
|
+
return {kind:c.kind,version:str(c.version,40).replace(/[^\w.+-]/g,'')||null};
|
|
35
|
+
}
|
|
36
|
+
export function validModel(m){
|
|
37
|
+
if(m==null||m==='')return null;
|
|
38
|
+
if(typeof m!=='string'||!MODEL_ID.test(m))throw new IdeError('Choose a model from the list');
|
|
39
|
+
return m;
|
|
40
|
+
}
|
|
41
|
+
/**
|
|
42
|
+
* Editor MCP servers ([{name, url, headers?} | {name, command, args?, env?}]) as the engine's extension shape:
|
|
43
|
+
* {mcpServers:{name:{url,headers:{}}|{command,args,env:{}}}, mcpEnv:{name:{headers}|{VAR:value}}}. Header and env
|
|
44
|
+
* values travel in mcpEnv, like the CLI's ${VAR} secrets, so a bridge's bearer token never reaches request.json.
|
|
45
|
+
*/
|
|
46
|
+
export function validMcpServers(list){
|
|
47
|
+
if(list==null)return null;
|
|
48
|
+
if(!Array.isArray(list)||list.length>10)throw new IdeError('mcpServers must be a list of up to 10 servers');
|
|
49
|
+
const mcpServers={},mcpEnv={};
|
|
50
|
+
for(const s of list){
|
|
51
|
+
if(!isObj(s)||!NAME.test(String(s.name||''))||s.name==='mlai')throw new IdeError('Each MCP server needs a name of letters, digits, - and _');
|
|
52
|
+
if(mcpServers[s.name])throw new IdeError('MCP server names must be different');
|
|
53
|
+
if(typeof s.url==='string'){
|
|
54
|
+
let u;try{u=new URL(s.url)}catch{throw new IdeError('MCP server '+s.name+' has an invalid url')}
|
|
55
|
+
if(!['http:','https:'].includes(u.protocol))throw new IdeError('MCP server '+s.name+' needs an http or https url');
|
|
56
|
+
const headers={};
|
|
57
|
+
for(const [k,v] of Object.entries(isObj(s.headers)?s.headers:{})){if(!/^[A-Za-z0-9-]{1,64}$/.test(k)||typeof v!=='string'||v.length>4000)throw new IdeError('MCP server '+s.name+' has an invalid header');headers[k]=v}
|
|
58
|
+
mcpServers[s.name]={url:s.url,headers:{},...(s.transport==='sse'?{transport:'sse'}:{}),...(s.readOnly===true?{readOnly:true}:{})};
|
|
59
|
+
if(Object.keys(headers).length)mcpEnv[s.name]={headers};
|
|
60
|
+
}else if(typeof s.command==='string'&&s.command.trim()){
|
|
61
|
+
if(s.args!=null&&(!Array.isArray(s.args)||s.args.length>50||s.args.some(a=>typeof a!=='string'||a.length>4000)))throw new IdeError('MCP server '+s.name+' has invalid args');
|
|
62
|
+
const env={};
|
|
63
|
+
for(const [k,v] of Object.entries(isObj(s.env)?s.env:{})){if(!/^[A-Za-z_][A-Za-z0-9_]{0,99}$/.test(k)||typeof v!=='string'||v.length>8000)throw new IdeError('MCP server '+s.name+' has an invalid env entry');env[k]=v}
|
|
64
|
+
mcpServers[s.name]={command:s.command,args:s.args||[],env:{},...(typeof s.cwd==='string'&&path.isAbsolute(s.cwd)?{cwd:s.cwd}:{})};
|
|
65
|
+
if(Object.keys(env).length)mcpEnv[s.name]=env;
|
|
66
|
+
}else throw new IdeError('MCP server '+s.name+' needs a url or a command');
|
|
67
|
+
}
|
|
68
|
+
return {mcpServers,mcpEnv};
|
|
69
|
+
}
|
|
70
|
+
/** The names of a session's editor MCP servers (no urls, headers or env), for showing in session info. */
|
|
71
|
+
export const mcpSummary=m=>m?Object.entries(m.mcpServers).map(([name,s])=>({name,transport:s.url?'http':'stdio'})):[];
|
|
72
|
+
|
|
73
|
+
export const CONTEXT_KINDS=['file','selection','folder','symbol','problems','diff','terminal','url'];
|
|
74
|
+
const CONTEXT_TEXT=20000,CONTEXT_TOTAL=60000;
|
|
75
|
+
/**
|
|
76
|
+
* Editor context attached to a message ([{kind, path?, startLine?, endLine?, text?}]) as a block in front of the
|
|
77
|
+
* task. The agent can open files itself, so a file without text is a reference, not an upload.
|
|
78
|
+
*/
|
|
79
|
+
export function renderContext(list){
|
|
80
|
+
if(list==null)return '';
|
|
81
|
+
if(!Array.isArray(list)||list.length>30)throw new IdeError('Attach up to 30 context items');
|
|
82
|
+
const parts=[];let total=0;
|
|
83
|
+
for(const c of list){
|
|
84
|
+
if(!isObj(c)||!CONTEXT_KINDS.includes(c.kind))throw new IdeError('Context kind must be one of '+CONTEXT_KINDS.join(', '));
|
|
85
|
+
const p=str(c.path,1000).replace(/[\0-\x1f]/g,'');
|
|
86
|
+
const lines=Number.isInteger(c.startLine)?(Number.isInteger(c.endLine)&&c.endLine!==c.startLine?' lines '+c.startLine+'-'+c.endLine:' line '+c.startLine):'';
|
|
87
|
+
let text=typeof c.text==='string'?c.text.slice(0,CONTEXT_TEXT):'';
|
|
88
|
+
if(total+text.length>CONTEXT_TOTAL)text=text.slice(0,Math.max(0,CONTEXT_TOTAL-total));
|
|
89
|
+
total+=text.length;
|
|
90
|
+
const head={file:'File',selection:'Selection',folder:'Folder',symbol:'Symbol',problems:'Problems',diff:'Git diff',terminal:'Terminal output',url:'Link'}[c.kind]+(p?' '+p:'')+lines;
|
|
91
|
+
const fence=text.includes('```')?'~~~~':'```';
|
|
92
|
+
parts.push(text?head+':\n'+fence+'\n'+text+(text.endsWith('\n')?'':'\n')+fence:head);
|
|
93
|
+
}
|
|
94
|
+
return parts.length?'Context from my editor:\n\n'+parts.join('\n\n')+'\n\n':'';
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
/**
|
|
98
|
+
* The model picker for editors: only our models from the server's own list. On-device models appear only when this
|
|
99
|
+
* computer cannot reach ML AI Code, as one entry labelled "Offline model". No credits, prices or vendor names.
|
|
100
|
+
*/
|
|
101
|
+
export async function pickerModels({cloud,local=localModelsForPicker}={}){
|
|
102
|
+
let models=null,def=null,signedIn=true;
|
|
103
|
+
try{const c=await cloud();const caps=await c.device.capabilities();if(Array.isArray(caps?.models)&&caps.models.length){models=caps.models;def=caps.defaultModel||null}}catch{signedIn=false}
|
|
104
|
+
const list=(models||FALLBACK_MODELS).filter(m=>m&&typeof m.id==='string'&&m.id&&!m.id.startsWith('offline:'));
|
|
105
|
+
const d=def&&list.some(m=>m.id===def)?def:list.find(m=>m.available!==false)?.id;
|
|
106
|
+
const out=list.map(m=>({id:m.id,label:String(m.label||m.id).slice(0,80),...(typeof m.description==='string'&&m.description?{description:m.description.slice(0,200)}:{}),offline:false,available:m.available!==false,...(m.vision===false?{vision:false}:{}),...(m.id===d?{default:true}:{})}));
|
|
107
|
+
const lm=await local().catch(()=>({online:true,models:[]}));
|
|
108
|
+
if(lm&&lm.online===false&&lm.models.length)out.push({id:lm.models[0].id,label:'Offline model',description:'Runs on this computer',offline:true,available:true});
|
|
109
|
+
return {models:out,online:lm?.online!==false,signedIn};
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
function git(cwd,args,{input,timeout=60000}={}){
|
|
113
|
+
return new Promise(resolve=>{const p=execFile('git',args,{cwd,timeout,maxBuffer:32_000_000,windowsHide:true},(err,stdout,stderr)=>resolve({code:err?(typeof err.code==='number'?err.code:1):0,stdout:String(stdout||''),stderr:String(stderr||'')}));if(input!=null)p.stdin.end(input)});
|
|
114
|
+
}
|
|
115
|
+
const PATCH_FILES=200,PATCH_BYTES=3_000_000,FILE_BYTES=500_000;
|
|
116
|
+
/** Text files to upload for a folder without a GitHub remote: the non-ignored files of the folder. */
|
|
117
|
+
async function folderFiles(root){
|
|
118
|
+
const r=await git(root,['ls-files','-co','--exclude-standard','-z']);
|
|
119
|
+
const names=r.code?[]:r.stdout.split('\0').filter(Boolean);
|
|
120
|
+
const out=[];let bytes=0,skipped=0;
|
|
121
|
+
for(const n of names){
|
|
122
|
+
if(n.split('/').some(p=>p==='.git'||p==='node_modules'))continue;
|
|
123
|
+
let st;try{st=await stat(path.join(root,n))}catch{continue}
|
|
124
|
+
if(!st.isFile())continue;
|
|
125
|
+
if(st.size>FILE_BYTES||out.length>=PATCH_FILES||bytes+st.size>PATCH_BYTES){skipped++;continue}
|
|
126
|
+
const b=await readFile(path.join(root,n));if(b.includes(0)){skipped++;continue}
|
|
127
|
+
out.push({path:n,content:b.toString('utf8')});bytes+=b.length;
|
|
128
|
+
}
|
|
129
|
+
return {files:out,bytes,skipped,total:names.length};
|
|
130
|
+
}
|
|
131
|
+
/** Secret scan (worker/secret_scan.py, the same patterns as the server's push gate) over what would leave the machine. */
|
|
132
|
+
export async function scanText(text,{python,worker}){
|
|
133
|
+
if(!python||!worker||!text)return [];
|
|
134
|
+
return new Promise(resolve=>{
|
|
135
|
+
const p=execFile(python,[path.join(worker,'secret_scan.py'),'text'],{timeout:30000,maxBuffer:8_000_000,windowsHide:true},(err,stdout)=>{
|
|
136
|
+
try{const v=JSON.parse(String(stdout||'{}'));resolve(Array.isArray(v.findings)?v.findings.slice(0,20).map(f=>({file:f.file||null,line:f.line||null,kind:f.kind||null,name:f.name||null,preview:f.preview||null})):[])}catch{resolve(err?[{kind:'scan_failed',name:'The secret scan did not run'}]:[])}
|
|
137
|
+
});
|
|
138
|
+
p.stdin.end(text);
|
|
139
|
+
});
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
/**
|
|
143
|
+
* Cloud handoff. Without `send`, returns what would be sent: {mode:'branch'|'files', repo, files, task, findings}.
|
|
144
|
+
* With a GitHub origin the work goes as a branch (a snapshot commit on a new mlai/ branch; the person's own branch,
|
|
145
|
+
* index and files never change). Without one the folder's files are uploaded to a new cloud chat.
|
|
146
|
+
*/
|
|
147
|
+
export async function handoff(session,{client,server,note='',send=false,scan=async()=>[],commitAll}={}){
|
|
148
|
+
const m=session.meta,root=m.root;
|
|
149
|
+
const origin=m.git?(await git(root,['config','--get','remote.origin.url'])).stdout.trim():'';
|
|
150
|
+
const repo=githubRepo(origin);
|
|
151
|
+
const transcript=await session.transcript().catch(()=>null);
|
|
152
|
+
if(repo){
|
|
153
|
+
const files=await changedFiles(root);
|
|
154
|
+
const diff=(await git(root,['diff','HEAD'])).stdout;
|
|
155
|
+
const untracked=(await git(root,['ls-files','--others','--exclude-standard','-z'])).stdout.split('\0').filter(Boolean).slice(0,200);
|
|
156
|
+
let extra='';for(const f of untracked){try{const b=await readFile(path.join(root,f));if(b.length<FILE_BYTES&&!b.includes(0))extra+='\n--- '+f+'\n'+b.toString('utf8')}catch{}}
|
|
157
|
+
const findings=await scan(diff+extra);
|
|
158
|
+
const task=recap({title:m.title,transcript,branch:'mlai/<new branch>',files,note});
|
|
159
|
+
const preview={mode:'branch',repo:'https://github.com/'+repo,files,diffBytes:Buffer.byteLength(diff),task,findings,transcriptTurns:Array.isArray(transcript)?transcript.length:0};
|
|
160
|
+
if(!send)return {dryRun:true,...preview};
|
|
161
|
+
if(findings.length)throw new IdeError('Possible secrets found in the changes. Remove them before sending to the cloud.',409,'secrets_found');
|
|
162
|
+
const r=await sendToCloud(session,{client,server,note,commitAll});
|
|
163
|
+
return {url:r.url,chatId:r.name,mode:'branch',repo:'https://github.com/'+repo,branch:r.branch,commit:r.commit};
|
|
164
|
+
}
|
|
165
|
+
const {files,bytes,skipped,total}=await folderFiles(root);
|
|
166
|
+
const findings=await scan(files.map(f=>'--- '+f.path+'\n'+f.content).join('\n'));
|
|
167
|
+
const names=files.map(f=>f.path);
|
|
168
|
+
const task=recap({title:m.title,transcript,branch:'(none: the files were uploaded)',files:names.slice(0,40),note}).replace(/The work so far is on the branch [^\n]*?, which is checked out here\./,'The files from my computer were uploaded to this computer\u2019s project folder.');
|
|
169
|
+
const preview={mode:'files',repo:null,files:names,bytes,skipped,totalFiles:total,task,findings,transcriptTurns:Array.isArray(transcript)?transcript.length:0};
|
|
170
|
+
if(!send)return {dryRun:true,...preview};
|
|
171
|
+
if(findings.length)throw new IdeError('Possible secrets found in the files. Remove them before sending to the cloud.',409,'secrets_found');
|
|
172
|
+
if(!files.length)throw new IdeError('There are no files to send.',400,'nothing_to_send');
|
|
173
|
+
if(!client)throw new IdeError('Sign in first.',401,'not_signed_in');
|
|
174
|
+
if(session.child)throw new IdeError('Wait for the task to finish before sending the session to the cloud.',409,'session_busy');
|
|
175
|
+
const ws=await client.request('/api/workspace',{action:'create',repo:'',profile:'small',fit:true});
|
|
176
|
+
if(!ws?.token||!ws?.name)throw new IdeError('The cloud chat did not start. Try again.',502);
|
|
177
|
+
for(const f of files)await client.request('/api/workspace',{action:'write',token:ws.token,path:f.path,content:f.content});
|
|
178
|
+
await client.start(ws.token,task,{mode:'approve'});
|
|
179
|
+
m.cloudHandoffs=[...(Array.isArray(m.cloudHandoffs)?m.cloudHandoffs:[]),{name:ws.name,mode:'files',at:new Date().toISOString()}].slice(-10);
|
|
180
|
+
await session.save?.().catch(()=>{});
|
|
181
|
+
return {url:chatUrl(server,ws.name),chatId:ws.name,mode:'files',files:names.length};
|
|
182
|
+
}
|
package/src/netbox.mjs
CHANGED
|
@@ -90,7 +90,7 @@ export async function startRelay({targets,deny=[],kind,tmp=os.tmpdir()}){
|
|
|
90
90
|
*/
|
|
91
91
|
export function offlineEnv(env,relay){
|
|
92
92
|
const out={...env};
|
|
93
|
-
if(typeof out
|
|
93
|
+
for(const k of ['MINI_IMAGE_GATEWAY','MINI_MEDIA_GATEWAY'])if(typeof out[k]==='string')out[k]=relay.rewrite(out[k]);
|
|
94
94
|
const np=[out.NO_PROXY||out.no_proxy,'127.0.0.1','localhost'].filter(Boolean).join(',');
|
|
95
95
|
out.NO_PROXY=np;out.no_proxy=np;
|
|
96
96
|
return out;
|
package/src/parity.mjs
CHANGED
|
@@ -47,6 +47,23 @@ export function parseCheckpoints(output,limit=40){
|
|
|
47
47
|
return {id,sha,step,label:step?subject.slice(STEP_MARK.length):'Before task',...(Number.isFinite(at)?{at}:{})};
|
|
48
48
|
});
|
|
49
49
|
}
|
|
50
|
+
/* BUG-0601: rescue stashes (same as lib/checkpoints.ts). */
|
|
51
|
+
const RESCUE_RE=/rescue before checkpoint restore/;
|
|
52
|
+
export const RESCUE_LIST_ARGS=['stash','list','--format=%H%x09%ct%x09%gs'];
|
|
53
|
+
export function parseRescues(output,limit=20){
|
|
54
|
+
return output.split('\n').map(l=>l.split('\t')).filter(p=>p.length>=3&&/^[0-9a-f]{40}$/.test(p[0])&&RESCUE_RE.test(p.slice(2).join('\t')))
|
|
55
|
+
.slice(0,limit).map(([sha,ct])=>({sha,at:Number(ct)*1000||0,label:'Rescue '+sha.slice(0,12)}));
|
|
56
|
+
}
|
|
57
|
+
export async function restoreRescue(sha,git){
|
|
58
|
+
if(typeof sha!=='string'||!/^[0-9a-f]{40}$/.test(sha))throw new Error('Invalid rescue stash');
|
|
59
|
+
const index=async()=>{const list=(await git(['stash','list','--format=%H'])).trim().split('\n');const i=list.indexOf(sha);if(i<0)throw new Error('This rescue stash is no longer there.');return 'stash@{'+i+'}'};
|
|
60
|
+
await index();
|
|
61
|
+
const dirty=(await git(['status','--porcelain'])).trim();let rescue;
|
|
62
|
+
if(dirty){await git(['stash','push','--include-untracked','-m','Mini Code rescue before checkpoint restore']);rescue=(await git(['rev-parse','refs/stash'])).trim();}
|
|
63
|
+
await git(['stash','apply',await index()]);
|
|
64
|
+
await git(['stash','drop',await index()]);
|
|
65
|
+
return {ok:true,...(rescue?{rescue}:{})};
|
|
66
|
+
}
|
|
50
67
|
export async function rewind(value,git){
|
|
51
68
|
const ref=checkpointRef(value);if(ref!=='HEAD')await git(['show-ref','--verify',ref]);
|
|
52
69
|
const dirty=(await git(['status','--porcelain'])).trim();let rescue;
|
package/src/relay.mjs
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
|
|
7
7
|
/** What another device may ask for. The server checks the same list; manual terminal commands and deletes stay here. */
|
|
8
8
|
export const RELAY_OPS=new Set(['run','resume','approve','steer','stop','history','read','write','read_raw','diff','git_status','git_pull','git_push',
|
|
9
|
-
'checkpoints','checkpoint_compare','restore','memory_read','memory_save','memory_proposal','memory_apply','export','session_export','screenshot',
|
|
9
|
+
'checkpoints','checkpoint_compare','restore','rescues','rescue_restore','memory_read','memory_save','memory_proposal','memory_apply','export','session_export','screenshot',
|
|
10
10
|
'capabilities','secret_scan','skill_history','skill_save','policy_get','policy_validate','policy_save','pr_plan','pr_publish']);
|
|
11
11
|
export const RELAY_LIMITS={pollMs:20000,watchMs:120000,watchedDebounceMs:700,idleDebounceMs:1500,diffEveryMs:15000,resultChars:4_000_000,maxBackoffMs:60000,olderServerMs:300000,signedOutMs:60000,retryMs:3000,events:300,eventText:6000};
|
|
12
12
|
const NAME=/^mini-[a-f0-9-]{36}$/;
|
package/src/render.mjs
CHANGED
|
@@ -25,6 +25,12 @@ export function approvalView(a,c=palette(false)){
|
|
|
25
25
|
for(const l of strip(m[3]).slice(0,60))lines.push(c.green('+ '+l));
|
|
26
26
|
return {kind:'edit',path:m[1],text:lines.join('\n')};
|
|
27
27
|
}
|
|
28
|
+
// BUG-0514: a file write is shown as a file write, not as "Run command $ Write ...".
|
|
29
|
+
const w=/^Write (.+?)(?: \((\d+) characters\))?(?:\n([\s\S]*))?$/.exec(text);
|
|
30
|
+
if(w&&(a.kind!=='command'||w[2])&&!/[;&|`$<>]/.test(w[1])){
|
|
31
|
+
const body=(w[3]||'').replace(/\n$/,'').split('\n').slice(0,60);
|
|
32
|
+
return {kind:'edit',path:w[1],text:[c.bold('Write file '+w[1])+(w[2]?c.dim(' ('+w[2]+' characters)'):''),...(w[3]?body.map(l=>c.green('+ '+l)):[])].join('\n')};
|
|
33
|
+
}
|
|
28
34
|
if(a.kind==='plan')return {kind:'plan',text:c.bold('Review the plan')+'\n'+(a.items||[]).map(t=>' - '+t).join('\n')};
|
|
29
35
|
return {kind:'command',text:c.bold('Run command')+'\n '+c.cyan('$ '+clip(text,2000))};
|
|
30
36
|
}
|
|
@@ -59,10 +65,11 @@ export function renderEvent(e,{c=palette(false),verbose=false}={}){
|
|
|
59
65
|
}
|
|
60
66
|
}
|
|
61
67
|
|
|
62
|
-
export const EXIT={completed:0,error:1,usage:2,limited:3,auth:4,billing:5,stopped:130,interrupted:1}
|
|
68
|
+
export const EXIT={completed:0,error:1,usage:2,limited:3,auth:4,billing:5,cannotComplete:6,stopped:130,interrupted:1};// BUG-0523: 6 = the agent reported the request cannot be done
|
|
63
69
|
export function exitCode(result){
|
|
64
70
|
if(!result)return EXIT.error;
|
|
65
71
|
if(result.code==='billing_limit')return EXIT.billing;
|
|
72
|
+
if(result.state==='completed'&&result.cannotComplete)return EXIT.cannotComplete;
|
|
66
73
|
if(result.state==='completed')return EXIT.completed;
|
|
67
74
|
if(result.state==='limited')return EXIT.limited;
|
|
68
75
|
if(result.state==='stopped')return EXIT.stopped;
|
|
@@ -70,6 +77,6 @@ export function exitCode(result){
|
|
|
70
77
|
}
|
|
71
78
|
export function summaryLine(result,c=palette(false)){
|
|
72
79
|
const u=result.usage||{};
|
|
73
|
-
const state=result.state==='completed'?c.green('Done'):result.state==='limited'?c.yellow('Needs attention'):result.state==='stopped'?c.yellow('Stopped'):c.red('Failed');
|
|
80
|
+
const state=result.state==='completed'&&result.cannotComplete?c.yellow('Could not be done'):result.state==='completed'?c.green('Done'):result.state==='limited'?c.yellow('Needs attention'):result.state==='stopped'?c.yellow('Stopped'):c.red('Failed');
|
|
74
81
|
return state+c.dim(' · '+credits(u.tokens)+' · '+fmt(u.calls)+' model calls');
|
|
75
82
|
}
|
package/src/runtime.mjs
CHANGED
|
@@ -9,6 +9,8 @@ const run=promisify(execFile);
|
|
|
9
9
|
export const PY_PACKAGES=['mini-swe-agent==2.4.6'];
|
|
10
10
|
export const PY_VERSION='3.12';
|
|
11
11
|
const key='py'+PY_VERSION+'-'+PY_PACKAGES.join('_').replace(/[^\w.]+/g,'-');
|
|
12
|
+
/** BUG-0474: user-facing text names the runtime folder "engine", not the third-party package it is built from. */
|
|
13
|
+
export const hideEngineName=t=>String(t??'').split(key).join('engine').replace(/mini[-_]?swe[-_]?agent(?:==[\w.]+)?/gi,'engine');
|
|
12
14
|
const bin=dir=>process.platform==='win32'?path.join(dir,'Scripts','python.exe'):path.join(dir,'bin','python');
|
|
13
15
|
|
|
14
16
|
async function which(name){
|
package/src/server.mjs
CHANGED
|
@@ -9,6 +9,7 @@ import {home,DEFAULT_SERVER} from './home.mjs';
|
|
|
9
9
|
import {Cloud,friendly} from './cloud.mjs';
|
|
10
10
|
import {loadLogin} from './credentials.mjs';
|
|
11
11
|
import {EngineHost,HostError} from './host.mjs';
|
|
12
|
+
import {createQuick,QUICK_ROUTES} from './ide-quick.mjs';
|
|
12
13
|
|
|
13
14
|
const WIN=process.platform==='win32';
|
|
14
15
|
/** Unix socket in ~/.mlai (owner-only), or on Windows a named pipe per user and data folder. */
|
|
@@ -29,9 +30,11 @@ function authorized(req,token){
|
|
|
29
30
|
return got.length===want.length&&timingSafeEqual(got,want);
|
|
30
31
|
}
|
|
31
32
|
const MAX_BODY=64000;
|
|
33
|
+
// Pasted images arrive base64 encoded (up to 5 MB each).
|
|
34
|
+
const IMAGE_BODY=7_200_000;
|
|
32
35
|
|
|
33
|
-
async function body(req){
|
|
34
|
-
let raw='';for await(const c of req){raw+=c;if(raw.length>
|
|
36
|
+
async function body(req,max=MAX_BODY){
|
|
37
|
+
let raw='';for await(const c of req){raw+=c;if(raw.length>max)throw new HostError('Request too large',413)}
|
|
35
38
|
if(!raw)return {};
|
|
36
39
|
try{const v=JSON.parse(raw);if(!v||typeof v!=='object'||Array.isArray(v))throw 0;return v}catch{throw new HostError('Invalid JSON')}
|
|
37
40
|
}
|
|
@@ -43,8 +46,16 @@ export async function terminalCloud(){
|
|
|
43
46
|
return new Cloud({server:(process.env.MLAI_SERVER||l.server||DEFAULT_SERVER).replace(/\/$/,''),token:l.token});
|
|
44
47
|
}
|
|
45
48
|
|
|
46
|
-
|
|
49
|
+
/** What this engine's API offers beyond the original routes, so editors can work with older installed engines. */
|
|
50
|
+
export const FEATURES=['login','models','context','modes','checkpoints','changes','revert','restore','fork','handoff','images','annotate','worktree','mcp','plan-review'];
|
|
51
|
+
const SERVER_URL=/^https?:\/\/[^\s/?#]+(\/[^\s?#]*)?$/;
|
|
52
|
+
export function createEngineServer({cloud:base=terminalCloud}={}){
|
|
53
|
+
// An editor plugin can hand the engine its own sign-in (POST /v1/login). It stays in memory for this process and
|
|
54
|
+
// wins over the CLI's saved login, so a plugin signed in to another server never changes the terminal's account.
|
|
55
|
+
let signIn=null;
|
|
56
|
+
const cloud=async()=>signIn?new Cloud(signIn):base();
|
|
47
57
|
const host=new EngineHost({cloud});
|
|
58
|
+
const quick=createQuick({cloud});
|
|
48
59
|
const subscribers=new Map(); // session id -> Set<res>
|
|
49
60
|
host.on('session',({id,type,data})=>{for(const r of subscribers.get(id)||[])sse(r,type,data)});
|
|
50
61
|
const token=WIN?engineToken():null;
|
|
@@ -53,8 +64,20 @@ export function createEngineServer({cloud=terminalCloud}={}){
|
|
|
53
64
|
if(!authorized(req,token))throw new HostError('Missing or wrong engine token',401);
|
|
54
65
|
const url=new URL(req.url,'http://mlaid');const [v,a,id,b]=url.pathname.split('/').filter(Boolean);
|
|
55
66
|
if(v!=='v1')throw new HostError('Not found',404);
|
|
56
|
-
if(req.method==='GET'&&a==='health')return send(res,200,host.health());
|
|
67
|
+
if(req.method==='GET'&&a==='health')return send(res,200,{...host.health(),features:[...FEATURES,...(Array.isArray(quick.features)?quick.features:QUICK_ROUTES)]});
|
|
57
68
|
if(req.method==='GET'&&a==='doctor')return send(res,200,await host.doctor());
|
|
69
|
+
if(a==='login'&&!id){
|
|
70
|
+
if(req.method==='DELETE'){signIn=null;return send(res,200,{ok:true})}
|
|
71
|
+
if(req.method!=='POST')throw new HostError('Method not allowed',405);
|
|
72
|
+
const d=await body(req);
|
|
73
|
+
if(typeof d.token!=='string'||d.token.length<8||d.token.length>4000||/\s/.test(d.token))throw new HostError('Send the sign-in token');
|
|
74
|
+
if(d.server!=null&&(typeof d.server!=='string'||!SERVER_URL.test(d.server)||!/^https:|^http:\/\/(127\.0\.0\.1|localhost)(:|\/|$)/.test(d.server)))throw new HostError('Server must be an https URL');
|
|
75
|
+
const next={server:String(d.server||process.env.MLAI_SERVER||DEFAULT_SERVER).replace(/\/$/,''),token:d.token};
|
|
76
|
+
if(d.verify===false){signIn=next;return send(res,200,{signedIn:true,server:next.server})}
|
|
77
|
+
try{const me=await new Cloud(next).whoami();signIn=next;return send(res,200,{signedIn:true,server:next.server,...me})}catch(e){throw new HostError(friendly(e),401,'not_signed_in')}
|
|
78
|
+
}
|
|
79
|
+
if(req.method==='GET'&&a==='models'&&!id)return send(res,200,await host.models());
|
|
80
|
+
if(req.method==='POST'&&QUICK_ROUTES.includes(a)&&!id)return quick.handle(a,req,res);
|
|
58
81
|
if(req.method==='GET'&&a==='account'){
|
|
59
82
|
try{const me=await (await cloud()).whoami();return send(res,200,{signedIn:true,...me})}catch(e){return send(res,200,{signedIn:false,error:friendly(e)})}
|
|
60
83
|
}
|
|
@@ -66,6 +89,9 @@ export function createEngineServer({cloud=terminalCloud}={}){
|
|
|
66
89
|
}
|
|
67
90
|
if(req.method==='GET'&&!b)return send(res,200,await host.get(id));
|
|
68
91
|
if(req.method==='GET'&&b==='transcript')return send(res,200,await host.transcript(id));
|
|
92
|
+
if(req.method==='GET'&&b==='checkpoints')return send(res,200,await host.checkpoints(id));
|
|
93
|
+
if(req.method==='GET'&&b==='changes')return send(res,200,await host.changes(id,{since:url.searchParams.get('since')||undefined}));
|
|
94
|
+
if(req.method==='GET'&&b==='images'&&url.searchParams.get('name'))return send(res,200,await host.image(id,url.searchParams.get('name')));
|
|
69
95
|
if(req.method==='GET'&&b==='events'){
|
|
70
96
|
const info=await host.get(id);
|
|
71
97
|
res.writeHead(200,{'Content-Type':'text/event-stream','Cache-Control':'no-store',Connection:'keep-alive'});
|
|
@@ -76,19 +102,32 @@ export function createEngineServer({cloud=terminalCloud}={}){
|
|
|
76
102
|
req.on('close',()=>{clearInterval(ping);subscribers.get(id)?.delete(res)});return;
|
|
77
103
|
}
|
|
78
104
|
if(req.method!=='POST')throw new HostError('Method not allowed',405);
|
|
79
|
-
|
|
105
|
+
if(b==='images'){
|
|
106
|
+
const d=await body(req,IMAGE_BODY);
|
|
107
|
+
if(typeof d.data!=='string'||!d.data)throw new HostError('Send the image as base64 data');
|
|
108
|
+
const raw=d.data.replace(/^data:image\/[\w+.-]+;base64,/,'');
|
|
109
|
+
return send(res,201,await host.addImage(id,Buffer.from(raw,'base64')));
|
|
110
|
+
}
|
|
111
|
+
const d=await body(req,b==='messages'?4*IMAGE_BODY:MAX_BODY);
|
|
80
112
|
if(b==='messages')return send(res,202,await host.start(id,d));
|
|
81
113
|
if(b==='decisions')return send(res,200,await host.decide(id,d));
|
|
82
114
|
if(b==='steer')return send(res,200,await host.steer(id,d));
|
|
83
115
|
if(b==='cancel')return send(res,200,await host.cancel(id));
|
|
84
116
|
if(b==='mode')return send(res,200,await host.mode(id,d));
|
|
117
|
+
if(b==='restore')return send(res,200,await host.restore(id,d));
|
|
118
|
+
if(b==='revert')return send(res,200,await host.revert(id,d));
|
|
119
|
+
if(b==='fork')return send(res,201,await host.fork(id,d));
|
|
120
|
+
if(b==='handoff')return send(res,200,await host.handoff(id,d));
|
|
121
|
+
if(b==='annotate')return send(res,200,await host.annotate(id,d));
|
|
122
|
+
if(b==='worktree')return send(res,200,await host.worktree(id,d));
|
|
123
|
+
if(b==='mcp')return send(res,200,await host.setMcp(id,d));
|
|
85
124
|
throw new HostError('Not found',404);
|
|
86
125
|
}catch(err){
|
|
87
126
|
if(res.headersSent)return res.end();
|
|
88
127
|
send(res,err instanceof HostError?err.status:500,{error:err instanceof HostError?err.message:friendly(err),...(err.code?{code:err.code}:{})});
|
|
89
128
|
}
|
|
90
129
|
});
|
|
91
|
-
server.host=host;
|
|
130
|
+
server.host=host;server.quick=quick;
|
|
92
131
|
return server;
|
|
93
132
|
}
|
|
94
133
|
|
|
@@ -105,6 +144,6 @@ export async function serve({socket=socketPath(),cloud}={}){
|
|
|
105
144
|
const old=WIN?null:process.umask(0o177);
|
|
106
145
|
try{await new Promise((resolve,reject)=>{server.once('error',e=>reject(e.code==='EADDRINUSE'?new Error('The ML AI Code engine is already running.'):e));server.listen(socket,resolve)})}finally{if(!WIN)process.umask(old)}
|
|
107
146
|
if(!WIN)await chmod(socket,0o600);
|
|
108
|
-
const close=async()=>{await server.host.close();server.closeAllConnections?.();server.close();if(!WIN)await rm(socket,{force:true})};
|
|
147
|
+
const close=async()=>{try{server.quick?.close()}catch{}await server.host.close();server.closeAllConnections?.();server.close();if(!WIN)await rm(socket,{force:true})};
|
|
109
148
|
return {server,socket,close};
|
|
110
149
|
}
|
package/src/session.mjs
CHANGED
|
@@ -9,7 +9,7 @@ import os from 'node:os';
|
|
|
9
9
|
import {home,sub} from './home.mjs';
|
|
10
10
|
import {prepareEngine} from './engine.mjs';
|
|
11
11
|
import {projectRoot,projectId,computerCard,gitRemote} from './project.mjs';
|
|
12
|
-
import {ensureRuntime} from './runtime.mjs';
|
|
12
|
+
import {ensureRuntime,hideEngineName} from './runtime.mjs';
|
|
13
13
|
import {browserEnv,browserReadPaths,installBrowserFor} from './browser-setup.mjs';
|
|
14
14
|
import {wrap,sandboxKind,SANDBOXES,denyRoots} from './sandbox.mjs';
|
|
15
15
|
import {windowsEnv,killTree,ensureBusybox} from './winenv.mjs';
|
|
@@ -22,7 +22,9 @@ export const MODES={guided:'approve',auto:'auto',plan:'plan'};
|
|
|
22
22
|
export const RUN_MODES={approve:'guided',auto:'auto',plan:'plan',brief:'guided'};
|
|
23
23
|
const ENTRIES=['runner.py','kimi_bridge.py'];
|
|
24
24
|
/** Only non-secret settings the server may hand to the harness (gateway URLs, versions, model names). */
|
|
25
|
-
|
|
25
|
+
// MINI_MEDIA_GATEWAY (stock photos, brand lookup): CLI bug list 0.3.3, every stock photo call said "not configured"
|
|
26
|
+
// because the server sent it and this list dropped it.
|
|
27
|
+
const SERVER_ENV=/^(MINI_IMAGE_GATEWAY|MINI_MEDIA_GATEWAY|MINI_RESEARCH_GATEWAY|MINI_KIMI_VERSION|OPENROUTER_IMAGE_MODEL|MLAI_HUB_URL)$/;
|
|
26
28
|
export function serverEnv(env){
|
|
27
29
|
const out={};
|
|
28
30
|
for(const [k,v] of Object.entries(env&&typeof env==='object'?env:{}))if(SERVER_ENV.test(k)&&typeof v==='string'&&v.length<2000)out[k]=v;
|
|
@@ -37,7 +39,7 @@ export function vaultEnv(secrets){
|
|
|
37
39
|
}
|
|
38
40
|
export function redact(text,values){let out=String(text||'');for(const v of values)if(typeof v==='string'&&v.length>=4)out=out.split(v).join('[redacted]');return out}
|
|
39
41
|
const FINAL=['completed','limited','error','stopped','interrupted'];
|
|
40
|
-
const RESET=['inference-progress.json','cancel','events.jsonl','pending.json','checks.json','todos.json','completion.json','steering.json','design-review.json','status.json'];
|
|
42
|
+
const RESET=['inference-progress.json','cancel','events.jsonl','pending.json','checks.json','todos.json','completion.json','steering.json','design-review.json','status.json','cannot-complete.json'];
|
|
41
43
|
/** Environment variables that look like credentials stay out of the agent's processes unless allowed. */
|
|
42
44
|
const SECRET_ENV=/(TOKEN|SECRET|PASSWORD|PASSWD|API_?KEY|PRIVATE_?KEY|CREDENTIAL|SESSION_?KEY|AUTH)/i;
|
|
43
45
|
export function agentEnv(base=process.env,allow=(base.MLAI_PASS_ENV||'').split(',').map(s=>s.trim()).filter(Boolean)){
|
|
@@ -56,7 +58,7 @@ export function serverRequest(built,{started,task,images=[]}){
|
|
|
56
58
|
...(rest.accountTokensLeft===undefined?{accountTokensLeft:started.budget??null}:{}),...(images.length?{images}:{})};
|
|
57
59
|
}
|
|
58
60
|
/** A title the engine made before two-word names (the first task cut at 80) becomes two words; a rename (meta.renamed) never changes. */
|
|
59
|
-
export function legacyTitle(m){const t=String(m?.title||''),first=String(m?.turns?.[0]?.task||'');return t&&!m.renamed&&!isTwoWords(t)&&first&&first.slice(0,80)===t?twoWordTitle(first):null}
|
|
61
|
+
export function legacyTitle(m){const t=String(m?.title||''),first=String(m?.turns?.[0]?.task||'');return t&&!m.renamed&&!isTwoWords(t)&&first&&first.slice(0,80)===t&&twoWordTitle(first)!==t?twoWordTitle(first):null}
|
|
60
62
|
async function writeJson(file,data){const tmp=file+'.tmp';await writeFile(tmp,JSON.stringify(data));await rename(tmp,file)}
|
|
61
63
|
async function readJson(file,fallback){try{return JSON.parse(await readFile(file,'utf8'))}catch{return fallback}}
|
|
62
64
|
/** Images attached to a message (screenshots, mockups). Stored in the session folder; the harness shows them to the model. */
|
|
@@ -196,6 +198,7 @@ export class Session extends EventEmitter{
|
|
|
196
198
|
// The local test browser (src/browser-setup.mjs) for every local run, terminal ones included: without MINI_BROWSER_LOCAL
|
|
197
199
|
// the engine reports "browser runtime is not installed" instead of offering the one-time install. The Mac app passes it already.
|
|
198
200
|
if(!extraEnv?.MINI_BROWSER_LOCAL){const b=await browserEnv(this.dir).catch(()=>null);if(b)extraEnv={...b,...(extraEnv&&typeof extraEnv==='object'?extraEnv:{})}}
|
|
201
|
+
const readDirs=Array.isArray(extraRead)?extraRead.filter(d=>typeof d==='string'&&d):[];// BUG-0499: --add-dir folders, readable without asking
|
|
199
202
|
{const want=browserReadPaths(),have=Array.isArray(extraRead)?extraRead:[];const add=want.filter(p=>!have.includes(p));if(add.length)extraRead=[...have,...add]}
|
|
200
203
|
const box={repo:this.meta.root,state:this.dir,runtime:path.dirname(path.dirname(python)),worker,mlaiHome:home(),busybox,...(Array.isArray(extraRead)&&extraRead.length?{extraRead}:{}),...(extraDeny.length?{extraDeny}:{})};
|
|
201
204
|
const sandboxed=wantSandbox?wrap('x',[],box):null;
|
|
@@ -206,12 +209,18 @@ export class Session extends EventEmitter{
|
|
|
206
209
|
tools:[],mode:MODES[mode],reasoningEffort:effort,planApproval:'off',briefFirst:false,askFirst:'never',go:true,role:'engineer',steps:Math.min(160,Math.max(1,steps)),harness:'mini',...(images.length?{images}:{}),...(run?.goal?{goal:run.goal}:{}),...(run?.wake?{wake:run.wake}:{})};
|
|
207
210
|
// CLI extensions (tui/extensions-local.mjs): permission rules, local hooks, network, MCP servers. Their ${VAR}
|
|
208
211
|
// values travel in the environment like Vault secrets, never in request.json.
|
|
212
|
+
// Local-only stricter limits from the CLI (BUG-0492 --max-turns, BUG-0509 --max-budget-credits, BUG-0519 -p in auto
|
|
213
|
+
// mode): set here too, so they hold even when the server that built the request is older. They only ever tighten.
|
|
214
|
+
if(run?.hardSteps===true)request.hardSteps=true;
|
|
215
|
+
if(Number.isInteger(Number(run?.maxTokens))&&Number(run.maxTokens)>0)request.hardBudget=true;
|
|
216
|
+
if(run?.unattended===true)request.unattended=true;
|
|
217
|
+
if(readDirs.length)request.readDirs=readDirs.slice(0,20);
|
|
209
218
|
let mcpEnv=null;
|
|
210
219
|
if(extensions){const m=mergeExtensions(request.extensions,extensions);request.extensions=m.extensions;mcpEnv=m.mcpEnv}
|
|
211
220
|
// Network off (src/netbox.mjs): with Seatbelt or bubblewrap the harness gets no network at all, only a relay to
|
|
212
221
|
// the model gateway; elsewhere the engine's hook-level block is all there is (status says which).
|
|
213
222
|
const netOff=request.extensions?.network?.enabled===false;
|
|
214
|
-
const relay=netOff&&NET_KINDS.includes(kind)&&request.endpoint?await startRelay({targets:[request.endpoint,built?serverEnv(started.env).MINI_IMAGE_GATEWAY:null],deny:[built?serverEnv(started.env).MINI_RESEARCH_GATEWAY:null],kind}):null;
|
|
223
|
+
const relay=netOff&&NET_KINDS.includes(kind)&&request.endpoint?await startRelay({targets:[request.endpoint,built?serverEnv(started.env).MINI_IMAGE_GATEWAY:null,built?serverEnv(started.env).MINI_MEDIA_GATEWAY:null],deny:[built?serverEnv(started.env).MINI_RESEARCH_GATEWAY:null],kind}):null;
|
|
215
224
|
try{
|
|
216
225
|
if(relay)request.endpoint=relay.rewrite(request.endpoint);
|
|
217
226
|
await writeFile(path.join(this.dir,'computer.md'),await computerCard({sandbox:sandboxed?.kind||'none',mode,network:netOff?(relay?'os':'hooks'):'on',restricted}));
|
|
@@ -227,7 +236,8 @@ export class Session extends EventEmitter{
|
|
|
227
236
|
const log=await open(path.join(this.dir,'worker.log'),'a');
|
|
228
237
|
this.offset=0;
|
|
229
238
|
const child=spawn(launch.cmd,launch.args,{cwd:this.meta.root,env,stdio:['ignore',log.fd,log.fd],detached:process.platform!=='win32',windowsHide:true});
|
|
230
|
-
this.child=child;this.emit('started',{runId:started.runId,harness:request.harness||'mini',engine:used,sandbox:sandboxed?.kind||'none',...(netOff?{network:launch.network==='os'?'off (OS)':'off (engine check only)'}:{}),...(restricted?{restricted:true}:{})
|
|
239
|
+
this.child=child;this.emit('started',{runId:started.runId,harness:request.harness||'mini',engine:used,sandbox:sandboxed?.kind||'none',...(netOff?{network:launch.network==='os'?'off (OS)':'off (engine check only)'}:{}),...(restricted?{restricted:true}:{}),// BUG-0477: null account credits means no credit limit (company Unlimited, or a pass for this model); never show the per-run ceiling as "credits left".
|
|
240
|
+
...(started.accountTokensLeft===null&&!started.offline?{uncapped:true}:{}),tokensLeft:started.accountTokensLeft===null?null:started.accountTokensLeft??started.budget??null});
|
|
231
241
|
const timer=setInterval(()=>this.poll().catch(()=>{}),150);
|
|
232
242
|
const exit=await new Promise(resolve=>{child.on('exit',(code,signal)=>resolve({code,signal}));child.on('error',e=>resolve({code:-1,error:e.message}))});
|
|
233
243
|
clearInterval(timer);await this.poll().catch(()=>{});await log.close().catch(()=>{});this.child=null;
|
|
@@ -235,7 +245,7 @@ export class Session extends EventEmitter{
|
|
|
235
245
|
let status=await readJson(path.join(this.dir,'status.json'),{});
|
|
236
246
|
if(!FINAL.includes(status.state)){
|
|
237
247
|
const tail=(await readFile(path.join(this.dir,'worker.log'),'utf8').catch(()=>'')).split('\n').filter(Boolean).slice(-6).join('\n');
|
|
238
|
-
const clean=redact(tail,[started.token,...Object.values(secrets)]);
|
|
248
|
+
const clean=hideEngineName(redact(tail,[started.token,...Object.values(secrets)]));
|
|
239
249
|
status={state:existsSync(path.join(this.dir,'cancel'))?'stopped':'error',error:exit.error||('The local engine exited unexpectedly.'+(clean?'\n'+clean:''))};
|
|
240
250
|
}
|
|
241
251
|
// A stop the person asked for ends as stopped, even when the engine reported an error on its way out (a command it
|
|
@@ -248,6 +258,8 @@ export class Session extends EventEmitter{
|
|
|
248
258
|
Object.assign(turn,{state:status.state,finished:new Date().toISOString(),tokens:usage?.tokens??status.tokens??0,calls:usage?.calls??status.calls??0});
|
|
249
259
|
await this.save();
|
|
250
260
|
const result={...status,usage,completion:await readJson(path.join(this.dir,'completion.json'),null)};
|
|
261
|
+
// BUG-0523: the agent reported that the request cannot be done (cannot_complete tool); never a plain success.
|
|
262
|
+
{const cc=await readJson(path.join(this.dir,'cannot-complete.json'),null);if(status.state==='completed'&&cc&&typeof cc.reason==='string'&&cc.reason.trim())result.cannotComplete={reason:cc.reason.trim().slice(0,600)}}
|
|
251
263
|
// The gateway refuses calls once the plan allowance for this run is used; say so plainly.
|
|
252
264
|
if(status.state!=='completed'&&started.budget!=null&&Number(usage?.tokens)>=started.budget){result.code='billing_limit';result.error='Your plan allowance ran out during this task. Changes so far are kept. Upgrade or wait for the allowance to reset, then continue.'}
|
|
253
265
|
this.emit('done',result);
|
|
@@ -281,7 +293,10 @@ export class Session extends EventEmitter{
|
|
|
281
293
|
/** verdict: approve | approve_all | reject */
|
|
282
294
|
async decide(id,verdict,{onProgress=()=>{},install=installBrowserFor}={}){
|
|
283
295
|
if(!/^[a-f0-9]{8,64}$/.test(String(id)))throw new Error('Invalid approval');
|
|
284
|
-
|
|
296
|
+
// Plan review answers (runner.py): approve:<item indexes> keeps some tasks, revise:<text> replies to the plan.
|
|
297
|
+
if(typeof verdict==='string'&&/^approve:\d{1,2}(,\d{1,2}){0,39}$/.test(verdict)){}
|
|
298
|
+
else if(typeof verdict==='string'&&/^revise:\S/.test(verdict.trim())&&verdict.length<=2100)verdict='revise:'+verdict.trim().slice(7).replace(/\s+/g,' ').trim().slice(0,2000);
|
|
299
|
+
else if(!['approve','approve_all','reject'].includes(verdict))throw new Error('Invalid decision');
|
|
285
300
|
// Approving the one-time browser download installs it before the engine reads the answer (the Mac app does the same
|
|
286
301
|
// in workspace-api.mjs). A failed install still sends the answer: the engine then continues without browser checks.
|
|
287
302
|
if(verdict!=='reject'){
|
|
@@ -305,6 +320,14 @@ export class Session extends EventEmitter{
|
|
|
305
320
|
const c=this.child;if(!c)return;
|
|
306
321
|
setTimeout(()=>{if(this.child===c)killTree(c.pid)},8000).unref();
|
|
307
322
|
}
|
|
323
|
+
/** BUG-0516: the terminal is closing. Ask the engine to stop, wait up to graceMs for it, then end its process group,
|
|
324
|
+
so nothing keeps running (a pending approval kept the engine and its helpers alive after the window closed). */
|
|
325
|
+
async stopNow(graceMs=2500){
|
|
326
|
+
const c=this.child;if(!c)return;
|
|
327
|
+
await writeFile(path.join(this.dir,'cancel'),'1').catch(()=>{});
|
|
328
|
+
const ended=await new Promise(r=>{if(c.exitCode!==null||c.signalCode!==null)return r(true);const t=setTimeout(()=>r(false),graceMs);c.once('exit',()=>{clearTimeout(t);r(true)})});
|
|
329
|
+
if(!ended)killTree(c.pid);
|
|
330
|
+
}
|
|
308
331
|
}
|
|
309
332
|
export {sandboxKind};
|
|
310
333
|
export const defaults={os:os.platform()};
|