@pmate/cli 0.44.8 → 0.44.9

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.
@@ -2,6 +2,7 @@ const { execFile } = require('node:child_process')
2
2
  const { existsSync, mkdirSync } = require('node:fs')
3
3
  const { homedir } = require('node:os')
4
4
  const path = require('node:path')
5
+ const {modelCatalog}=require('./model-catalog.cjs')
5
6
  const methods = ['capabilities','workspaces.list','agents.list','agents.create','agents.update','plugins.list','plugins.configure','runtime.checkEnvironment','runtime.install','runtime.status','scripts.run']
6
7
  function createAgentRuntime({ platform = process.platform, home = homedir(), execute, fetcher = fetch, environment = process.env } = {}) {
7
8
  let identityEpoch=0
@@ -56,6 +57,7 @@ function createAgentRuntime({ platform = process.platform, home = homedir(), exe
56
57
  if(method==='runtime.checkEnvironment')return check()
57
58
  if(method==='runtime.status')return {...progress,installed:await installed()}
58
59
  if(method==='runtime.install')return install()
60
+ if(method==='scripts.run'&&input?.id==='runtime.models'&&input.args&&Object.keys(input.args).length===0)return modelCatalog({environment:{...environment,PATH:[path.join(home,'.local/bin'),path.join(home,'.bun/bin'),'/opt/homebrew/bin','/usr/local/bin',environment.PATH].filter(Boolean).join(':')}})
59
61
  if(method==='scripts.run') {if(input?.id!=='runtime.repair'||!input.args||Object.keys(input.args).length)throw new Error('未知安装操作');return install()}
60
62
  if(method==='workspaces.list')return api('/v2/workspaces')
61
63
  const {scope,id,config,expectedRevision}=input||{}
@@ -0,0 +1,48 @@
1
+ const {spawn}=require('node:child_process')
2
+ const {createInterface}=require('node:readline')
3
+ const {tmpdir}=require('node:os')
4
+ const EFFORTS=['none','minimal','low','medium','high','xhigh','max','ultra']
5
+ function normalize(engine,rows){
6
+ if(!Array.isArray(rows))throw Error('invalid_catalog')
7
+ const seen=new Set(),models=[]
8
+ for(const row of rows){
9
+ const id=engine==='codex'?row.model:(row.resolvedModel||row.value)
10
+ if(typeof id!=='string'||!/^[-a-zA-Z0-9_.:/[\]]{1,160}$/.test(id)||seen.has(id))continue
11
+ seen.add(id)
12
+ const efforts=(engine==='codex'?row.supportedReasoningEfforts?.map(x=>x.reasoningEffort):row.supportedEffortLevels)??[]
13
+ if(!Array.isArray(efforts))continue
14
+ models.push({id,label:typeof row.displayName==='string'?row.displayName.slice(0,120):id,efforts:[...new Set(efforts.filter(e=>EFFORTS.includes(e)))],...(engine==='codex'&&efforts.includes(row.defaultReasoningEffort)?{defaultEffort:row.defaultReasoningEffort}:{})})
15
+ }
16
+ if(!models.length)throw Error('empty_catalog')
17
+ return models
18
+ }
19
+ function queryModels(engine,{environment=process.env,spawnProcess=spawn,timeoutMs=8000}={}){
20
+ return new Promise(resolve=>{
21
+ let child,reader,timer,settled=false,bytes=0,models=[],pages=0
22
+ const finish=(result)=>{if(settled)return;settled=true;clearTimeout(timer);reader?.close();child?.stdin?.end();child?.kill();resolve(result)}
23
+ const fail=()=>finish({source:'fallback',models:[],reason:'catalog_unavailable'})
24
+ try{
25
+ const env={...environment};delete env.CLAUDECODE
26
+ const args=engine==='codex'?['app-server','--stdio']:['--print','--input-format','stream-json','--output-format','stream-json','--verbose','--no-session-persistence','--safe-mode','--tools','','--strict-mcp-config']
27
+ child=spawnProcess(engine==='codex'?'codex':'claude',args,{cwd:tmpdir(),env,stdio:['pipe','pipe','pipe']})
28
+ const send=v=>child.stdin.write(JSON.stringify(v)+'\n')
29
+ timer=setTimeout(fail,timeoutMs)
30
+ child.on('error',fail);child.on('exit',()=>{if(!settled)fail()});child.stdin.on('error',fail)
31
+ child.stderr.on('data',()=>{})
32
+ reader=createInterface({input:child.stdout})
33
+ child.stdout.on('data',b=>{bytes+=b.length;if(bytes>1024*1024)fail()})
34
+ reader.on('line',line=>{if(settled)return;try{
35
+ const v=JSON.parse(line)
36
+ if(engine==='codex'){
37
+ if(v.id===1){if(v.error)return fail();send({method:'initialized',params:{}});send({id:2,method:'model/list',params:{limit:100}})}
38
+ if(v.id===2){if(v.error)return fail();models.push(...normalize(engine,v.result?.data));if(v.result.nextCursor){if(++pages>10)return fail();send({id:2,method:'model/list',params:{limit:100,cursor:v.result.nextCursor}})}else finish({source:'live',models,checkedAt:new Date().toISOString()})}
39
+ }else if(v.type==='control_response'&&v.response?.request_id==='models'){
40
+ if(v.response.subtype!=='success')return fail();finish({source:'live',models:normalize(engine,v.response.response?.models),checkedAt:new Date().toISOString()})
41
+ }
42
+ }catch{fail()}})
43
+ send(engine==='codex'?{id:1,method:'initialize',params:{clientInfo:{name:'merry_model_picker',version:'1'}}}:{type:'control_request',request_id:'models',request:{subtype:'initialize'}})
44
+ }catch{fail()}
45
+ })
46
+ }
47
+ async function modelCatalog(options){const [codex,claude]=await Promise.all([queryModels('codex',options),queryModels('claude',options)]);return{codex,claude}}
48
+ module.exports={modelCatalog,queryModels,normalize}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pmate/cli",
3
- "version": "0.44.8",
3
+ "version": "0.44.9",
4
4
  "description": "CLI utilities for the pMate project",
5
5
  "license": "MIT",
6
6
  "bin": {