@zibby/core 0.5.3 → 0.5.5
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/dist/backend-client.js +1 -1
- package/dist/constants.js +1 -1
- package/dist/index.js +2 -2
- package/dist/package.json +3 -3
- package/dist/register-built-in-strategies.js +1 -1
- package/dist/strategies/assistant-strategy.js +4 -4
- package/dist/strategies/claude-strategy.js +2 -2
- package/dist/strategies/codex-strategy.js +2 -2
- package/dist/strategies/cursor-strategy.js +1 -1
- package/dist/strategies/gemini-strategy.js +8 -8
- package/dist/strategies/index.js +12 -12
- package/dist/strategies/utils/openai-proxy-formatter.js +4 -4
- package/package.json +3 -3
package/dist/backend-client.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
import{existsSync as f,readFileSync as u}from"node:fs";import{homedir as l}from"node:os";import{join as h}from"node:path";var o=new Map;function w(){if(process.env.PROJECT_API_TOKEN)return process.env.PROJECT_API_TOKEN;if(process.env.ZIBBY_USER_TOKEN)return process.env.ZIBBY_USER_TOKEN;try{let e=h(l(),".zibby","config.json");return f(e)&&JSON.parse(u(e,"utf-8")).sessionToken||null}catch{return null}}function k(){return process.env.ZIBBY_ACCOUNT_API_URL?process.env.ZIBBY_ACCOUNT_API_URL.replace(/\/$/,""):(process.env.ZIBBY_ENV||"prod")==="local"?"http://localhost:3001":process.env.ZIBBY_PROD_ACCOUNT_API_URL||"https://
|
|
1
|
+
import{existsSync as f,readFileSync as u}from"node:fs";import{homedir as l}from"node:os";import{join as h}from"node:path";var o=new Map;function w(){if(process.env.PROJECT_API_TOKEN)return process.env.PROJECT_API_TOKEN;if(process.env.ZIBBY_USER_TOKEN)return process.env.ZIBBY_USER_TOKEN;try{let e=h(l(),".zibby","config.json");return f(e)&&JSON.parse(u(e,"utf-8")).sessionToken||null}catch{return null}}function k(){return process.env.ZIBBY_ACCOUNT_API_URL?process.env.ZIBBY_ACCOUNT_API_URL.replace(/\/$/,""):(process.env.ZIBBY_ENV||"prod")==="local"?"http://localhost:3001":process.env.ZIBBY_PROD_ACCOUNT_API_URL||"https://api-prod.zibby.app"}async function E(e){let s=Date.now(),r=o.get(e);if(r&&r.expiresAt>s)return r.data;let i=w();if(!i)throw new Error("No session token. Run `zibby login` first.");let c=`${k()}/integrations/token/${e}`,n=await fetch(c,{method:"GET",headers:{Authorization:`Bearer ${i}`}});if(!n.ok){let p=await n.text().catch(()=>"");throw n.status===404?new Error(`${e} is not connected. Connect it at https://studio.zibby.dev/integrations`):n.status===401||n.status===403?new Error("Session expired. Run `zibby login` to re-authenticate."):new Error(`Failed to resolve ${e} token (${n.status}): ${p}`)}let t=await n.json();if(!t||typeof t!="object")throw new Error(`Invalid response from ${e} token endpoint: expected object, got ${typeof t}`);if(e==="jira"){if(!t.token||typeof t.token!="string")throw new Error(`Invalid jira token response: token is ${typeof t.token}, expected string`);if(!t.cloudId)throw new Error("Invalid jira token response: missing cloudId")}else if(e==="github"&&(!t.token||typeof t.token!="string"))throw new Error(`Invalid github token response: token is ${typeof t.token}, expected string`);let a=((t.expiresInSec||3e3)-120)*1e3;return o.set(e,{data:t,expiresAt:s+a}),t}function g(e){e?o.delete(e):o.clear()}export{g as clearTokenCache,E as resolveIntegrationToken};
|
package/dist/constants.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
var o={ASSISTANT:"gpt-5.4-nano-2026-03-17",CLAUDE:"claude-sonnet-4-6",CURSOR:"auto",CODEX:"o4-mini",GEMINI:"gemini-
|
|
1
|
+
var o={ASSISTANT:"gpt-5.4-nano-2026-03-17",CLAUDE:"claude-sonnet-4-6",CURSOR:"auto",CODEX:"o4-mini",GEMINI:"gemini-3-pro",OPENAI_POSTPROCESSING:"gpt-4o-mini"},e={ASSISTANT:"assistant",CLAUDE:"claude",CURSOR:"cursor",CODEX:"codex",GEMINI:"gemini"},n={DEBUG:"debug",INFO:"info",WARN:"warn",ERROR:"error",SILENT:"silent"},u={auto:"claude-sonnet-4-6","opus-4.7":"claude-opus-4-7","opus-4-7":"claude-opus-4-7","sonnet-4.7":"claude-sonnet-4-7","sonnet-4-7":"claude-sonnet-4-7","sonnet-4.6":"claude-sonnet-4-6","sonnet-4-6":"claude-sonnet-4-6","opus-4.6":"claude-opus-4-6","opus-4-6":"claude-opus-4-6","sonnet-4.5":"claude-sonnet-4-5-20250929","sonnet-4-5":"claude-sonnet-4-5-20250929","opus-4.5":"claude-opus-4-5-20251101","opus-4-5":"claude-opus-4-5-20251101","haiku-4.5":"claude-haiku-4-5-20251001","haiku-4-5":"claude-haiku-4-5-20251001","claude-opus-4-7":"claude-opus-4-7","claude-sonnet-4-7":"claude-sonnet-4-7","claude-sonnet-4-6":"claude-sonnet-4-6","claude-opus-4-6":"claude-opus-4-6","claude-sonnet-4-5-20250929":"claude-sonnet-4-5-20250929","claude-opus-4-5-20251101":"claude-opus-4-5-20251101","claude-haiku-4-5-20251001":"claude-haiku-4-5-20251001","claude-opus-4-20250514":"claude-opus-4-20250514"},t={auto:"o4-mini","o4-mini":"o4-mini",o3:"o3","o3-mini":"o3-mini","codex-mini":"codex-mini-latest","gpt-4o":"gpt-4o","gpt-4o-mini":"gpt-4o-mini","gpt-5.2-codex":"gpt-5.2-codex","gpt-5.2":"gpt-5.2","gpt-5.3":"gpt-5.3","gpt-5.3-codex":"gpt-5.3-codex","gpt-5.4":"gpt-5.4","gpt-5.5":"gpt-5.5"},s={auto:"gemini-3-pro","gemini-3-pro":"gemini-3-pro","gemini-3-flash":"gemini-3-flash","gemini-2.5-pro":"gemini-2.5-pro","gemini-2.5-flash":"gemini-2.5-flash"},i={CURSOR_AGENT_DEFAULT:1200*1e3,OPENAI_REQUEST:18e4};export{e as AGENT_TYPES,u as CLAUDE_MODEL_MAP,t as CODEX_MODEL_MAP,o as DEFAULT_MODELS,s as GEMINI_MODEL_MAP,n as LOG_LEVELS,i as TIMEOUTS};
|
package/dist/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
var Hr=(i=>typeof require<"u"?require:typeof Proxy<"u"?new Proxy(i,{get:(e,t)=>(typeof require<"u"?require:e)[t]}):i)(function(i){if(typeof require<"u")return require.apply(this,arguments);throw Error('Dynamic require of "'+i+'" is not supported')});import{readFileSync as Br,existsSync as Gr}from"node:fs";import{join as $e,resolve as Kr,isAbsolute as Ds}from"node:path";import{DEFAULT_OUTPUT_BASE as Fs,SESSIONS_DIR as Jr,RESULT_FILE as js,resolveWorkflowSession as Bs,clearInheritedSessionEnvForFreshRun as Gs,readPinnedSessionPathFromEnv as Ks}from"@zibby/agent-workflow";import{registerStrategy as Me}from"@zibby/agent-workflow";import{AgentStrategy as mn,DEFAULT_OUTPUT_BASE as gn,SESSION_INFO_FILE as hn,STOP_REQUEST_FILE as yn,getAllSkills as Sn,getSkill as Kt}from"@zibby/agent-workflow";import{spawn as bn,execSync as te}from"node:child_process";import{writeFileSync as Jt,readFileSync as zt,mkdirSync as Yt,existsSync as Pe,accessSync as Ht,constants as Wt,unlinkSync as wn}from"node:fs";import{join as W,resolve as _n}from"node:path";import{homedir as ke}from"node:os";import Ce from"chalk";var H={debug:0,info:1,warn:2,error:3,silent:4},ze=class{constructor(){this._level=this._getLogLevel()}_getLogLevel(){if(process.env.ZIBBY_DEBUG==="true")return H.debug;if(process.env.ZIBBY_VERBOSE==="true")return H.info;let e=process.env.LOG_LEVEL?.toLowerCase();return e&&e in H?H[e]:H.info}_shouldLog(e){return H[e]>=this._level}_formatMessage(e,t,r={}){let n=new Date().toISOString(),s=`${this._getPrefix(e)} ${t}`;return Object.keys(r).length>0&&(s+=Ce.dim(` ${JSON.stringify(r)}`)),s}_getPrefix(e){return{debug:Ce.gray("[DEBUG]"),info:Ce.cyan("[INFO]"),warn:Ce.yellow("[WARN]"),error:Ce.red("\u274C [ERROR]")}[e]||""}debug(e,t){this._shouldLog("debug")&&console.log(this._formatMessage("debug",e,t))}info(e,t){this._shouldLog("info")&&console.log(this._formatMessage("info",e,t))}warn(e,t){this._shouldLog("warn")&&console.warn(this._formatMessage("warn",e,t))}error(e,t){this._shouldLog("error")&&console.error(this._formatMessage("error",e,t))}setLevel(e){e in H&&(this._level=H[e])}getLevel(){return Object.keys(H).find(e=>H[e]===this._level)}},p=new ze;var J={ASSISTANT:"gpt-5.4-nano-2026-03-17",CLAUDE:"claude-sonnet-4-6",CURSOR:"auto",CODEX:"o4-mini",GEMINI:"gemini-
|
|
1
|
+
var Hr=(i=>typeof require<"u"?require:typeof Proxy<"u"?new Proxy(i,{get:(e,t)=>(typeof require<"u"?require:e)[t]}):i)(function(i){if(typeof require<"u")return require.apply(this,arguments);throw Error('Dynamic require of "'+i+'" is not supported')});import{readFileSync as Br,existsSync as Gr}from"node:fs";import{join as $e,resolve as Kr,isAbsolute as Ds}from"node:path";import{DEFAULT_OUTPUT_BASE as Fs,SESSIONS_DIR as Jr,RESULT_FILE as js,resolveWorkflowSession as Bs,clearInheritedSessionEnvForFreshRun as Gs,readPinnedSessionPathFromEnv as Ks}from"@zibby/agent-workflow";import{registerStrategy as Me}from"@zibby/agent-workflow";import{AgentStrategy as mn,DEFAULT_OUTPUT_BASE as gn,SESSION_INFO_FILE as hn,STOP_REQUEST_FILE as yn,getAllSkills as Sn,getSkill as Kt}from"@zibby/agent-workflow";import{spawn as bn,execSync as te}from"node:child_process";import{writeFileSync as Jt,readFileSync as zt,mkdirSync as Yt,existsSync as Pe,accessSync as Ht,constants as Wt,unlinkSync as wn}from"node:fs";import{join as W,resolve as _n}from"node:path";import{homedir as ke}from"node:os";import Ce from"chalk";var H={debug:0,info:1,warn:2,error:3,silent:4},ze=class{constructor(){this._level=this._getLogLevel()}_getLogLevel(){if(process.env.ZIBBY_DEBUG==="true")return H.debug;if(process.env.ZIBBY_VERBOSE==="true")return H.info;let e=process.env.LOG_LEVEL?.toLowerCase();return e&&e in H?H[e]:H.info}_shouldLog(e){return H[e]>=this._level}_formatMessage(e,t,r={}){let n=new Date().toISOString(),s=`${this._getPrefix(e)} ${t}`;return Object.keys(r).length>0&&(s+=Ce.dim(` ${JSON.stringify(r)}`)),s}_getPrefix(e){return{debug:Ce.gray("[DEBUG]"),info:Ce.cyan("[INFO]"),warn:Ce.yellow("[WARN]"),error:Ce.red("\u274C [ERROR]")}[e]||""}debug(e,t){this._shouldLog("debug")&&console.log(this._formatMessage("debug",e,t))}info(e,t){this._shouldLog("info")&&console.log(this._formatMessage("info",e,t))}warn(e,t){this._shouldLog("warn")&&console.warn(this._formatMessage("warn",e,t))}error(e,t){this._shouldLog("error")&&console.error(this._formatMessage("error",e,t))}setLevel(e){e in H&&(this._level=H[e])}getLevel(){return Object.keys(H).find(e=>H[e]===this._level)}},p=new ze;var J={ASSISTANT:"gpt-5.4-nano-2026-03-17",CLAUDE:"claude-sonnet-4-6",CURSOR:"auto",CODEX:"o4-mini",GEMINI:"gemini-3-pro",OPENAI_POSTPROCESSING:"gpt-4o-mini"},Wr={ASSISTANT:"assistant",CLAUDE:"claude",CURSOR:"cursor",CODEX:"codex",GEMINI:"gemini"},Zr={DEBUG:"debug",INFO:"info",WARN:"warn",ERROR:"error",SILENT:"silent"},st={auto:"claude-sonnet-4-6","opus-4.7":"claude-opus-4-7","opus-4-7":"claude-opus-4-7","sonnet-4.7":"claude-sonnet-4-7","sonnet-4-7":"claude-sonnet-4-7","sonnet-4.6":"claude-sonnet-4-6","sonnet-4-6":"claude-sonnet-4-6","opus-4.6":"claude-opus-4-6","opus-4-6":"claude-opus-4-6","sonnet-4.5":"claude-sonnet-4-5-20250929","sonnet-4-5":"claude-sonnet-4-5-20250929","opus-4.5":"claude-opus-4-5-20251101","opus-4-5":"claude-opus-4-5-20251101","haiku-4.5":"claude-haiku-4-5-20251001","haiku-4-5":"claude-haiku-4-5-20251001","claude-opus-4-7":"claude-opus-4-7","claude-sonnet-4-7":"claude-sonnet-4-7","claude-sonnet-4-6":"claude-sonnet-4-6","claude-opus-4-6":"claude-opus-4-6","claude-sonnet-4-5-20250929":"claude-sonnet-4-5-20250929","claude-opus-4-5-20251101":"claude-opus-4-5-20251101","claude-haiku-4-5-20251001":"claude-haiku-4-5-20251001","claude-opus-4-20250514":"claude-opus-4-20250514"},it={auto:"o4-mini","o4-mini":"o4-mini",o3:"o3","o3-mini":"o3-mini","codex-mini":"codex-mini-latest","gpt-4o":"gpt-4o","gpt-4o-mini":"gpt-4o-mini","gpt-5.2-codex":"gpt-5.2-codex","gpt-5.2":"gpt-5.2","gpt-5.3":"gpt-5.3","gpt-5.3-codex":"gpt-5.3-codex","gpt-5.4":"gpt-5.4","gpt-5.5":"gpt-5.5"},Ut={auto:"gemini-3-pro","gemini-3-pro":"gemini-3-pro","gemini-3-flash":"gemini-3-flash","gemini-2.5-pro":"gemini-2.5-pro","gemini-2.5-flash":"gemini-2.5-flash"},Ye={CURSOR_AGENT_DEFAULT:1200*1e3,OPENAI_REQUEST:18e4};var Z=class i{constructor(){this.buffer="",this.extractedResult=null,this.rawText="",this.zodSchema=null,this.lastOutputLength=0,this.onToolCall=null,this._lastToolEmit=null}processChunk(e){if(!e)return null;this.buffer+=e;let t=this.buffer.split(`
|
|
2
2
|
`);this.buffer=t.pop()||"";let r="";for(let n of t)if(n.trim())try{let o=JSON.parse(n);this._emitToolCalls(o);let s=this.extractText(o);if(s){if(this.rawText&&s.startsWith(this.rawText)){let c=s.substring(this.rawText.length);this.rawText=s,r+=c}else(!this.rawText.includes(s)||s.length<20)&&(this.rawText+=s,r+=s);this.tryExtractResult(this.rawText)}else this.isValidResult(o)&&(this.rawText+=`${n}
|
|
3
3
|
`,r+=`${n}
|
|
4
4
|
`,this.extractedResult=o)}catch{if(n.includes('"text"')||n.includes('"content"')){let s=n.match(/"text"\s*:\s*"([^"]*)/),c=n.match(/"content"\s*:\s*"([^"]*)/),a=s?s[1]:c?c[1]:null;a&&!this.rawText.includes(a)&&(r+=a,this.rawText+=a)}}return r||null}flush(){if(!this.buffer.trim())return null;let e="";try{let t=JSON.parse(this.buffer);this._emitToolCalls(t);let r=this.extractText(t);r&&(this.rawText+=r,e+=r,this.tryExtractResult(r))}catch{this.rawText+=this.buffer,e+=this.buffer,this.tryExtractResult(this.buffer)}return this.buffer="",e||null}_emitToolCalls(e){if(!this.onToolCall)return;let t=(s,c)=>{if(!s)return;let a=`${s}:${JSON.stringify(c??{})}`;this._lastToolEmit!==a&&(this._lastToolEmit=a,this.onToolCall(s,c??void 0))},r=s=>{if(s!=null){if(typeof s=="object"&&!Array.isArray(s))return s;if(typeof s=="string")try{return JSON.parse(s)}catch{return}}};if(e.type==="tool_use"||e.type==="tool_call"){if(e.name){t(e.name,r(e.input??e.arguments));return}let s=e.tool_call;if(s&&typeof s=="object"&&!Array.isArray(s)){let c=Object.keys(s);if(c.length===1){let a=c[0],l=s[a],u=l&&typeof l=="object"?l.args??l.input??l:void 0;t(a,r(u))}return}return}if(Array.isArray(e.tool_calls)){for(let s of e.tool_calls)t(s.name,r(s.input??s.arguments));return}let n=e.message??e;if(Array.isArray(n?.tool_calls)){for(let s of n.tool_calls)t(s.name,r(s.input??s.arguments));return}let o=n?.content??e.content;if(Array.isArray(o))for(let s of o)(s.type==="tool_use"||s.type==="tool_call")&&s.name&&t(s.name,r(s.input??s.arguments))}extractText(e){if(e.type==="assistant"&&e.message?.content){let t=e.message.content;if(Array.isArray(t))return t.filter(r=>r.type==="text"&&r.text).map(r=>r.text).join("")}return e.type==="thinking"&&e.text||e.text?e.text:e.content&&typeof e.content=="string"?e.content:e.delta?e.delta:null}tryExtractResult(e){if(!e||typeof e!="string")return;let t=[],r=/```json\s*\n?([\s\S]*?)\n?```/g,n;for(;(n=r.exec(e))!==null;){let m=n[1].trim();try{JSON.parse(m),t.push({text:m,source:"markdown"})}catch{}}let o=0,s=0;for(;o<e.length&&(o=e.indexOf("{",o),o!==-1);){let m=0,d=o;for(let f=o;f<e.length;f++)if(e[f]==="{")m++;else if(e[f]==="}"&&(m--,m===0)){d=f,t.push({text:e.substring(o,d+1),source:"brace"}),s++;break}o=d+1}let c=this.extractedResult,a=c?JSON.stringify(c).length:0,l=0,u=-1;for(let m=0;m<t.length;m++){let d=t[m];try{let f=d.text.replace(/,(\s*[}\]])/g,"$1"),g=JSON.parse(f);this.isValidResult(g)&&(l++,a=JSON.stringify(g).length,c=g,u=m)}catch{}}c&&(this.extractedResult=c)}isValidResult(e){if(!e||typeof e!="object"||Array.isArray(e)||e.session_id||e.timestamp_ms||e.type||e.call_id||e.tool_call||e.result&&typeof e.result=="object"&&(e.result.success&&typeof e.result.success=="object"||e.result.error&&typeof e.result.error=="object")||e.args&&typeof e.args=="object")return!1;if(this.zodSchema)try{return this.zodSchema.parse(e),!0}catch{return!1}return!0}getResult(){return this.extractedResult}getRawText(){return this.rawText}static extractResult(e,t=null){let r=new i;r.zodSchema=t,r.processChunk(e),r.flush();let n=r.getResult();return!n&&process.env.LOG_LEVEL==="debug"&&console.error("[StreamingParser] No result extracted from",e?.length||0,"chars"),n}};import{zodToJsonSchema as Xr}from"zod-to-json-schema";var He=class{static generateFileOutputInstructions(e,t){let r;typeof e?.parse=="function"?r=Xr(e,{target:"openApi3"}):r=e;let n=this._buildExample(r);return`
|
|
@@ -144,7 +144,7 @@ ${h.join(`
|
|
|
144
144
|
|
|
145
145
|
${g}
|
|
146
146
|
`),p.debug(`Prompt length: ${f.length} chars`),process.env.STAGE!=="prod"&&p.debug(`Full prompt:
|
|
147
|
-
${f}`),r.invoke(f,m)}import{SKILLS as pp}from"@zibby/agent-workflow";import{registerSkill as dp,getSkill as mp,hasSkill as gp,getAllSkills as hp,listSkillIds as yp}from"@zibby/agent-workflow";var vo={READ_FILE:"read_file",WRITE_FILE:"write_file",LIST_DIRECTORY:"list_directory",RUN_COMMAND:"run_command",OPEN_URL:"open_url",WAIT:"wait"},Ao={LIST_PROJECTS:"jira_list_projects",SEARCH:"jira_search",GET_ISSUE:"jira_get_issue",CREATE_ISSUE:"jira_create_issue",LIST_SPRINTS:"jira_list_sprints",GET_SPRINT_ISSUES:"jira_get_sprint_issues",GET_COMMENTS:"jira_get_comments",ADD_COMMENT:"jira_add_comment",EDIT_ISSUE:"jira_edit_issue",TRANSITION_ISSUE:"jira_transition_issue"},$o={GET_USER:"github_get_user",LIST_ORGS:"github_list_orgs",LIST_REPOS:"github_list_repos",CLONE:"github_clone",SEARCH_REPOS:"github_search_repos",SEARCH_ISSUES:"github_search_issues",SEARCH_CODE:"github_search_code",GET_PR:"github_get_pr",GET_PR_DIFF:"github_get_pr_diff",LIST_PR_FILES:"github_list_pr_files",LIST_PR_COMMENTS:"github_list_pr_comments",LIST_COMMITS:"github_list_commits",GET_COMMIT:"github_get_commit",GET_FILE:"github_get_file",CREATE_ISSUE:"github_create_issue"},Oo={LIST_CHANNELS:"slack_list_channels",POST_MESSAGE:"slack_post_message",REPLY_TO_THREAD:"slack_reply_to_thread",ADD_REACTION:"slack_add_reaction",GET_CHANNEL_HISTORY:"slack_get_channel_history",GET_THREAD_REPLIES:"slack_get_thread_replies",GET_USERS:"slack_get_users",GET_USER_PROFILE:"slack_get_user_profile"},Io={GENERATE:"run_generate",TEST:"run_test",STATUS:"run_status",CANCEL:"run_cancel",WAIT:"run_wait",ARTIFACTS:"run_artifacts",LIST_SPECS:"list_specs"},Co={GET_TEST_HISTORY:"memory_get_test_history",GET_SELECTORS:"memory_get_selectors",GET_PAGE_MODEL:"memory_get_page_model",GET_NAVIGATION:"memory_get_navigation",SAVE_INSIGHT:"memory_save_insight"},Po={STORE:"memory_store",RECALL:"memory_recall",BRIEF:"memory_brief",END_SESSION:"memory_end_session",TASK_LOG:"task_log",TASK_HISTORY:"task_history"},ko={INSTALL:"install_skill",UNINSTALL:"uninstall_skill",LIST_AVAILABLE:"list_available_skills"},xl={...vo,...Ao,...$o,...Oo,...Io,...Co,...Po,...ko};import{existsSync as No,readFileSync as Ro}from"node:fs";import{homedir as Lo}from"node:os";import{join as Mo}from"node:path";var et=new Map;function Uo(){if(process.env.PROJECT_API_TOKEN)return process.env.PROJECT_API_TOKEN;if(process.env.ZIBBY_USER_TOKEN)return process.env.ZIBBY_USER_TOKEN;try{let i=Mo(Lo(),".zibby","config.json");return No(i)&&JSON.parse(Ro(i,"utf-8")).sessionToken||null}catch{return null}}function Do(){return process.env.ZIBBY_ACCOUNT_API_URL?process.env.ZIBBY_ACCOUNT_API_URL.replace(/\/$/,""):(process.env.ZIBBY_ENV||"prod")==="local"?"http://localhost:3001":process.env.ZIBBY_PROD_ACCOUNT_API_URL||"https://
|
|
147
|
+
${f}`),r.invoke(f,m)}import{SKILLS as pp}from"@zibby/agent-workflow";import{registerSkill as dp,getSkill as mp,hasSkill as gp,getAllSkills as hp,listSkillIds as yp}from"@zibby/agent-workflow";var vo={READ_FILE:"read_file",WRITE_FILE:"write_file",LIST_DIRECTORY:"list_directory",RUN_COMMAND:"run_command",OPEN_URL:"open_url",WAIT:"wait"},Ao={LIST_PROJECTS:"jira_list_projects",SEARCH:"jira_search",GET_ISSUE:"jira_get_issue",CREATE_ISSUE:"jira_create_issue",LIST_SPRINTS:"jira_list_sprints",GET_SPRINT_ISSUES:"jira_get_sprint_issues",GET_COMMENTS:"jira_get_comments",ADD_COMMENT:"jira_add_comment",EDIT_ISSUE:"jira_edit_issue",TRANSITION_ISSUE:"jira_transition_issue"},$o={GET_USER:"github_get_user",LIST_ORGS:"github_list_orgs",LIST_REPOS:"github_list_repos",CLONE:"github_clone",SEARCH_REPOS:"github_search_repos",SEARCH_ISSUES:"github_search_issues",SEARCH_CODE:"github_search_code",GET_PR:"github_get_pr",GET_PR_DIFF:"github_get_pr_diff",LIST_PR_FILES:"github_list_pr_files",LIST_PR_COMMENTS:"github_list_pr_comments",LIST_COMMITS:"github_list_commits",GET_COMMIT:"github_get_commit",GET_FILE:"github_get_file",CREATE_ISSUE:"github_create_issue"},Oo={LIST_CHANNELS:"slack_list_channels",POST_MESSAGE:"slack_post_message",REPLY_TO_THREAD:"slack_reply_to_thread",ADD_REACTION:"slack_add_reaction",GET_CHANNEL_HISTORY:"slack_get_channel_history",GET_THREAD_REPLIES:"slack_get_thread_replies",GET_USERS:"slack_get_users",GET_USER_PROFILE:"slack_get_user_profile"},Io={GENERATE:"run_generate",TEST:"run_test",STATUS:"run_status",CANCEL:"run_cancel",WAIT:"run_wait",ARTIFACTS:"run_artifacts",LIST_SPECS:"list_specs"},Co={GET_TEST_HISTORY:"memory_get_test_history",GET_SELECTORS:"memory_get_selectors",GET_PAGE_MODEL:"memory_get_page_model",GET_NAVIGATION:"memory_get_navigation",SAVE_INSIGHT:"memory_save_insight"},Po={STORE:"memory_store",RECALL:"memory_recall",BRIEF:"memory_brief",END_SESSION:"memory_end_session",TASK_LOG:"task_log",TASK_HISTORY:"task_history"},ko={INSTALL:"install_skill",UNINSTALL:"uninstall_skill",LIST_AVAILABLE:"list_available_skills"},xl={...vo,...Ao,...$o,...Oo,...Io,...Co,...Po,...ko};import{existsSync as No,readFileSync as Ro}from"node:fs";import{homedir as Lo}from"node:os";import{join as Mo}from"node:path";var et=new Map;function Uo(){if(process.env.PROJECT_API_TOKEN)return process.env.PROJECT_API_TOKEN;if(process.env.ZIBBY_USER_TOKEN)return process.env.ZIBBY_USER_TOKEN;try{let i=Mo(Lo(),".zibby","config.json");return No(i)&&JSON.parse(Ro(i,"utf-8")).sessionToken||null}catch{return null}}function Do(){return process.env.ZIBBY_ACCOUNT_API_URL?process.env.ZIBBY_ACCOUNT_API_URL.replace(/\/$/,""):(process.env.ZIBBY_ENV||"prod")==="local"?"http://localhost:3001":process.env.ZIBBY_PROD_ACCOUNT_API_URL||"https://api-prod.zibby.app"}async function Fo(i){let e=Date.now(),t=et.get(i);if(t&&t.expiresAt>e)return t.data;let r=Uo();if(!r)throw new Error("No session token. Run `zibby login` first.");let n=`${Do()}/integrations/token/${i}`,o=await fetch(n,{method:"GET",headers:{Authorization:`Bearer ${r}`}});if(!o.ok){let a=await o.text().catch(()=>"");throw o.status===404?new Error(`${i} is not connected. Connect it at https://studio.zibby.dev/integrations`):o.status===401||o.status===403?new Error("Session expired. Run `zibby login` to re-authenticate."):new Error(`Failed to resolve ${i} token (${o.status}): ${a}`)}let s=await o.json();if(!s||typeof s!="object")throw new Error(`Invalid response from ${i} token endpoint: expected object, got ${typeof s}`);if(i==="jira"){if(!s.token||typeof s.token!="string")throw new Error(`Invalid jira token response: token is ${typeof s.token}, expected string`);if(!s.cloudId)throw new Error("Invalid jira token response: missing cloudId")}else if(i==="github"&&(!s.token||typeof s.token!="string"))throw new Error(`Invalid github token response: token is ${typeof s.token}, expected string`);let c=((s.expiresInSec||3e3)-120)*1e3;return et.set(i,{data:s,expiresAt:e+c}),s}function jo(i){i?et.delete(i):et.clear()}import{readdir as Bo,access as gr,copyFile as Go,constants as hr}from"fs/promises";import{join as tt,relative as Ko}from"node:path";async function Jo(i={}){let{testResultsDir:e="test-results",testsDir:t="tests",projectRoot:r=process.cwd(),verbose:n=!0}=i;n&&console.log(`\u{1F3A5} Organizing test videos...
|
|
148
148
|
`);let o=tt(r,e),s=tt(r,t);try{let c=await Bo(o),a=0;for(let l of c){if(l.startsWith("."))continue;let u=tt(o,l,"video.webm");try{await gr(u,hr.F_OK)}catch{continue}let m=l.replace(/-chromium$/,"").replace(/-firefox$/,"").replace(/-webkit$/,""),d=await zo(s,m);if(d){let f=d.replace(/\.spec\.(js|ts)$/,".spec.webm");await Go(u,f),n&&console.log(`\u2705 ${Ko(r,f)}`),a++}else n&&console.log(`\u26A0\uFE0F Could not find test file for: ${l}`)}return n&&(console.log(`
|
|
149
149
|
\u{1F3AC} Organized ${a} video(s)`),console.log(`\u{1F4C2} Videos are now next to their test files in ${t}/`)),{movedCount:a,success:!0}}catch(c){return n&&console.error("\u274C Error organizing videos:",c.message),{movedCount:0,success:!1,error:c.message}}}async function zo(i,e){let t=e.split("-");for(let r=t.length;r>0;r--){let o=t.slice(0,r).join("/");for(let s of["js","ts"]){let c=tt(i,`${o}.spec.${s}`);try{return await gr(c,hr.F_OK),c}catch{}}}return null}var Ue=class{constructor(e,t={}){this.apiKey=e,this.baseUrl=t.baseUrl||process.env.ZIBBY_API_URL||"https://api-prod.zibby.app",this.enabled=!!e}isEnabled(){return this.enabled}};function yr(){let i=process.env.ZIBBY_API_KEY;return new Ue(i)}import{execSync as Yo}from"node:child_process";import{existsSync as Ho,mkdirSync as Wo}from"node:fs";import{join as Zo}from"node:path";async function Xo(i={}){let{baseDir:e="/workspace/repos",repos:t=null,depth:r=1,branch:n=null}=i,o=process.env.REPOS;if(!o)throw new Error("REPOS environment variable not set. Are you running in a Zibby workflow container?");let s;try{s=JSON.parse(o)}catch(l){throw new Error(`Failed to parse REPOS env var: ${l.message}`,{cause:l})}if(!Array.isArray(s)||s.length===0)throw new Error("No repositories configured for this project");let c=t?s.filter(l=>t.includes(l.name)):s;if(c.length===0)throw new Error(`No matching repositories found. Available: ${s.map(l=>l.name).join(", ")}`);Ho(e)||Wo(e,{recursive:!0});let a={};return await Promise.all(c.map(async l=>{let u=l.provider||"github",m=u==="gitlab"?process.env.GITLAB_TOKEN:process.env.GITHUB_TOKEN;if(!m){console.error(`${u.toUpperCase()}_TOKEN not set, skipping ${l.name}`),a[l.name]=null;return}let d=l.name.replace(/\//g,"-"),f=Zo(e,d),g=l.cloneUrl||l.url;if(!g){console.error(`Repository "${l.name}" has no clone URL`),a[l.name]=null;return}let y;u==="gitlab"?y=g.replace(/^https:\/\//,`https://oauth2:${m}@`):y=g.replace(/^https:\/\//,`https://x-access-token:${m}@`);let h=["clone"];r>0&&h.push("--depth",r.toString()),n&&h.push("--branch",n),h.push(y,f);let S=`git ${h.join(" ")}`;console.log(`Cloning ${l.name} (${u}) to ${f}...`);try{Yo(S,{stdio:"pipe",env:{...process.env,GIT_TERMINAL_PROMPT:"0"}}),console.log(`Repository ${l.name} cloned successfully`),a[l.name]=f}catch(w){let T=w.message.replace(m,"***").replace(y,g);console.error(`Failed to clone ${l.name}: ${T}`),a[l.name]=null}})),a}var Sr=/^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000|ffffffff-ffff-ffff-ffff-ffffffffffff)$/i;function qo(i){return typeof i=="string"&&Sr.test(i)}var br=qo;function Vo(i){if(!br(i))throw TypeError("Invalid UUID");let e;return Uint8Array.of((e=parseInt(i.slice(0,8),16))>>>24,e>>>16&255,e>>>8&255,e&255,(e=parseInt(i.slice(9,13),16))>>>8,e&255,(e=parseInt(i.slice(14,18),16))>>>8,e&255,(e=parseInt(i.slice(19,23),16))>>>8,e&255,(e=parseInt(i.slice(24,36),16))/1099511627776&255,e/4294967296&255,e>>>24&255,e>>>16&255,e>>>8&255,e&255)}var _t=Vo;var K=[];for(let i=0;i<256;++i)K.push((i+256).toString(16).slice(1));function wr(i,e=0){return(K[i[e+0]]+K[i[e+1]]+K[i[e+2]]+K[i[e+3]]+"-"+K[i[e+4]]+K[i[e+5]]+"-"+K[i[e+6]]+K[i[e+7]]+"-"+K[i[e+8]]+K[i[e+9]]+"-"+K[i[e+10]]+K[i[e+11]]+K[i[e+12]]+K[i[e+13]]+K[i[e+14]]+K[i[e+15]]).toLowerCase()}function Qo(i){i=unescape(encodeURIComponent(i));let e=new Uint8Array(i.length);for(let t=0;t<i.length;++t)e[t]=i.charCodeAt(t);return e}var _r="6ba7b810-9dad-11d1-80b4-00c04fd430c8",xr="6ba7b811-9dad-11d1-80b4-00c04fd430c8";function xt(i,e,t,r,n,o){let s=typeof t=="string"?Qo(t):t,c=typeof r=="string"?_t(r):r;if(typeof r=="string"&&(r=_t(r)),r?.length!==16)throw TypeError("Namespace must be array-like (16 iterable integer values, 0-255)");let a=new Uint8Array(16+s.length);if(a.set(c),a.set(s,c.length),a=e(a),a[6]=a[6]&15|i,a[8]=a[8]&63|128,n){if(o=o||0,o<0||o+16>n.length)throw new RangeError(`UUID byte range ${o}:${o+15} is out of buffer bounds`);for(let l=0;l<16;++l)n[o+l]=a[l];return n}return wr(a)}import{createHash as es}from"crypto";function ts(i){return Array.isArray(i)?i=Buffer.from(i):typeof i=="string"&&(i=Buffer.from(i,"utf8")),es("sha1").update(i).digest()}var Er=ts;function Et(i,e,t,r){return xt(80,Er,i,e,t,r)}Et.DNS=_r;Et.URL=xr;var Tt=Et;var Tr="@zibby/core ZibbySessionStore/1",De=class{constructor({apiUrl:e,apiKey:t,workflowUuid:r,fetchImpl:n=globalThis.fetch}){if(!e)throw new Error("ZibbySessionStore: apiUrl is required");if(!t)throw new Error("ZibbySessionStore: apiKey is required");if(!r)throw new Error("ZibbySessionStore: workflowUuid is required");this._apiUrl=String(e).replace(/\/+$/,""),this._apiKey=t,this._workflowUuid=r,this._fetch=n}async append(e,t){if(!Array.isArray(t)||t.length===0)return;let r=`${this._apiUrl}/workflows/${encodeURIComponent(this._workflowUuid)}/sessions/${encodeURIComponent(e.sessionId)}/append`,n=await this._fetch(r,{method:"POST",headers:{Authorization:`Bearer ${this._apiKey}`,"Content-Type":"application/json","User-Agent":Tr},body:JSON.stringify({entries:t})});if(!n.ok)throw new Error(`ZibbySessionStore.append HTTP ${n.status}`)}async load(e){let t=`${this._apiUrl}/workflows/${encodeURIComponent(this._workflowUuid)}/sessions/${encodeURIComponent(e.sessionId)}`,r;try{r=await this._fetch(t,{method:"GET",headers:{Authorization:`Bearer ${this._apiKey}`,"User-Agent":Tr}})}catch{return null}if(r.status===404||!r.ok)return null;let n;try{n=await r.json()}catch{return null}let o=Array.isArray(n?.entries)?n.entries:null;return o&&o.length>0?o:null}};var rs="6ba7b810-9dad-11d1-80b4-00c04fd430c8",vr=new Set;function ns(){return(process.env.PROGRESS_API_URL||process.env.ZIBBY_API_BASE||"").replace(/\/executions\/?$/,"").replace(/\/+$/,"")}function Ar({namespace:i=rs}={}){return{id:"session",description:"Persist agent conversation state across invocations (Claude-only in v1)",envKeys:[],tools:[],invokeAgentOptions(e,t){let r=e?.conversationId,n=e?.workflowUuid;if(!r||!n)return null;let o=t?.agentType;if(o&&o!=="claude")return vr.has(o)||(console.warn(`[SKILLS.SESSION] agent type '${o}' does not support native sessions \u2014 node running stateless`),vr.add(o)),null;let s=Tt(`${n}:${r}`,i),c=ns(),a=process.env.PROJECT_API_TOKEN||process.env.ZIBBY_USER_TOKEN,l=null;if(c&&a)try{l=new De({apiUrl:c,apiKey:a,workflowUuid:n})}catch(d){console.warn(`[SKILLS.SESSION] failed to build SessionStore: ${d.message}`),l=null}return e.resetConversation?{sessionId:s,resume:s,forkSession:!0,...l&&{sessionStore:l}}:e.hasPriorSession?{resume:s,...l&&{sessionStore:l}}:{sessionId:s,...l&&{sessionStore:l}}}}}import{spawn as $r}from"node:child_process";import{readFileSync as os,writeFileSync as ss,existsSync as rt}from"node:fs";import{homedir as Or}from"node:os";import{join as we}from"node:path";async function is(){let i=we(Or(),".local/share/cursor-agent/versions");if(!rt(i))throw new Error(`cursor-agent not found at ${i}. Please install cursor-agent first.`);return console.log(`\u{1F527} Patching cursor-agent for CI/CD...
|
|
150
150
|
`),new Promise((e,t)=>{let r=we(__dirname,"../../scripts/patch-cursor-mcp.py");if(!rt(r)){t(new Error("Patch script not found"));return}let n=$r("python3",[r],{stdio:"inherit"});n.on("close",o=>{o===0?e({success:!0}):t(new Error(`Patch failed with code ${o}`))}),n.on("error",o=>{t(o)})})}function as(){let i=we(Or(),".local/share/cursor-agent/versions");if(!rt(i))return{patched:!1,installed:!1};try{let e=Hr("fs").readdirSync(i);if(e.length===0)return{patched:!1,installed:!1};let t=e.sort().reverse()[0],r=we(i,t,"index.js");return rt(r)?{patched:os(r,"utf-8").includes("AUTO-APPROVE MCP TOOLS FOR CI/CD"),installed:!0,path:r}:{patched:!1,installed:!1}}catch(e){return{patched:!1,installed:!1,error:e.message}}}async function ls(i){return console.log(`\u{1F511} Getting MCP approval keys...
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zibby/core",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.5",
|
|
4
4
|
"description": "Core test automation engine with multi-agent and multi-MCP support",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -34,8 +34,8 @@
|
|
|
34
34
|
"test:state-schema": "vitest run test/state-schema.test.js",
|
|
35
35
|
"test:state-schema:e2e": "node test/state-schema.e2e.test.js",
|
|
36
36
|
"export:workflows": "node scripts/export-default-workflows.js",
|
|
37
|
-
"lint": "eslint
|
|
38
|
-
"lint:fix": "eslint --fix
|
|
37
|
+
"lint": "eslint src test scripts --cache --cache-location node_modules/.cache/eslint/",
|
|
38
|
+
"lint:fix": "eslint --fix src test scripts --cache --cache-location node_modules/.cache/eslint/"
|
|
39
39
|
},
|
|
40
40
|
"keywords": [
|
|
41
41
|
"testing",
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import{registerStrategy as me}from"@zibby/agent-workflow";import{AgentStrategy as kt,DEFAULT_OUTPUT_BASE as Pt,SESSION_INFO_FILE as Nt,STOP_REQUEST_FILE as Rt,getAllSkills as Mt,getSkill as We}from"@zibby/agent-workflow";import{spawn as Lt,execSync as Z}from"node:child_process";import{writeFileSync as Ze,readFileSync as qe,mkdirSync as Ve,existsSync as ce,accessSync as Qe,constants as et,unlinkSync as Dt}from"node:fs";import{join as Y,resolve as Ut}from"node:path";import{homedir as ue}from"node:os";import ae from"chalk";var z={debug:0,info:1,warn:2,error:3,silent:4},ke=class{constructor(){this._level=this._getLogLevel()}_getLogLevel(){if(process.env.ZIBBY_DEBUG==="true")return z.debug;if(process.env.ZIBBY_VERBOSE==="true")return z.info;let e=process.env.LOG_LEVEL?.toLowerCase();return e&&e in z?z[e]:z.info}_shouldLog(e){return z[e]>=this._level}_formatMessage(e,t,r={}){let o=new Date().toISOString(),i=`${this._getPrefix(e)} ${t}`;return Object.keys(r).length>0&&(i+=ae.dim(` ${JSON.stringify(r)}`)),i}_getPrefix(e){return{debug:ae.gray("[DEBUG]"),info:ae.cyan("[INFO]"),warn:ae.yellow("[WARN]"),error:ae.red("\u274C [ERROR]")}[e]||""}debug(e,t){this._shouldLog("debug")&&console.log(this._formatMessage("debug",e,t))}info(e,t){this._shouldLog("info")&&console.log(this._formatMessage("info",e,t))}warn(e,t){this._shouldLog("warn")&&console.warn(this._formatMessage("warn",e,t))}error(e,t){this._shouldLog("error")&&console.error(this._formatMessage("error",e,t))}setLevel(e){e in z&&(this._level=z[e])}getLevel(){return Object.keys(z).find(e=>z[e]===this._level)}},a=new ke;var G={ASSISTANT:"gpt-5.4-nano-2026-03-17",CLAUDE:"claude-sonnet-4-6",CURSOR:"auto",CODEX:"o4-mini",GEMINI:"gemini-
|
|
1
|
+
import{registerStrategy as me}from"@zibby/agent-workflow";import{AgentStrategy as kt,DEFAULT_OUTPUT_BASE as Pt,SESSION_INFO_FILE as Nt,STOP_REQUEST_FILE as Rt,getAllSkills as Mt,getSkill as We}from"@zibby/agent-workflow";import{spawn as Lt,execSync as Z}from"node:child_process";import{writeFileSync as Ze,readFileSync as qe,mkdirSync as Ve,existsSync as ce,accessSync as Qe,constants as et,unlinkSync as Dt}from"node:fs";import{join as Y,resolve as Ut}from"node:path";import{homedir as ue}from"node:os";import ae from"chalk";var z={debug:0,info:1,warn:2,error:3,silent:4},ke=class{constructor(){this._level=this._getLogLevel()}_getLogLevel(){if(process.env.ZIBBY_DEBUG==="true")return z.debug;if(process.env.ZIBBY_VERBOSE==="true")return z.info;let e=process.env.LOG_LEVEL?.toLowerCase();return e&&e in z?z[e]:z.info}_shouldLog(e){return z[e]>=this._level}_formatMessage(e,t,r={}){let o=new Date().toISOString(),i=`${this._getPrefix(e)} ${t}`;return Object.keys(r).length>0&&(i+=ae.dim(` ${JSON.stringify(r)}`)),i}_getPrefix(e){return{debug:ae.gray("[DEBUG]"),info:ae.cyan("[INFO]"),warn:ae.yellow("[WARN]"),error:ae.red("\u274C [ERROR]")}[e]||""}debug(e,t){this._shouldLog("debug")&&console.log(this._formatMessage("debug",e,t))}info(e,t){this._shouldLog("info")&&console.log(this._formatMessage("info",e,t))}warn(e,t){this._shouldLog("warn")&&console.warn(this._formatMessage("warn",e,t))}error(e,t){this._shouldLog("error")&&console.error(this._formatMessage("error",e,t))}setLevel(e){e in z&&(this._level=z[e])}getLevel(){return Object.keys(z).find(e=>z[e]===this._level)}},a=new ke;var G={ASSISTANT:"gpt-5.4-nano-2026-03-17",CLAUDE:"claude-sonnet-4-6",CURSOR:"auto",CODEX:"o4-mini",GEMINI:"gemini-3-pro",OPENAI_POSTPROCESSING:"gpt-4o-mini"};var Pe={auto:"claude-sonnet-4-6","opus-4.7":"claude-opus-4-7","opus-4-7":"claude-opus-4-7","sonnet-4.7":"claude-sonnet-4-7","sonnet-4-7":"claude-sonnet-4-7","sonnet-4.6":"claude-sonnet-4-6","sonnet-4-6":"claude-sonnet-4-6","opus-4.6":"claude-opus-4-6","opus-4-6":"claude-opus-4-6","sonnet-4.5":"claude-sonnet-4-5-20250929","sonnet-4-5":"claude-sonnet-4-5-20250929","opus-4.5":"claude-opus-4-5-20251101","opus-4-5":"claude-opus-4-5-20251101","haiku-4.5":"claude-haiku-4-5-20251001","haiku-4-5":"claude-haiku-4-5-20251001","claude-opus-4-7":"claude-opus-4-7","claude-sonnet-4-7":"claude-sonnet-4-7","claude-sonnet-4-6":"claude-sonnet-4-6","claude-opus-4-6":"claude-opus-4-6","claude-sonnet-4-5-20250929":"claude-sonnet-4-5-20250929","claude-opus-4-5-20251101":"claude-opus-4-5-20251101","claude-haiku-4-5-20251001":"claude-haiku-4-5-20251001","claude-opus-4-20250514":"claude-opus-4-20250514"},Ne={auto:"o4-mini","o4-mini":"o4-mini",o3:"o3","o3-mini":"o3-mini","codex-mini":"codex-mini-latest","gpt-4o":"gpt-4o","gpt-4o-mini":"gpt-4o-mini","gpt-5.2-codex":"gpt-5.2-codex","gpt-5.2":"gpt-5.2","gpt-5.3":"gpt-5.3","gpt-5.3-codex":"gpt-5.3-codex","gpt-5.4":"gpt-5.4","gpt-5.5":"gpt-5.5"},Ge={auto:"gemini-3-pro","gemini-3-pro":"gemini-3-pro","gemini-3-flash":"gemini-3-flash","gemini-2.5-pro":"gemini-2.5-pro","gemini-2.5-flash":"gemini-2.5-flash"},he={CURSOR_AGENT_DEFAULT:1200*1e3,OPENAI_REQUEST:18e4};var V=class n{constructor(){this.buffer="",this.extractedResult=null,this.rawText="",this.zodSchema=null,this.lastOutputLength=0,this.onToolCall=null,this._lastToolEmit=null}processChunk(e){if(!e)return null;this.buffer+=e;let t=this.buffer.split(`
|
|
2
2
|
`);this.buffer=t.pop()||"";let r="";for(let o of t)if(o.trim())try{let s=JSON.parse(o);this._emitToolCalls(s);let i=this.extractText(s);if(i){if(this.rawText&&i.startsWith(this.rawText)){let l=i.substring(this.rawText.length);this.rawText=i,r+=l}else(!this.rawText.includes(i)||i.length<20)&&(this.rawText+=i,r+=i);this.tryExtractResult(this.rawText)}else this.isValidResult(s)&&(this.rawText+=`${o}
|
|
3
3
|
`,r+=`${o}
|
|
4
4
|
`,this.extractedResult=s)}catch{if(o.includes('"text"')||o.includes('"content"')){let i=o.match(/"text"\s*:\s*"([^"]*)/),l=o.match(/"content"\s*:\s*"([^"]*)/),c=i?i[1]:l?l[1]:null;c&&!this.rawText.includes(c)&&(r+=c,this.rawText+=c)}}return r||null}flush(){if(!this.buffer.trim())return null;let e="";try{let t=JSON.parse(this.buffer);this._emitToolCalls(t);let r=this.extractText(t);r&&(this.rawText+=r,e+=r,this.tryExtractResult(r))}catch{this.rawText+=this.buffer,e+=this.buffer,this.tryExtractResult(this.buffer)}return this.buffer="",e||null}_emitToolCalls(e){if(!this.onToolCall)return;let t=(i,l)=>{if(!i)return;let c=`${i}:${JSON.stringify(l??{})}`;this._lastToolEmit!==c&&(this._lastToolEmit=c,this.onToolCall(i,l??void 0))},r=i=>{if(i!=null){if(typeof i=="object"&&!Array.isArray(i))return i;if(typeof i=="string")try{return JSON.parse(i)}catch{return}}};if(e.type==="tool_use"||e.type==="tool_call"){if(e.name){t(e.name,r(e.input??e.arguments));return}let i=e.tool_call;if(i&&typeof i=="object"&&!Array.isArray(i)){let l=Object.keys(i);if(l.length===1){let c=l[0],f=i[c],u=f&&typeof f=="object"?f.args??f.input??f:void 0;t(c,r(u))}return}return}if(Array.isArray(e.tool_calls)){for(let i of e.tool_calls)t(i.name,r(i.input??i.arguments));return}let o=e.message??e;if(Array.isArray(o?.tool_calls)){for(let i of o.tool_calls)t(i.name,r(i.input??i.arguments));return}let s=o?.content??e.content;if(Array.isArray(s))for(let i of s)(i.type==="tool_use"||i.type==="tool_call")&&i.name&&t(i.name,r(i.input??i.arguments))}extractText(e){if(e.type==="assistant"&&e.message?.content){let t=e.message.content;if(Array.isArray(t))return t.filter(r=>r.type==="text"&&r.text).map(r=>r.text).join("")}return e.type==="thinking"&&e.text||e.text?e.text:e.content&&typeof e.content=="string"?e.content:e.delta?e.delta:null}tryExtractResult(e){if(!e||typeof e!="string")return;let t=[],r=/```json\s*\n?([\s\S]*?)\n?```/g,o;for(;(o=r.exec(e))!==null;){let h=o[1].trim();try{JSON.parse(h),t.push({text:h,source:"markdown"})}catch{}}let s=0,i=0;for(;s<e.length&&(s=e.indexOf("{",s),s!==-1);){let h=0,g=s;for(let S=s;S<e.length;S++)if(e[S]==="{")h++;else if(e[S]==="}"&&(h--,h===0)){g=S,t.push({text:e.substring(s,g+1),source:"brace"}),i++;break}s=g+1}let l=this.extractedResult,c=l?JSON.stringify(l).length:0,f=0,u=-1;for(let h=0;h<t.length;h++){let g=t[h];try{let S=g.text.replace(/,(\s*[}\]])/g,"$1"),A=JSON.parse(S);this.isValidResult(A)&&(f++,c=JSON.stringify(A).length,l=A,u=h)}catch{}}l&&(this.extractedResult=l)}isValidResult(e){if(!e||typeof e!="object"||Array.isArray(e)||e.session_id||e.timestamp_ms||e.type||e.call_id||e.tool_call||e.result&&typeof e.result=="object"&&(e.result.success&&typeof e.result.success=="object"||e.result.error&&typeof e.result.error=="object")||e.args&&typeof e.args=="object")return!1;if(this.zodSchema)try{return this.zodSchema.parse(e),!0}catch{return!1}return!0}getResult(){return this.extractedResult}getRawText(){return this.rawText}static extractResult(e,t=null){let r=new n;r.zodSchema=t,r.processChunk(e),r.flush();let o=r.getResult();return!o&&process.env.LOG_LEVEL==="debug"&&console.error("[StreamingParser] No result extracted from",e?.length||0,"chars"),o}};import{zodToJsonSchema as mt}from"zod-to-json-schema";var ye=class{static generateFileOutputInstructions(e,t){let r;typeof e?.parse=="function"?r=mt(e,{target:"openApi3"}):r=e;let o=this._buildExample(r);return`
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import{AgentStrategy as ye,getSkill as F}from"@zibby/agent-workflow";import M from"chalk";var A={debug:0,info:1,warn:2,error:3,silent:4},Y=class{constructor(){this._level=this._getLogLevel()}_getLogLevel(){if(process.env.ZIBBY_DEBUG==="true")return A.debug;if(process.env.ZIBBY_VERBOSE==="true")return A.info;let e=process.env.LOG_LEVEL?.toLowerCase();return e&&e in A?A[e]:A.info}_shouldLog(e){return A[e]>=this._level}_formatMessage(e,t,s={}){let o=new Date().toISOString(),l=`${this._getPrefix(e)} ${t}`;return Object.keys(s).length>0&&(l+=M.dim(` ${JSON.stringify(s)}`)),l}_getPrefix(e){return{debug:M.gray("[DEBUG]"),info:M.cyan("[INFO]"),warn:M.yellow("[WARN]"),error:M.red("\u274C [ERROR]")}[e]||""}debug(e,t){this._shouldLog("debug")&&console.log(this._formatMessage("debug",e,t))}info(e,t){this._shouldLog("info")&&console.log(this._formatMessage("info",e,t))}warn(e,t){this._shouldLog("warn")&&console.warn(this._formatMessage("warn",e,t))}error(e,t){this._shouldLog("error")&&console.error(this._formatMessage("error",e,t))}setLevel(e){e in A&&(this._level=A[e])}getLevel(){return Object.keys(A).find(e=>A[e]===this._level)}},O=new Y;var q={ASSISTANT:"gpt-5.4-nano-2026-03-17",CLAUDE:"claude-sonnet-4-6",CURSOR:"auto",CODEX:"o4-mini",GEMINI:"gemini-
|
|
1
|
+
import{AgentStrategy as ye,getSkill as F}from"@zibby/agent-workflow";import M from"chalk";var A={debug:0,info:1,warn:2,error:3,silent:4},Y=class{constructor(){this._level=this._getLogLevel()}_getLogLevel(){if(process.env.ZIBBY_DEBUG==="true")return A.debug;if(process.env.ZIBBY_VERBOSE==="true")return A.info;let e=process.env.LOG_LEVEL?.toLowerCase();return e&&e in A?A[e]:A.info}_shouldLog(e){return A[e]>=this._level}_formatMessage(e,t,s={}){let o=new Date().toISOString(),l=`${this._getPrefix(e)} ${t}`;return Object.keys(s).length>0&&(l+=M.dim(` ${JSON.stringify(s)}`)),l}_getPrefix(e){return{debug:M.gray("[DEBUG]"),info:M.cyan("[INFO]"),warn:M.yellow("[WARN]"),error:M.red("\u274C [ERROR]")}[e]||""}debug(e,t){this._shouldLog("debug")&&console.log(this._formatMessage("debug",e,t))}info(e,t){this._shouldLog("info")&&console.log(this._formatMessage("info",e,t))}warn(e,t){this._shouldLog("warn")&&console.warn(this._formatMessage("warn",e,t))}error(e,t){this._shouldLog("error")&&console.error(this._formatMessage("error",e,t))}setLevel(e){e in A&&(this._level=A[e])}getLevel(){return Object.keys(A).find(e=>A[e]===this._level)}},O=new Y;var q={ASSISTANT:"gpt-5.4-nano-2026-03-17",CLAUDE:"claude-sonnet-4-6",CURSOR:"auto",CODEX:"o4-mini",GEMINI:"gemini-3-pro",OPENAI_POSTPROCESSING:"gpt-4o-mini"};var Ae={CURSOR_AGENT_DEFAULT:1200*1e3,OPENAI_REQUEST:18e4};var R=class{formatTools(e){throw new Error("formatTools() must be implemented")}hasToolCalls(e){throw new Error("hasToolCalls() must be implemented")}parseToolCalls(e){throw new Error("parseToolCalls() must be implemented")}getTextContent(e){throw new Error("getTextContent() must be implemented")}buildAssistantMessage(e){throw new Error("buildAssistantMessage() must be implemented")}buildToolResultMessage(e,t){throw new Error("buildToolResultMessage() must be implemented")}injectToolsIntoBody(e,t){throw new Error("injectToolsIntoBody() must be implemented")}};var $=class extends R{formatTools(e){return e.map(t=>({type:"function",function:{name:t.name,description:t.description,parameters:t.parameters||t.input_schema||{type:"object",properties:{}}}}))}hasToolCalls(e){let t=e.choices?.[0]?.message;return!!(t?.tool_calls&&t.tool_calls.length>0)}parseToolCalls(e){return(e.choices?.[0]?.message?.tool_calls||[]).map(s=>({id:s.id,name:s.function.name,args:JSON.parse(s.function.arguments||"{}")}))}getTextContent(e){return e.choices?.[0]?.message?.content||""}buildAssistantMessage(e){return e.choices?.[0]?.message}buildToolResultMessage(e,t){return{role:"tool",tool_call_id:e,content:typeof t=="string"?t:JSON.stringify(t)}}injectToolsIntoBody(e,t){return t.length>0&&(e.tools=t),e}};var I=class{async fetchCompletion(e,t,s={}){throw new Error("fetchCompletion() must be implemented")}async fetchStreamingCompletion(e,t,s={}){throw new Error("fetchStreamingCompletion() must be implemented")}};function N(n){return Buffer.byteLength(JSON.stringify(n),"utf8")}function U(n,e){let t=String(n||"");if(t.length<=e)return t;let s=Math.max(0,e-28);return`${t.slice(0,s)}
|
|
2
2
|
|
|
3
|
-
[truncated for size budget]`}function G(n,e=0){if(!n||typeof n!="object"||e>8)return n;if(Array.isArray(n))return n.map(s=>G(s,e+1));let t={};for(let[s,o]of Object.entries(n))s==="description"||s==="title"||s==="examples"||s==="default"||(t[s]=G(o,e+1));return t}function re(n=[]){return n.map(e=>({...e,function:{...e.function,description:U(e.function?.description||"",180),parameters:G(e.function?.parameters||{type:"object",properties:{}})}}))}function W(n){let e=new Set;for(let o of n)if(o.role==="assistant"&&Array.isArray(o.tool_calls))for(let r of o.tool_calls)e.add(r.id);let t=n.filter(o=>o.role==="tool"?e.has(o.tool_call_id):!0),s=new Set;for(let o of t)o.role==="tool"&&s.add(o.tool_call_id);return t.map(o=>{if(o.role!=="assistant"||!Array.isArray(o.tool_calls)||o.tool_calls.every(a=>s.has(a.id)))return o;let{tool_calls:l,...i}=o;return{...i,content:i.content||""}})}function X(n,e={}){let t=e.maxBytes||49e3,s=e.systemMaxChars||12e3,o={...n,messages:Array.isArray(n.messages)?[...n.messages]:[],tools:Array.isArray(n.tools)?re(n.tools):n.tools};o.messages.length>0&&o.messages[0]?.role==="system"&&(o.messages[0]={...o.messages[0],content:U(o.messages[0].content,s)});let r=!1;for(;N(o)>t&&o.messages.length>2;)o.messages.splice(1,1),r=!0;if(r&&(o.messages=W(o.messages)),N(o)>t&&o.messages.length>0&&(o.messages[0]={...o.messages[0],content:U(o.messages[0].content,6e3)},r=!0),N(o)>t){let l=o.messages.find(a=>a.role==="system")||o.messages[0],i=o.messages.slice(-2);o.messages=W([l,...i].filter(Boolean).map((a,c)=>({...a,content:U(a.content,c===0?4e3:8e3)}))),r=!0}return{body:o,meta:{bytes:N(o),trimmed:r,maxBytes:t,messageCount:o.messages.length}}}var V=n=>Buffer.byteLength(JSON.stringify(n),"utf8"),P=class extends I{async fetchCompletion(e,t,s={}){let o=V(e),{body:r,meta:l}=X(e,s.payloadCompaction);s.onBudget?.({streaming:!1,beforeBytes:o,meta:l});let i=this.#e(s),a=`${t.baseUrl}${s.chatCompletionsPath||"/v1/chat/completions"}`,c=await fetch(a,{method:"POST",headers:t.headers,body:JSON.stringify(r),signal:i});if(!c.ok){let u=await c.text();throw c.status===401||c.status===403?new Error("Session expired. Run `zibby login` to re-authenticate."):new Error(`Proxy error ${c.status}: ${u}`)}return c.json()}async fetchStreamingCompletion(e,t,s={}){let o={...e,stream:!0},r=V(o),{body:l,meta:i}=X(o,s.payloadCompaction);s.onBudget?.({streaming:!0,beforeBytes:r,meta:i});let a=this.#e(s),c=`${t.baseUrl}${s.chatCompletionsPath||"/v1/chat/completions"}`,u=await fetch(c,{method:"POST",headers:t.headers,body:JSON.stringify(l),signal:a});if(!u.ok){let
|
|
4
|
-
`);S=x.pop();for(let b of x){if(!b.startsWith("data: "))continue;let f=b.slice(6).trim();if(f==="[DONE]")continue;let p;try{p=JSON.parse(f)}catch{continue}let g=p.choices?.[0]?.delta;if(g&&(g.content&&(T+=g.content,s.onToken&&s.onToken(g.content)),g.tool_calls))for(let h of g.tool_calls){let w=h.index??0;
|
|
3
|
+
[truncated for size budget]`}function G(n,e=0){if(!n||typeof n!="object"||e>8)return n;if(Array.isArray(n))return n.map(s=>G(s,e+1));let t={};for(let[s,o]of Object.entries(n))s==="description"||s==="title"||s==="examples"||s==="default"||(t[s]=G(o,e+1));return t}function re(n=[]){return n.map(e=>({...e,function:{...e.function,description:U(e.function?.description||"",180),parameters:G(e.function?.parameters||{type:"object",properties:{}})}}))}function W(n){let e=new Set;for(let o of n)if(o.role==="assistant"&&Array.isArray(o.tool_calls))for(let r of o.tool_calls)e.add(r.id);let t=n.filter(o=>o.role==="tool"?e.has(o.tool_call_id):!0),s=new Set;for(let o of t)o.role==="tool"&&s.add(o.tool_call_id);return t.map(o=>{if(o.role!=="assistant"||!Array.isArray(o.tool_calls)||o.tool_calls.every(a=>s.has(a.id)))return o;let{tool_calls:l,...i}=o;return{...i,content:i.content||""}})}function X(n,e={}){let t=e.maxBytes||49e3,s=e.systemMaxChars||12e3,o={...n,messages:Array.isArray(n.messages)?[...n.messages]:[],tools:Array.isArray(n.tools)?re(n.tools):n.tools};o.messages.length>0&&o.messages[0]?.role==="system"&&(o.messages[0]={...o.messages[0],content:U(o.messages[0].content,s)});let r=!1;for(;N(o)>t&&o.messages.length>2;)o.messages.splice(1,1),r=!0;if(r&&(o.messages=W(o.messages)),N(o)>t&&o.messages.length>0&&(o.messages[0]={...o.messages[0],content:U(o.messages[0].content,6e3)},r=!0),N(o)>t){let l=o.messages.find(a=>a.role==="system")||o.messages[0],i=o.messages.slice(-2);o.messages=W([l,...i].filter(Boolean).map((a,c)=>({...a,content:U(a.content,c===0?4e3:8e3)}))),r=!0}return{body:o,meta:{bytes:N(o),trimmed:r,maxBytes:t,messageCount:o.messages.length}}}var V=n=>Buffer.byteLength(JSON.stringify(n),"utf8"),P=class extends I{async fetchCompletion(e,t,s={}){let o=V(e),{body:r,meta:l}=X(e,s.payloadCompaction);s.onBudget?.({streaming:!1,beforeBytes:o,meta:l});let i=this.#e(s),a=`${t.baseUrl}${s.chatCompletionsPath||"/v1/chat/completions"}`,c=await fetch(a,{method:"POST",headers:t.headers,body:JSON.stringify(r),signal:i});if(!c.ok){let u=await c.text();throw c.status===401||c.status===403?new Error("Session expired. Run `zibby login` to re-authenticate."):new Error(`Proxy error ${c.status}: ${u}`)}return c.json()}async fetchStreamingCompletion(e,t,s={}){let o={...e,stream:!0},r=V(o),{body:l,meta:i}=X(o,s.payloadCompaction);s.onBudget?.({streaming:!0,beforeBytes:r,meta:i});let a=this.#e(s),c=`${t.baseUrl}${s.chatCompletionsPath||"/v1/chat/completions"}`,u=await fetch(c,{method:"POST",headers:t.headers,body:JSON.stringify(l),signal:a});if(!u.ok){let E=await u.text();throw u.status===401||u.status===403?new Error("Session expired. Run `zibby login` to re-authenticate."):new Error(`Proxy error ${u.status}: ${E}`)}let m=u.body.getReader(),_=new TextDecoder,S="",T="",k=new Map;for(;;){let{done:E,value:d}=await m.read();if(E)break;S+=_.decode(d,{stream:!0});let x=S.split(`
|
|
4
|
+
`);S=x.pop();for(let b of x){if(!b.startsWith("data: "))continue;let f=b.slice(6).trim();if(f==="[DONE]")continue;let p;try{p=JSON.parse(f)}catch{continue}let g=p.choices?.[0]?.delta;if(g&&(g.content&&(T+=g.content,s.onToken&&s.onToken(g.content)),g.tool_calls))for(let h of g.tool_calls){let w=h.index??0;k.has(w)||k.set(w,{id:"",name:"",args:""});let C=k.get(w);h.id&&(C.id=h.id),h.function?.name&&(C.name=h.function.name),h.function?.arguments!=null&&(C.args+=h.function.arguments)}}}if(k.size>0){let E=[...k.entries()].sort(([d],[x])=>d-x).map(([,d])=>({id:d.id,type:"function",function:{name:d.name,arguments:d.args}}));return{choices:[{message:{role:"assistant",content:T||null,tool_calls:E}}]}}return{choices:[{message:{role:"assistant",content:T}}]}}#e(e={}){let t=[e.signal,e.timeout?AbortSignal.timeout(e.timeout):null].filter(Boolean);return t.length>1?AbortSignal.any(t):t[0]||void 0}};import{Client as ie}from"@modelcontextprotocol/sdk/client/index.js";import{StdioClientTransport as le}from"@modelcontextprotocol/sdk/client/stdio.js";var D=class{#e=new Map;async ensureServer(e,t){if(this.#e.has(e))return this.#e.get(e);let{command:s,args:o=[],env:r={}}=t;O.debug(`[MCP] Starting ${e}: ${s} ${o.join(" ")}`);let l=new le({command:s,args:o,env:{...process.env,...r}}),i=new ie({name:`zibby-chat-${e}`,version:"1.0.0"},{capabilities:{}});await i.connect(l);let a={client:i,transport:l,serverConfig:t};return this.#e.set(e,a),a}async callTool(e,t,s={}){let o=this.#e.get(e);if(!o)throw new Error(`MCP server "${e}" not running`);O.debug(`[MCP] ${e}.${t}(${JSON.stringify(s).slice(0,200)})`);let r=await o.client.callTool({name:t,arguments:s});return{text:r.content?.filter(i=>i.type==="text").map(i=>i.text).join(`
|
|
5
5
|
`)||"",isError:r.isError||!1}}isRunning(e){return this.#e.has(e)}async stopServer(e){let t=this.#e.get(e);if(t){try{await t.client.close()}catch(s){O.debug(`[MCP] Error closing ${e}: ${s.message}`)}this.#e.delete(e)}}async stopAll(){let e=[...this.#e.keys()];await Promise.allSettled(e.map(t=>this.stopServer(t)))}};import{existsSync as ae,readFileSync as ce}from"node:fs";import{join as ue}from"node:path";import{homedir as fe}from"node:os";function me(){try{let n=ue(fe(),".zibby","config.json");return ae(n)?JSON.parse(ce(n,"utf-8")):{}}catch{return{}}}function j(n){return String(n||"").replace(/\/v1\/?$/,"")}function de(n,e){let t=process.env.OPENAI_PROXY_URL;if(t)return j(t);if(n==="session")return e.proxyUrl?j(e.proxyUrl):`${(process.env.ZIBBY_API_URL||"https://api-prod.zibby.app").replace(/\/$/,"")}/openai-proxy`;if(n==="byok"){let s=process.env.OPENAI_BASE_URL;return j(s||"https://api.openai.com")}return j(t||"")}function Z(){let n=me(),e=process.env.ZIBBY_USER_TOKEN||n.sessionToken||null,t=process.env.OPENAI_API_KEY||null,s=(process.env.ASSISTANT_AUTH_MODE||"").trim().toLowerCase(),o=process.env.OPENAI_PROXY_NO_AUTH==="true",r=process.env.OPENAI_PROXY_URL,l="session";s==="byok"||s==="local"||s==="session"?l=s:e?l="session":t?l="byok":r&&o&&(l="local");let i=de(l,n),a={"Content-Type":"application/json"};if(l==="session"){if(!e)return{ok:!1,mode:l,reason:"missing_session_token"};a.Authorization=`Bearer ${e}`}else if(l==="byok"){if(!t)return{ok:!1,mode:l,reason:"missing_openai_api_key"};a.Authorization=`Bearer ${t}`}else if(l==="local"){if(!i)return{ok:!1,mode:l,reason:"missing_openai_proxy_url"};!o&&t&&(a.Authorization=`Bearer ${t}`)}return i?{ok:!0,mode:l,baseUrl:i,headers:a,tokenPreview:a.Authorization?`***${a.Authorization.slice(-4)}`:"none"}:{ok:!1,mode:l,reason:"missing_base_url"}}function z(n,e){let t=String(n??"");return t.length<=e?t:`${t.slice(0,Math.max(0,e-30))}
|
|
6
6
|
|
|
7
|
-
[tool result truncated for size]`}function pe(n,e){if(typeof n=="string")return z(n,e);try{return z(JSON.stringify(n),e)}catch{return z(String(n),e)}}function Q(n){let e=new Set;for(let o of n)if(o.role==="assistant"&&Array.isArray(o.tool_calls))for(let r of o.tool_calls)e.add(r.id);let t=n.filter(o=>o.role==="tool"?e.has(o.tool_call_id):!0),s=new Set;for(let o of t)o.role==="tool"&&s.add(o.tool_call_id);return t.map(o=>{if(o.role!=="assistant"||!Array.isArray(o.tool_calls)||o.tool_calls.every(a=>s.has(a.id)))return o;let{tool_calls:l,...i}=o;return{...i,content:i.content||""}})}function ge(n){let e=Array.isArray(n?.messages)?n.messages:[],t=e.find(r=>r.role==="system"),s=e.slice(-4).map(r=>({...r,content:z(r.content,r.role==="tool"?1200:2500)}));s=Q(s);let o={...n,messages:[t,...s].filter(Boolean)};return delete o.tools,o}async function he({body:n,streaming:e,auth:t,options:s,fetchCompletion:o,fetchStreamingCompletion:r,onFallbackLog:l}){try{return e?await r(n,t,s):await o(n,t,s)}catch(i){let a=String(i?.message||i||"");if(!/proxy error 413|payload too large/i.test(a))throw i;let c=ge(n);return typeof l=="function"&&l(n,c),{data:e?await r(c,t,s):await o(c,t,s),fallback:c}}}async function ee({body:n,auth:e,options:t,streaming:s,toolContext:o,activeSkills:r,round:l,verbose:i,dependencies:a,config:c={}}){let u=c.maxToolResultChars||3e3,{fetchCompletion:m,fetchStreamingCompletion:_,onFallbackLog:S,hasToolCalls:T,getTextContent:
|
|
7
|
+
[tool result truncated for size]`}function pe(n,e){if(typeof n=="string")return z(n,e);try{return z(JSON.stringify(n),e)}catch{return z(String(n),e)}}function Q(n){let e=new Set;for(let o of n)if(o.role==="assistant"&&Array.isArray(o.tool_calls))for(let r of o.tool_calls)e.add(r.id);let t=n.filter(o=>o.role==="tool"?e.has(o.tool_call_id):!0),s=new Set;for(let o of t)o.role==="tool"&&s.add(o.tool_call_id);return t.map(o=>{if(o.role!=="assistant"||!Array.isArray(o.tool_calls)||o.tool_calls.every(a=>s.has(a.id)))return o;let{tool_calls:l,...i}=o;return{...i,content:i.content||""}})}function ge(n){let e=Array.isArray(n?.messages)?n.messages:[],t=e.find(r=>r.role==="system"),s=e.slice(-4).map(r=>({...r,content:z(r.content,r.role==="tool"?1200:2500)}));s=Q(s);let o={...n,messages:[t,...s].filter(Boolean)};return delete o.tools,o}async function he({body:n,streaming:e,auth:t,options:s,fetchCompletion:o,fetchStreamingCompletion:r,onFallbackLog:l}){try{return e?await r(n,t,s):await o(n,t,s)}catch(i){let a=String(i?.message||i||"");if(!/proxy error 413|payload too large/i.test(a))throw i;let c=ge(n);return typeof l=="function"&&l(n,c),{data:e?await r(c,t,s):await o(c,t,s),fallback:c}}}async function ee({body:n,auth:e,options:t,streaming:s,toolContext:o,activeSkills:r,round:l,verbose:i,dependencies:a,config:c={}}){let u=c.maxToolResultChars||3e3,{fetchCompletion:m,fetchStreamingCompletion:_,onFallbackLog:S,hasToolCalls:T,getTextContent:k,parseToolCalls:E,buildAssistantMessage:d,buildToolResultMessage:x,executeTool:b,onToolCallLog:f,injectTools:p}=a;Array.isArray(n?.messages)&&(n.messages=Q(n.messages));let g=await he({body:n,streaming:s,auth:e,options:t,fetchCompletion:m,fetchStreamingCompletion:_,onFallbackLog:S}),h=g?.data||g;if(!T(h))return{done:!0,text:k(h),body:g?.fallback||n};let w=E(h),C=g?.fallback||n;C.messages.push(d(h)),i&&typeof f=="function"&&f(w);let L=await Promise.all(w.map((y,K)=>(typeof t.onToolCall=="function"&&t.onToolCall(y.name,y.args,{round:l,index:K,total:w.length}),b(y,o))));for(let y=0;y<w.length;y++){let ne=w[y].name==="get_skill_context"?typeof L[y]=="string"?L[y]:JSON.stringify(L[y]):pe(L[y],u);C.messages.push(x(w[y].id,ne))}return typeof t.onToolCall=="function"&&t.onToolCall(null),p(C,r),{done:!1,body:C}}function te(n){let e=`${n}_POOL`,t=process.env[e];if(!t||typeof t!="string")return{picked:null,count:0,dispose:()=>{}};let s=t.split(/[,\n]+/).map(l=>l.trim()).filter(Boolean);if(s.length===0)return{picked:null,count:0,dispose:()=>{}};let o=s[Math.floor(Math.random()*s.length)],r=process.env[n];return process.env[n]=o,O.debug(`[auth-pool] ${n}: picked 1 of ${s.length} from pool (***${o.slice(-4)})`),{picked:o,count:s.length,dispose(){r===void 0?delete process.env[n]:process.env[n]=r}}}var _e=q.ASSISTANT,Se=15,H="get_skill_context";function B(n){!n||typeof n!="object"||(n.type==="object"&&n.properties&&(n.required=Object.keys(n.properties),n.additionalProperties=!1,Object.values(n.properties).forEach(B)),n.type==="array"&&n.items&&B(n.items),n.anyOf&&n.anyOf.forEach(B),n.oneOf&&n.oneOf.forEach(B),n.allOf&&n.allOf.forEach(B))}var oe={maxBytes:49e3,systemMaxChars:12e3},v=()=>process.env.ZIBBY_VERBOSE==="true"||process.env.ZIBBY_DEBUG==="true",Te=n=>Buffer.byteLength(JSON.stringify(n),"utf8");function J(n){return Array.isArray(n)?new Set(n.map(e=>String(e||"").trim()).filter(Boolean)):new Set}function xe(n){return Array.isArray(n)?n.map(e=>String(e||"").trim()).filter(Boolean):[]}var se=class extends ye{#e;#t;#o=new D;constructor(e=null){super("assistant","Zibby Assistant",200),e&&typeof e=="object"&&(e.toolProvider||e.completionProvider)?(this.#e=e.toolProvider||new $,this.#t=e.completionProvider||new P):(this.#e=e||new $,this.#t=new P)}canHandle(e){return Z().ok}async invoke(e,t={}){let s=te("OPENAI_API_KEY");try{let o=t.model&&t.model!=="auto"?t.model:_e,r=Z();if(!r.ok)throw r.reason==="missing_session_token"?new Error("Login required. Run `zibby login` to authenticate."):r.reason==="missing_openai_api_key"?new Error("Missing OPENAI_API_KEY for BYOK mode."):r.reason==="missing_openai_proxy_url"?new Error("Missing OPENAI_PROXY_URL for local mode."):new Error(`Assistant auth unavailable (${r.reason}).`);let l=t.messages||[{role:"user",content:e}],i=r.baseUrl,a=v();if(a?await this.#p(l,o,i,r.tokenPreview||"none"):O.debug(`[Assistant] ${i} | model: ${o} | messages: ${l.length}`),t.schema)return this.#c(o,l,r,t);let c=t.activeSkills||[],u=this.#f(t),m=this.#m(c,u),_=this.#d(m),S=this.#u(t),T={...t,payloadCompaction:S},k={activeSkills:m,options:T,executionRegistry:_,capabilityPolicy:u},E=!!t.stream,d={model:o,messages:[...l],stream:!1};this.#n(d,m,u);for(let x=0;x<Se;x++){if(t.signal?.aborted){let f=new Error("Aborted via signal");throw f.name="AbortError",f}let b=await ee({body:d,auth:r,options:T,streaming:E,toolContext:k,activeSkills:m,round:x,verbose:a,dependencies:{fetchCompletion:this.#r.bind(this),fetchStreamingCompletion:this.#a.bind(this),onFallbackLog:(f,p)=>{v()&&console.log(`413 fallback: messages ${f.messages.length} -> ${p.messages.length}, bytes=${Te(p)}`)},hasToolCalls:f=>this.#e.hasToolCalls(f),getTextContent:f=>this.#e.getTextContent(f),parseToolCalls:f=>this.#e.parseToolCalls(f),buildAssistantMessage:f=>this.#e.buildAssistantMessage(f),buildToolResultMessage:(f,p)=>this.#e.buildToolResultMessage(f,p),executeTool:(f,p)=>this.#l(f,p),onToolCallLog:async f=>{let p=(await import("chalk")).default;console.log(p.dim(` ${f.map(g=>`${g.name}(${JSON.stringify(g.args).slice(0,80)})`).join(", ")}`))},injectTools:(f,p)=>this.#n(f,p,u)},config:{maxToolResultChars:t.maxToolResultChars||3e3}});if(b.done)return b.text;d.messages=b.body.messages,b.body.tools?d.tools=b.body.tools:delete d.tools}return"I hit my tool-calling limit for this turn. Please try again."}finally{s.dispose()}}async cleanup(){await this.#o.stopAll()}#n(e,t,s=null){let o=this.#i(t,s),r=this.#e.formatTools(o);this.#e.injectToolsIntoBody(e,r)}#i(e,t=null){let s=[],o=new Set;for(let r of e){let l=F(r);if(l?.tools?.length)for(let i of l.tools)this.#s(i.name,t)&&(o.has(i.name)||(o.add(i.name),s.push({name:i.name,description:i.description,parameters:i.parameters||i.input_schema||{type:"object",properties:{}}})))}return!t?.disableSkillContextTool&&this.#s(H,t)&&s.push({name:H,description:"Fetch full prompt guidance/instructions for one installed skill on demand. Use this before making complex tool decisions if guidance is needed.",parameters:{type:"object",properties:{skillId:{type:"string",description:"Installed skill id to inspect (e.g. jira, github, runner, chat-memory)"}},required:["skillId"]}}),s}async#l(e,t){let{activeSkills:s,options:o,executionRegistry:r,capabilityPolicy:l}=t;if(!this.#s(e.name,l))return`Tool "${e.name}" blocked by policy`;if(e.name===H){let c=String(e.args?.skillId||"").trim();if(!c)return JSON.stringify({error:"skillId is required"});if(!s.includes(c))return JSON.stringify({error:`Skill "${c}" is not active`,activeSkills:s});let u=F(c);if(!u)return JSON.stringify({error:`Skill "${c}" not found`});let m=typeof u.promptFragment=="function"?u.promptFragment():u.promptFragment||"",_=(u.tools||[]).map(T=>T.name),S=JSON.stringify({skillId:c,description:u.description||"",toolNames:_,promptFragment:m||""});return v()&&(console.log(`
|
|
8
8
|
\u{1F4D6} get_skill_context("${c}") \u2192 ${S.length} chars (fragment: ${m.length} chars)`),console.log(` tools: [${_.join(", ")}]`),console.log(` fragment preview: ${m.slice(0,200).replace(/\n/g,"\\n")}\u2026
|
|
9
9
|
`)),S}let i=r?.get(e.name)||null;if(!i)return`Unknown tool: ${e.name}`;let a=F(i.skillId);if(!a)return`Skill "${i.skillId}" not found for tool "${e.name}"`;if(i.mode==="handler")try{return a.handleToolCall(e.name,e.args,t)}catch(c){return`Error in ${e.name}: ${c.message}`}if(i.mode==="mcp")try{if(!this.#o.isRunning(a.serverName)){let u=a.resolve(o);if(!u)return`Skill "${i.skillId}" is not available (cannot start server)`;await this.#o.ensureServer(a.serverName,u)}let c=await this.#o.callTool(a.serverName,e.name,e.args);return c.text||(c.isError?"Tool call failed":"Done")}catch(c){return`MCP error (${a.serverName}): ${c.message}`}return`Skill "${i.skillId}" owns tool "${e.name}" but has no execution mode`}async#a(e,t,s){return this.#t.fetchStreamingCompletion(e,t,{...s,onBudget:({beforeBytes:o,meta:r})=>{v()&&console.log(`payload bytes (stream) before=${o} after=${r.bytes} trimmed=${r.trimmed} messages=${r.messageCount}`)}})}async#r(e,t,s){return this.#t.fetchCompletion(e,t,{...s,onBudget:({beforeBytes:o,meta:r})=>{v()&&console.log(`payload bytes before=${o} after=${r.bytes} trimmed=${r.trimmed} messages=${r.messageCount}`)}})}async#c(e,t,s,o){let{zodToJsonSchema:r}=await import("zod-to-json-schema"),l=typeof o.schema?.parse=="function",i=l?r(o.schema):o.schema;delete i.$schema,B(i);let a={model:e,messages:t,stream:!1,response_format:{type:"json_schema",json_schema:{name:"extract",schema:i,strict:!0}}},c=await this.#r(a,s,o),u=this.#e.getTextContent(c),m=JSON.parse(u),_=l?o.schema.parse(m):m;return{raw:u,structured:_}}#u(e={}){let t=e?.config?.agent?.assistant?.payloadCompaction||{};return{maxBytes:Number(t.maxBytes||e.maxPayloadBytes||oe.maxBytes),systemMaxChars:Number(t.systemMaxChars||oe.systemMaxChars)}}#f(e={}){let t=e?.config?.agent?.assistant?.toolPolicy||{};return{allowTools:J(t.allowTools||e.allowTools),denyTools:J(t.denyTools||e.denyTools),denyPrefixes:xe(t.denyPrefixes||e.denyToolPrefixes),includeSkills:J(t.includeSkills||e.includeSkills),excludeSkills:J(t.excludeSkills||e.excludeSkills),disableSkillContextTool:!!(t.disableSkillContextTool||e.disableSkillContextTool)}}#m(e,t){let s=t?.includeSkills||new Set,o=t?.excludeSkills||new Set;return s.size===0&&o.size===0?e:e.filter(r=>!(s.size>0&&!s.has(r)||o.has(r)))}#s(e,t){let s=String(e||"").trim();if(!s)return!1;let o=t?.allowTools;if(o&&o.size>0&&!o.has(s))return!1;let r=t?.denyTools;return!(r&&r.has(s)||(t?.denyPrefixes||[]).some(i=>s.startsWith(i)))}#d(e){let t=new Map,s=[];for(let o of e){let r=F(o);if(!r?.tools?.length)continue;let l=typeof r.handleToolCall=="function"?"handler":r.serverName&&typeof r.resolve=="function"?"mcp":null;if(l)for(let i of r.tools){let a=String(i?.name||"").trim();if(a){if(t.has(a)){s.push({tool:a,winner:t.get(a).skillId,skipped:o});continue}t.set(a,{skillId:o,mode:l})}}}if(s.length>0&&v()){let o=s.slice(0,5).map(r=>`${r.tool}:${r.winner}>${r.skipped}`).join(", ");console.log(`tool registry collisions: ${o}${s.length>5?" ...":""}`)}return t}async#p(e,t,s,o){console.log(`
|
|
10
10
|
\u25C6 Model: ${t} | proxy: ${s} | token: ${o||"none"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import{AgentStrategy as re,getSkill as ie}from"@zibby/agent-workflow";import{query as ce}from"@anthropic-ai/claude-agent-sdk";import{zodToJsonSchema as
|
|
1
|
+
import{AgentStrategy as re,getSkill as ie}from"@zibby/agent-workflow";import{query as ce}from"@anthropic-ai/claude-agent-sdk";import{zodToJsonSchema as ae}from"zod-to-json-schema";import{writeFileSync as P,mkdirSync as R,existsSync as Q,readFileSync as V}from"fs";import{homedir as ee}from"os";import{join as E}from"path";import N from"chalk";var m={debug:0,info:1,warn:2,error:3,silent:4},b=class{constructor(){this._level=this._getLogLevel()}_getLogLevel(){if(process.env.ZIBBY_DEBUG==="true")return m.debug;if(process.env.ZIBBY_VERBOSE==="true")return m.info;let e=process.env.LOG_LEVEL?.toLowerCase();return e&&e in m?m[e]:m.info}_shouldLog(e){return m[e]>=this._level}_formatMessage(e,s,i={}){let n=new Date().toISOString(),d=`${this._getPrefix(e)} ${s}`;return Object.keys(i).length>0&&(d+=N.dim(` ${JSON.stringify(i)}`)),d}_getPrefix(e){return{debug:N.gray("[DEBUG]"),info:N.cyan("[INFO]"),warn:N.yellow("[WARN]"),error:N.red("\u274C [ERROR]")}[e]||""}debug(e,s){this._shouldLog("debug")&&console.log(this._formatMessage("debug",e,s))}info(e,s){this._shouldLog("info")&&console.log(this._formatMessage("info",e,s))}warn(e,s){this._shouldLog("warn")&&console.warn(this._formatMessage("warn",e,s))}error(e,s){this._shouldLog("error")&&console.error(this._formatMessage("error",e,s))}setLevel(e){e in m&&(this._level=m[e])}getLevel(){return Object.keys(m).find(e=>m[e]===this._level)}},r=new b;import{timeline as I,Timeline as _e,WORKFLOW_GRAPH_LOG_MARKER_PREFIX as he}from"@zibby/agent-workflow";var x={ASSISTANT:"gpt-5.4-nano-2026-03-17",CLAUDE:"claude-sonnet-4-6",CURSOR:"auto",CODEX:"o4-mini",GEMINI:"gemini-3-pro",OPENAI_POSTPROCESSING:"gpt-4o-mini"};var M={auto:"claude-sonnet-4-6","opus-4.7":"claude-opus-4-7","opus-4-7":"claude-opus-4-7","sonnet-4.7":"claude-sonnet-4-7","sonnet-4-7":"claude-sonnet-4-7","sonnet-4.6":"claude-sonnet-4-6","sonnet-4-6":"claude-sonnet-4-6","opus-4.6":"claude-opus-4-6","opus-4-6":"claude-opus-4-6","sonnet-4.5":"claude-sonnet-4-5-20250929","sonnet-4-5":"claude-sonnet-4-5-20250929","opus-4.5":"claude-opus-4-5-20251101","opus-4-5":"claude-opus-4-5-20251101","haiku-4.5":"claude-haiku-4-5-20251001","haiku-4-5":"claude-haiku-4-5-20251001","claude-opus-4-7":"claude-opus-4-7","claude-sonnet-4-7":"claude-sonnet-4-7","claude-sonnet-4-6":"claude-sonnet-4-6","claude-opus-4-6":"claude-opus-4-6","claude-sonnet-4-5-20250929":"claude-sonnet-4-5-20250929","claude-opus-4-5-20251101":"claude-opus-4-5-20251101","claude-haiku-4-5-20251001":"claude-haiku-4-5-20251001","claude-opus-4-20250514":"claude-opus-4-20250514"};var Oe={CURSOR_AGENT_DEFAULT:1200*1e3,OPENAI_REQUEST:18e4};function v(l){let e=`${l}_POOL`,s=process.env[e];if(!s||typeof s!="string")return{picked:null,count:0,dispose:()=>{}};let i=s.split(/[,\n]+/).map(d=>d.trim()).filter(Boolean);if(i.length===0)return{picked:null,count:0,dispose:()=>{}};let n=i[Math.floor(Math.random()*i.length)],o=process.env[l];return process.env[l]=n,r.debug(`[auth-pool] ${l}: picked 1 of ${i.length} from pool (***${n.slice(-4)})`),{picked:n,count:i.length,dispose(){o===void 0?delete process.env[l]:process.env[l]=o}}}var z=class extends re{constructor(){super("claude","Claude (Anthropic API)",50)}canHandle(e){let s=!!process.env.ANTHROPIC_API_KEY||!!process.env.ANTHROPIC_API_KEY_POOL,i=!!process.env.CLAUDE_CODE_OAUTH_TOKEN||!!process.env.CLAUDE_CODE_OAUTH_TOKEN_POOL,n=!!process.env.ANTHROPIC_AUTH_TOKEN||!!process.env.ANTHROPIC_AUTH_TOKEN_POOL,o=s||i||n;return o||r.debug("ClaudeAgentStrategy: no credentials. Set one of ANTHROPIC_API_KEY / CLAUDE_CODE_OAUTH_TOKEN / ANTHROPIC_AUTH_TOKEN (or a *_POOL variant for multi-token rotation)."),o}async invoke(e,s={}){let{model:i,workspace:n=process.cwd(),schema:o=null,images:d=[],skills:p=null,sessionPath:_=null,nodeName:w=null,timeout:U,config:K={},signal:S=null,sessionId:J,resume:F,forkSession:te,sessionStore:H}=s,f=i;(!f||f==="auto")&&(r.debug(`Model is '${f||"undefined"}', using default: ${x.CLAUDE}`),f=x.CLAUDE);let T=M[f]||f;M[f]&&f!==T&&r.debug(`Mapped model: ${f} \u2192 ${T}`);let oe=[v("ANTHROPIC_API_KEY"),v("CLAUDE_CODE_OAUTH_TOKEN"),v("ANTHROPIC_AUTH_TOKEN")];try{r.debug(`Invoking Claude Agent SDK with model: ${T}, skills: ${JSON.stringify(p)}`);let O=process.env.CLAUDE_CODE_OAUTH_TOKEN,j=process.env.ANTHROPIC_API_KEY,B=process.env.ANTHROPIC_AUTH_TOKEN;process.env.CLAUDE_CODE_CREDENTIALS_JSON?de(process.env.CLAUDE_CODE_CREDENTIALS_JSON):O&&ue(O,process.env.__ZIBBY_CLAUDE_PLAN);let $=process.env.__ZIBBY_CLAUDE_PLAN,G=$?$.charAt(0).toUpperCase()+$.slice(1):null,y;O?y=G?`Claude ${G} plan \xB7 ***${O.slice(-4)}`:`Subscription \xB7 ***${O.slice(-4)}`:j?y=`API key \xB7 ***${j.slice(-4)}`:B?y=`Bearer \xB7 ***${B.slice(-4)}`:y="NONE \u2014 request will fail";let h=(await import("chalk")).default;console.log(""),console.log(` ${h.cyan("\u25C6")} ${h.bold(T)}`),console.log(` ${h.dim("Auth: ")}${y}`),console.log(` ${h.dim("Workdir: ")}${n}`),console.log(""),console.log(h.bold("Prompt sent to LLM:")),console.log(h.dim("\u2500".repeat(60))),console.log(h.dim(e)),console.log(h.dim("\u2500".repeat(60)));let{allowedTools:W,mcpServers:C}=this._resolveSkills(p,{sessionPath:_,workspace:n,nodeName:w});try{let g={cwd:n,allowedTools:W,settings:{permissions:{allow:["Bash(*)","Read(*)","Write(*)","Edit(*)","MultiEdit(*)","NotebookEdit(*)","Grep(*)","Glob(*)","WebFetch(*)","WebSearch(*)","Task(*)","TodoWrite(*)","Skill(*)"]}},model:T,...Object.keys(C).length>0&&{mcpServers:C},...J&&{sessionId:J},...F&&{resume:F},...te&&{forkSession:!0},...H&&{sessionStore:H}};if(o){let A=typeof o.parse=="function"?ae(o,{target:"openApi3"}):o;g.outputFormat={type:"json_schema",schema:A},r.debug("Structured output enforced via SDK outputFormat")}r.debug(`Agent SDK options: ${JSON.stringify({cwd:g.cwd,toolCount:W.length,permissionMode:g.permissionMode,model:g.model,hasOutputFormat:!!g.outputFormat})}`);let L="",Y=0,Z=[];r.debug("Starting Claude Agent SDK query stream");let q;try{q=ce({prompt:e,options:g})}catch(t){throw r.error(`Failed to initialize Claude Agent SDK: ${t.message}`),t}let X=null,D=0,se=3;if(S?.aborted){let t=new Error("Aborted via signal");throw t.name="AbortError",t}try{for await(let t of q){if(S?.aborted){let a=new Error("Aborted via signal");throw a.name="AbortError",a}if(Z.push(t),t.type==="system"&&t.subtype==="init"){let a=t.mcp_servers||[];if(a.length>0){let c=a.map(u=>`${u.name}=${u.status}${u.error?` (${String(u.error).slice(0,120)})`:""}`).join(", ");r.info(`[mcp] SDK init \u2014 ${a.length} server(s): ${c}`);for(let u of a)u.status!=="connected"&&r.warn(`[mcp] server '${u.name}' did not connect: status=${u.status}`,{name:u.name,status:u.status,error:u.error})}else Object.keys(C||{}).length>0&&r.warn(`[mcp] SDK init returned no mcp_servers despite passing ${Object.keys(C).length} server(s) \u2014 SDK version may not expose this field, or config was dropped`);if(Array.isArray(t.tools)){let c=t.tools.filter(u=>u.startsWith("mcp__"));c.length>0?r.info(`[mcp] tools visible to model: ${c.join(", ")}`):Object.keys(C||{}).length>0&&r.warn("[mcp] no mcp__* tools in model's tool list \u2014 MCP servers configured but tools didn't reach the prompt")}}if(t.type==="error"||t.error){let a=t.error?.message||t.error||t.message||"Unknown API error";try{r.error("SDK error event raw payload",{fullMessage:JSON.stringify(t,null,2)})}catch{}throw new Error(typeof a=="string"?a:JSON.stringify(a))}let A=JSON.stringify(t.message?.content||t.text||"").slice(0,200);if(A===X){if(D++,D>=se){let a=(t.message?.content?.[0]?.text||t.text||"unknown").slice(0,100);throw new Error(`API stuck in loop (${D}x repeated): ${a}`)}}else X=A,D=1;if(t.type==="assistant"||t.constructor?.name==="AssistantMessage"){let a=t.message?.content||t.content||[];for(let c of a)if(c.type==="thinking"&&c.thinking)console.log(`${c.thinking.substring(0,200)}${c.thinking.length>200?"...":""}`);else if(c.type==="text"&&c.text)L+=c.text,c.text.length<500?console.log(`${c.text}`):console.log(`${c.text.substring(0,200)}... (${c.text.length} chars)`);else if(c.type==="tool_use"){Y++,c.name.includes("memory")?I.stepMemory(`Tool: ${c.name}`):I.stepTool(`Tool: ${c.name}`);let ne=JSON.stringify(c.input).substring(0,100);console.log(` Input: ${ne}${JSON.stringify(c.input).length>100?"...":""}`)}}else if(!(t.type==="user"&&t.tool_use_result)){if(t.type==="result"||t.constructor?.name==="ResultMessage"){let a=t.result||t.text||t.content||L;try{le({message:t,sessionPath:_,nodeName:w,model:f,toolCallCount:Y})}catch(c){r.debug(`usage.json write failed: ${c.message}`)}if(o){if(t.structured_output){r.debug("Using SDK native structured_output");let u=typeof o.parse=="function"?o.parse(t.structured_output):t.structured_output;return{raw:a,structured:u}}if(a){let c=this._extractJson(a,o);if(c)return{raw:a,structured:c}}r.warn(`Could not extract structured output \u2014 returning raw text (${(a||"").length} chars)`)}return a||""}}}if(r.warn(`Agent SDK ended without result. Collected ${Z.length} messages`),L.length>0)return r.debug("Returning accumulated text from messages"),L;throw new Error("Claude Agent SDK query ended without result")}catch(t){let A={message:t?.message,name:t?.name,code:t?.code,cause:t?.cause?.message||t?.cause,stack:t?.stack?.split(`
|
|
2
2
|
`).slice(0,5).join(`
|
|
3
|
-
`),stringified:(()=>{try{return JSON.stringify(t,Object.getOwnPropertyNames(Object(t)))}catch{return String(t)}})()};throw r.error(`Error during query stream: ${t?.message||t}`,A),t}}catch(g){throw r.error("Claude Agent SDK call failed",{message:g?.message,name:g?.name,code:g?.code,cause:g?.cause?.message||g?.cause}),g}}finally{for(let O of oe)O.dispose()}}_resolveSkills(e,s){let i=["Read","Write","Edit","Bash","Grep","Glob"];if(e===null)return r.debug("No skills \u2014 pure LLM mode"),{allowedTools:[],mcpServers:{}};if(!Array.isArray(e)||e.length===0)return r.debug("Default IDE skills for code generation"),{allowedTools:[...i],mcpServers:{}};let n=[...i],o={};for(let d of e){let p=ie(d);if(!p){r.warn(`Unknown skill "${d}" \u2014 skipping`);continue}if(p.allowedTools&&n.push(...p.allowedTools),typeof p.resolve=="function"){let _=p.resolve(s);_&&(o[p.serverName]=_,r.debug(`MCP: ${p.serverName} \u2192 ${_.command} ${_.args[0]}`))}}return{allowedTools:n,mcpServers:o}}_extractJson(e,s){let i=[()=>{if(e.includes("===JSON_START===")){let n=e.indexOf("===JSON_START===")+16,o=e.indexOf("===JSON_END===");return e.substring(n,o).trim()}},()=>e.match(/```json\s*\n([\s\S]*?)\n```/)?.[1]?.trim(),()=>{if(!e.startsWith("{"))return e.match(/```\s*\n([\s\S]*?)\n```/)?.[1]?.trim()},()=>e.trim(),()=>{let n=e.indexOf("{"),o=e.lastIndexOf("}");if(n!==-1&&o>n)return e.substring(n,o+1)}];for(let n of i)try{let o=n();if(!o)continue;let d=JSON.parse(o);if(typeof d!="object"||d===null)continue;return typeof s.parse=="function"?s.parse(d):d}catch{}return null}};function
|
|
3
|
+
`),stringified:(()=>{try{return JSON.stringify(t,Object.getOwnPropertyNames(Object(t)))}catch{return String(t)}})()};throw r.error(`Error during query stream: ${t?.message||t}`,A),t}}catch(g){throw r.error("Claude Agent SDK call failed",{message:g?.message,name:g?.name,code:g?.code,cause:g?.cause?.message||g?.cause}),g}}finally{for(let O of oe)O.dispose()}}_resolveSkills(e,s){let i=["Read","Write","Edit","Bash","Grep","Glob"];if(e===null)return r.debug("No skills \u2014 pure LLM mode"),{allowedTools:[],mcpServers:{}};if(!Array.isArray(e)||e.length===0)return r.debug("Default IDE skills for code generation"),{allowedTools:[...i],mcpServers:{}};let n=[...i],o={};for(let d of e){let p=ie(d);if(!p){r.warn(`Unknown skill "${d}" \u2014 skipping`);continue}if(p.allowedTools&&n.push(...p.allowedTools),typeof p.resolve=="function"){let _=p.resolve(s);_&&(o[p.serverName]=_,r.debug(`MCP: ${p.serverName} \u2192 ${_.command} ${_.args[0]}`))}}return{allowedTools:n,mcpServers:o}}_extractJson(e,s){let i=[()=>{if(e.includes("===JSON_START===")){let n=e.indexOf("===JSON_START===")+16,o=e.indexOf("===JSON_END===");return e.substring(n,o).trim()}},()=>e.match(/```json\s*\n([\s\S]*?)\n```/)?.[1]?.trim(),()=>{if(!e.startsWith("{"))return e.match(/```\s*\n([\s\S]*?)\n```/)?.[1]?.trim()},()=>e.trim(),()=>{let n=e.indexOf("{"),o=e.lastIndexOf("}");if(n!==-1&&o>n)return e.substring(n,o+1)}];for(let n of i)try{let o=n();if(!o)continue;let d=JSON.parse(o);if(typeof d!="object"||d===null)continue;return typeof s.parse=="function"?s.parse(d):d}catch{}return null}};function le({message:l,sessionPath:e,nodeName:s,model:i,toolCallCount:n}){if(!e||!s)return;let o=l?.usage||l?.message?.usage||{},d=k(o.input_tokens,o.inputTokens),p=k(o.output_tokens,o.outputTokens),_=k(o.cache_read_input_tokens,o.cacheReadInputTokens),w=k(o.cache_creation_input_tokens,o.cacheCreationInputTokens),U=k(l?.duration_ms,l?.durationMs),K={model:i||null,input_tokens:d,output_tokens:p,cache_read_tokens:_,cache_creation_tokens:w,tool_call_count:typeof n=="number"?n:null,duration_ms:U,captured_at:new Date().toISOString()},S=E(e,s);try{R(S,{recursive:!0})}catch{}P(E(S,"usage.json"),JSON.stringify(K,null,2),"utf-8")}function k(...l){for(let e of l){if(typeof e=="number"&&Number.isFinite(e))return e;if(typeof e=="string"&&e.trim()!==""&&!isNaN(Number(e)))return Number(e)}return null}function ue(l,e){let s=E(ee(),".claude"),i=E(s,".credentials.json"),n={claudeAiOauth:{accessToken:l,...e?{subscriptionType:String(e).toLowerCase()}:{}}};try{if(Q(i)&&JSON.parse(V(i,"utf-8"))?.claudeAiOauth?.accessToken===l)return;R(s,{recursive:!0}),P(i,JSON.stringify(n,null,2),"utf-8"),r.debug(`Wrote Claude Code OAuth credentials to ${i}`)}catch(o){r.warn(`Could not write ${i}: ${o.message} \u2014 Claude SDK may fail to authenticate.`)}}function de(l){let e=E(ee(),".claude"),s=E(e,".credentials.json"),i;try{i=JSON.parse(l)}catch(n){r.warn(`CLAUDE_CODE_CREDENTIALS_JSON not valid JSON: ${n.message}`);return}if(!i?.claudeAiOauth?.accessToken){r.warn("CLAUDE_CODE_CREDENTIALS_JSON missing claudeAiOauth.accessToken \u2014 skipping write.");return}try{if(Q(s)){let n=JSON.parse(V(s,"utf-8"));if(n?.claudeAiOauth?.accessToken===i.claudeAiOauth.accessToken&&n?.claudeAiOauth?.expiresAt===i.claudeAiOauth.expiresAt)return}R(e,{recursive:!0}),P(s,JSON.stringify(i,null,2),"utf-8"),r.debug(`Wrote full Claude Code credentials blob to ${s}`)}catch(n){r.warn(`Could not write ${s}: ${n.message} \u2014 Claude SDK may fail to authenticate.`)}}export{z as ClaudeAgentStrategy};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import{AgentStrategy as G,getSkill as X}from"@zibby/agent-workflow";import{execSync as j}from"node:child_process";import{zodToJsonSchema as B}from"zod-to-json-schema";import h from"chalk";var u={debug:0,info:1,warn:2,error:3,silent:4},
|
|
1
|
+
import{AgentStrategy as G,getSkill as X}from"@zibby/agent-workflow";import{execSync as j}from"node:child_process";import{zodToJsonSchema as B}from"zod-to-json-schema";import h from"chalk";var u={debug:0,info:1,warn:2,error:3,silent:4},k=class{constructor(){this._level=this._getLogLevel()}_getLogLevel(){if(process.env.ZIBBY_DEBUG==="true")return u.debug;if(process.env.ZIBBY_VERBOSE==="true")return u.info;let e=process.env.LOG_LEVEL?.toLowerCase();return e&&e in u?u[e]:u.info}_shouldLog(e){return u[e]>=this._level}_formatMessage(e,t,r={}){let l=new Date().toISOString(),n=`${this._getPrefix(e)} ${t}`;return Object.keys(r).length>0&&(n+=h.dim(` ${JSON.stringify(r)}`)),n}_getPrefix(e){return{debug:h.gray("[DEBUG]"),info:h.cyan("[INFO]"),warn:h.yellow("[WARN]"),error:h.red("\u274C [ERROR]")}[e]||""}debug(e,t){this._shouldLog("debug")&&console.log(this._formatMessage("debug",e,t))}info(e,t){this._shouldLog("info")&&console.log(this._formatMessage("info",e,t))}warn(e,t){this._shouldLog("warn")&&console.warn(this._formatMessage("warn",e,t))}error(e,t){this._shouldLog("error")&&console.error(this._formatMessage("error",e,t))}setLevel(e){e in u&&(this._level=u[e])}getLevel(){return Object.keys(u).find(e=>u[e]===this._level)}},o=new k;import{timeline as y,Timeline as Q,WORKFLOW_GRAPH_LOG_MARKER_PREFIX as V}from"@zibby/agent-workflow";var w={ASSISTANT:"gpt-5.4-nano-2026-03-17",CLAUDE:"claude-sonnet-4-6",CURSOR:"auto",CODEX:"o4-mini",GEMINI:"gemini-3-pro",OPENAI_POSTPROCESSING:"gpt-4o-mini"};var $={auto:"o4-mini","o4-mini":"o4-mini",o3:"o3","o3-mini":"o3-mini","codex-mini":"codex-mini-latest","gpt-4o":"gpt-4o","gpt-4o-mini":"gpt-4o-mini","gpt-5.2-codex":"gpt-5.2-codex","gpt-5.2":"gpt-5.2","gpt-5.3":"gpt-5.3","gpt-5.3-codex":"gpt-5.3-codex","gpt-5.4":"gpt-5.4","gpt-5.5":"gpt-5.5"};var ee={CURSOR_AGENT_DEFAULT:1200*1e3,OPENAI_REQUEST:18e4};function D(p){let e=`${p}_POOL`,t=process.env[e];if(!t||typeof t!="string")return{picked:null,count:0,dispose:()=>{}};let r=t.split(/[,\n]+/).map(n=>n.trim()).filter(Boolean);if(r.length===0)return{picked:null,count:0,dispose:()=>{}};let l=r[Math.floor(Math.random()*r.length)],s=process.env[p];return process.env[p]=l,o.debug(`[auth-pool] ${p}: picked 1 of ${r.length} from pool (***${l.slice(-4)})`),{picked:l,count:r.length,dispose(){s===void 0?delete process.env[p]:process.env[p]=s}}}var T=class extends G{constructor(){super("codex","Codex (OpenAI)",75)}canHandle(e){if(!!!(process.env.OPENAI_API_KEY||process.env.OPENAI_API_KEY_POOL||process.env.CODEX_API_KEY||process.env.CODEX_API_KEY_POOL))return o.debug("CodexAgentStrategy: OPENAI_API_KEY or CODEX_API_KEY not set"),!1;try{return j("codex --version",{encoding:"utf-8",timeout:5e3,stdio:"pipe"}),!0}catch{return o.warn("[Codex] codex CLI not found. Install: npm install -g @openai/codex"),!1}}async invoke(e,t={}){let{model:r,workspace:l=process.cwd(),schema:s=null,skills:n=null,sessionPath:O=null,nodeName:f=null,timeout:F,config:J={},signal:M=null}=t,R=[D("OPENAI_API_KEY"),D("CODEX_API_KEY")];try{let{Codex:S}=await import("@openai/codex-sdk"),d=r;(!d||d==="auto")&&(o.debug(`Model is '${d||"undefined"}', using default: ${w.CODEX}`),d=w.CODEX);let v=$[d]||d;$[d]&&d!==v&&o.debug(`Mapped model: ${d} \u2192 ${v}`),o.debug(`Invoking Codex SDK with model: ${v}, skills: ${JSON.stringify(n)}`);let x=process.env.CODEX_API_KEY||process.env.OPENAI_API_KEY;x&&!process.env.CODEX_API_KEY&&(process.env.CODEX_API_KEY=x);let K=x?` | key: ***${x.slice(-4)}`:" | key: not set";console.log(`
|
|
2
2
|
\u25C6 Model: ${v}${K}
|
|
3
3
|
`);let A=(await import("chalk")).default;console.log(`
|
|
4
|
-
${A.bold("Prompt sent to LLM:")}`),console.log(A.dim("\u2500".repeat(60))),console.log(A.dim(e)),console.log(A.dim("\u2500".repeat(60)));let I=this._resolveSkillsToMcp(n,{sessionPath:O,workspace:l,nodeName:f}),C={};Object.keys(I).length>0&&(C.mcp_servers=I,o.debug(`[Codex] MCP servers: ${Object.keys(I).join(", ")}`));let U=new S({...Object.keys(C).length>0&&{config:C}}).startThread({workingDirectory:l,skipGitRepoCheck:!0,approvalPolicy:"never",sandboxMode:"danger-full-access",networkAccessEnabled:!0}),b=s&&typeof s.parse=="function",N={};if(s)try{let i=b?B(s,{target:"openAi"}):s;N.outputSchema=i,o.debug("Structured output via SDK outputSchema")}catch(i){o.warn(`[Codex] Schema conversion failed, will extract from text: ${i.message}`)}if(M?.aborted){let i=new Error("Aborted via signal");throw i.name="AbortError",i}try{let{events:i}=await U.runStreamed(e,N),m=0,a="";for await(let g of i){if(M?.aborted){let c=new Error("Aborted via signal");throw c.name="AbortError",c}let _=g.type;if(_==="item.completed"){let c=g.item,E=c?.type;if(E==="mcp_tool_call"){m++;let L=`${c.server}/${c.tool}`;if(
|
|
4
|
+
${A.bold("Prompt sent to LLM:")}`),console.log(A.dim("\u2500".repeat(60))),console.log(A.dim(e)),console.log(A.dim("\u2500".repeat(60)));let I=this._resolveSkillsToMcp(n,{sessionPath:O,workspace:l,nodeName:f}),C={};Object.keys(I).length>0&&(C.mcp_servers=I,o.debug(`[Codex] MCP servers: ${Object.keys(I).join(", ")}`));let U=new S({...Object.keys(C).length>0&&{config:C}}).startThread({workingDirectory:l,skipGitRepoCheck:!0,approvalPolicy:"never",sandboxMode:"danger-full-access",networkAccessEnabled:!0}),b=s&&typeof s.parse=="function",N={};if(s)try{let i=b?B(s,{target:"openAi"}):s;N.outputSchema=i,o.debug("Structured output via SDK outputSchema")}catch(i){o.warn(`[Codex] Schema conversion failed, will extract from text: ${i.message}`)}if(M?.aborted){let i=new Error("Aborted via signal");throw i.name="AbortError",i}try{let{events:i}=await U.runStreamed(e,N),m=0,a="";for await(let g of i){if(M?.aborted){let c=new Error("Aborted via signal");throw c.name="AbortError",c}let _=g.type;if(_==="item.completed"){let c=g.item,E=c?.type;if(E==="mcp_tool_call"){m++;let L=`${c.server}/${c.tool}`;if(y.stepTool(`Tool: ${L}`),c.arguments){let P=JSON.stringify(c.arguments),Y=P.length>100?`${P.substring(0,100)}...`:P;console.log(` Input: ${Y}`)}}else if(E==="tool_call"||E==="function_call"||E==="command_execution"){m++;let L=c.name||c.tool||c.command||"unknown";y.stepTool(`Tool: ${L}`)}else E==="agent_message"&&(a=c.text||"",a.length<500?console.log(a):console.log(`${a.substring(0,200)}... (${a.length} chars)`))}else _==="turn.completed"?o.debug(`[Codex] Turn completed. Usage: ${JSON.stringify(g.usage||{})}`):o.debug(`[Codex] Event: ${_} ${JSON.stringify(g).slice(0,300)}`)}if(o.debug(`[Codex] Last agent message (${a.length} chars): ${a.slice(0,500)}`),s){if(!a)throw new Error("Codex agent returned no response");let g=JSON.parse(a),_=b?s.parse(g):g;return o.debug("\u2705 [Codex] Structured output validated"),{raw:a,structured:_}}return a||""}catch(i){let m=i.message||String(i);throw o.error(`\u274C [Codex] SDK call failed: ${m}`),m.includes("exited with code")&&(o.error("\u{1F4A1} [Codex] Verify: codex --version && echo $OPENAI_API_KEY"),o.error("\u{1F4A1} [Codex] If codex is missing: npm install -g @openai/codex")),i}}finally{for(let S of R)S.dispose()}}_resolveSkillsToMcp(e,t={}){if(!Array.isArray(e)||e.length===0)return{};let r={};for(let l of e){let s=X(l);if(!s){o.warn(`[Codex] Unknown skill "${l}" \u2014 skipping`);continue}if(typeof s.resolve!="function")continue;let n=s.resolve(t);if(!n)continue;let O=s.serverName||l,f={command:n.command};n.args?.length&&(f.args=n.args),n.env&&Object.keys(n.env).length>0&&(f.env=n.env),r[O]=f,o.debug(`[Codex] MCP: ${O} \u2192 ${n.command} ${(n.args||[]).join(" ")}`)}return r}};export{T as CodexAgentStrategy};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import{AgentStrategy as kt,DEFAULT_OUTPUT_BASE as Lt,SESSION_INFO_FILE as Mt,STOP_REQUEST_FILE as Ut,getAllSkills as Dt,getSkill as ct}from"@zibby/agent-workflow";import{spawn as Bt,execSync as F}from"node:child_process";import{writeFileSync as pt,readFileSync as ft,mkdirSync as dt,existsSync as H,accessSync as gt,constants as mt,unlinkSync as Ft}from"node:fs";import{join as $,resolve as Jt}from"node:path";import{homedir as j}from"node:os";import z from"chalk";var P={debug:0,info:1,warn:2,error:3,silent:4},et=class{constructor(){this._level=this._getLogLevel()}_getLogLevel(){if(process.env.ZIBBY_DEBUG==="true")return P.debug;if(process.env.ZIBBY_VERBOSE==="true")return P.info;let t=process.env.LOG_LEVEL?.toLowerCase();return t&&t in P?P[t]:P.info}_shouldLog(t){return P[t]>=this._level}_formatMessage(t,e,r={}){let o=new Date().toISOString(),n=`${this._getPrefix(t)} ${e}`;return Object.keys(r).length>0&&(n+=z.dim(` ${JSON.stringify(r)}`)),n}_getPrefix(t){return{debug:z.gray("[DEBUG]"),info:z.cyan("[INFO]"),warn:z.yellow("[WARN]"),error:z.red("\u274C [ERROR]")}[t]||""}debug(t,e){this._shouldLog("debug")&&console.log(this._formatMessage("debug",t,e))}info(t,e){this._shouldLog("info")&&console.log(this._formatMessage("info",t,e))}warn(t,e){this._shouldLog("warn")&&console.warn(this._formatMessage("warn",t,e))}error(t,e){this._shouldLog("error")&&console.error(this._formatMessage("error",t,e))}setLevel(t){t in P&&(this._level=P[t])}getLevel(){return Object.keys(P).find(t=>P[t]===this._level)}},s=new et;var Y={ASSISTANT:"gpt-5.4-nano-2026-03-17",CLAUDE:"claude-sonnet-4-6",CURSOR:"auto",CODEX:"o4-mini",GEMINI:"gemini-
|
|
1
|
+
import{AgentStrategy as kt,DEFAULT_OUTPUT_BASE as Lt,SESSION_INFO_FILE as Mt,STOP_REQUEST_FILE as Ut,getAllSkills as Dt,getSkill as ct}from"@zibby/agent-workflow";import{spawn as Bt,execSync as F}from"node:child_process";import{writeFileSync as pt,readFileSync as ft,mkdirSync as dt,existsSync as H,accessSync as gt,constants as mt,unlinkSync as Ft}from"node:fs";import{join as $,resolve as Jt}from"node:path";import{homedir as j}from"node:os";import z from"chalk";var P={debug:0,info:1,warn:2,error:3,silent:4},et=class{constructor(){this._level=this._getLogLevel()}_getLogLevel(){if(process.env.ZIBBY_DEBUG==="true")return P.debug;if(process.env.ZIBBY_VERBOSE==="true")return P.info;let t=process.env.LOG_LEVEL?.toLowerCase();return t&&t in P?P[t]:P.info}_shouldLog(t){return P[t]>=this._level}_formatMessage(t,e,r={}){let o=new Date().toISOString(),n=`${this._getPrefix(t)} ${e}`;return Object.keys(r).length>0&&(n+=z.dim(` ${JSON.stringify(r)}`)),n}_getPrefix(t){return{debug:z.gray("[DEBUG]"),info:z.cyan("[INFO]"),warn:z.yellow("[WARN]"),error:z.red("\u274C [ERROR]")}[t]||""}debug(t,e){this._shouldLog("debug")&&console.log(this._formatMessage("debug",t,e))}info(t,e){this._shouldLog("info")&&console.log(this._formatMessage("info",t,e))}warn(t,e){this._shouldLog("warn")&&console.warn(this._formatMessage("warn",t,e))}error(t,e){this._shouldLog("error")&&console.error(this._formatMessage("error",t,e))}setLevel(t){t in P&&(this._level=P[t])}getLevel(){return Object.keys(P).find(t=>P[t]===this._level)}},s=new et;var Y={ASSISTANT:"gpt-5.4-nano-2026-03-17",CLAUDE:"claude-sonnet-4-6",CURSOR:"auto",CODEX:"o4-mini",GEMINI:"gemini-3-pro",OPENAI_POSTPROCESSING:"gpt-4o-mini"};var Z={CURSOR_AGENT_DEFAULT:1200*1e3,OPENAI_REQUEST:18e4};var X=class i{constructor(){this.buffer="",this.extractedResult=null,this.rawText="",this.zodSchema=null,this.lastOutputLength=0,this.onToolCall=null,this._lastToolEmit=null}processChunk(t){if(!t)return null;this.buffer+=t;let e=this.buffer.split(`
|
|
2
2
|
`);this.buffer=e.pop()||"";let r="";for(let o of e)if(o.trim())try{let a=JSON.parse(o);this._emitToolCalls(a);let n=this.extractText(a);if(n){if(this.rawText&&n.startsWith(this.rawText)){let u=n.substring(this.rawText.length);this.rawText=n,r+=u}else(!this.rawText.includes(n)||n.length<20)&&(this.rawText+=n,r+=n);this.tryExtractResult(this.rawText)}else this.isValidResult(a)&&(this.rawText+=`${o}
|
|
3
3
|
`,r+=`${o}
|
|
4
4
|
`,this.extractedResult=a)}catch{if(o.includes('"text"')||o.includes('"content"')){let n=o.match(/"text"\s*:\s*"([^"]*)/),u=o.match(/"content"\s*:\s*"([^"]*)/),c=n?n[1]:u?u[1]:null;c&&!this.rawText.includes(c)&&(r+=c,this.rawText+=c)}}return r||null}flush(){if(!this.buffer.trim())return null;let t="";try{let e=JSON.parse(this.buffer);this._emitToolCalls(e);let r=this.extractText(e);r&&(this.rawText+=r,t+=r,this.tryExtractResult(r))}catch{this.rawText+=this.buffer,t+=this.buffer,this.tryExtractResult(this.buffer)}return this.buffer="",t||null}_emitToolCalls(t){if(!this.onToolCall)return;let e=(n,u)=>{if(!n)return;let c=`${n}:${JSON.stringify(u??{})}`;this._lastToolEmit!==c&&(this._lastToolEmit=c,this.onToolCall(n,u??void 0))},r=n=>{if(n!=null){if(typeof n=="object"&&!Array.isArray(n))return n;if(typeof n=="string")try{return JSON.parse(n)}catch{return}}};if(t.type==="tool_use"||t.type==="tool_call"){if(t.name){e(t.name,r(t.input??t.arguments));return}let n=t.tool_call;if(n&&typeof n=="object"&&!Array.isArray(n)){let u=Object.keys(n);if(u.length===1){let c=u[0],y=n[c],p=y&&typeof y=="object"?y.args??y.input??y:void 0;e(c,r(p))}return}return}if(Array.isArray(t.tool_calls)){for(let n of t.tool_calls)e(n.name,r(n.input??n.arguments));return}let o=t.message??t;if(Array.isArray(o?.tool_calls)){for(let n of o.tool_calls)e(n.name,r(n.input??n.arguments));return}let a=o?.content??t.content;if(Array.isArray(a))for(let n of a)(n.type==="tool_use"||n.type==="tool_call")&&n.name&&e(n.name,r(n.input??n.arguments))}extractText(t){if(t.type==="assistant"&&t.message?.content){let e=t.message.content;if(Array.isArray(e))return e.filter(r=>r.type==="text"&&r.text).map(r=>r.text).join("")}return t.type==="thinking"&&t.text||t.text?t.text:t.content&&typeof t.content=="string"?t.content:t.delta?t.delta:null}tryExtractResult(t){if(!t||typeof t!="string")return;let e=[],r=/```json\s*\n?([\s\S]*?)\n?```/g,o;for(;(o=r.exec(t))!==null;){let g=o[1].trim();try{JSON.parse(g),e.push({text:g,source:"markdown"})}catch{}}let a=0,n=0;for(;a<t.length&&(a=t.indexOf("{",a),a!==-1);){let g=0,f=a;for(let O=a;O<t.length;O++)if(t[O]==="{")g++;else if(t[O]==="}"&&(g--,g===0)){f=O,e.push({text:t.substring(a,f+1),source:"brace"}),n++;break}a=f+1}let u=this.extractedResult,c=u?JSON.stringify(u).length:0,y=0,p=-1;for(let g=0;g<e.length;g++){let f=e[g];try{let O=f.text.replace(/,(\s*[}\]])/g,"$1"),I=JSON.parse(O);this.isValidResult(I)&&(y++,c=JSON.stringify(I).length,u=I,p=g)}catch{}}u&&(this.extractedResult=u)}isValidResult(t){if(!t||typeof t!="object"||Array.isArray(t)||t.session_id||t.timestamp_ms||t.type||t.call_id||t.tool_call||t.result&&typeof t.result=="object"&&(t.result.success&&typeof t.result.success=="object"||t.result.error&&typeof t.result.error=="object")||t.args&&typeof t.args=="object")return!1;if(this.zodSchema)try{return this.zodSchema.parse(t),!0}catch{return!1}return!0}getResult(){return this.extractedResult}getRawText(){return this.rawText}static extractResult(t,e=null){let r=new i;r.zodSchema=e,r.processChunk(t),r.flush();let o=r.getResult();return!o&&process.env.LOG_LEVEL==="debug"&&console.error("[StreamingParser] No result extracted from",t?.length||0,"chars"),o}};import{zodToJsonSchema as yt}from"zod-to-json-schema";var q=class{static generateFileOutputInstructions(t,e){let r;typeof t?.parse=="function"?r=yt(t,{target:"openApi3"}):r=t;let o=this._buildExample(r);return`
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import{AgentStrategy as
|
|
1
|
+
import{AgentStrategy as ft,getSkill as dt}from"@zibby/agent-workflow";import{execSync as mt,spawn as ht}from"node:child_process";import{zodToJsonSchema as gt}from"zod-to-json-schema";import{existsSync as et,mkdirSync as rt,readFileSync as st,rmSync as yt,writeFileSync as nt}from"node:fs";import{join as w}from"node:path";import P from"chalk";var g={debug:0,info:1,warn:2,error:3,silent:4},W=class{constructor(){this._level=this._getLogLevel()}_getLogLevel(){if(process.env.ZIBBY_DEBUG==="true")return g.debug;if(process.env.ZIBBY_VERBOSE==="true")return g.info;let t=process.env.LOG_LEVEL?.toLowerCase();return t&&t in g?g[t]:g.info}_shouldLog(t){return g[t]>=this._level}_formatMessage(t,e,s={}){let n=new Date().toISOString(),r=`${this._getPrefix(t)} ${e}`;return Object.keys(s).length>0&&(r+=P.dim(` ${JSON.stringify(s)}`)),r}_getPrefix(t){return{debug:P.gray("[DEBUG]"),info:P.cyan("[INFO]"),warn:P.yellow("[WARN]"),error:P.red("\u274C [ERROR]")}[t]||""}debug(t,e){this._shouldLog("debug")&&console.log(this._formatMessage("debug",t,e))}info(t,e){this._shouldLog("info")&&console.log(this._formatMessage("info",t,e))}warn(t,e){this._shouldLog("warn")&&console.warn(this._formatMessage("warn",t,e))}error(t,e){this._shouldLog("error")&&console.error(this._formatMessage("error",t,e))}setLevel(t){t in g&&(this._level=g[t])}getLevel(){return Object.keys(g).find(t=>g[t]===this._level)}},u=new W;var Q={ASSISTANT:"gpt-5.4-nano-2026-03-17",CLAUDE:"claude-sonnet-4-6",CURSOR:"auto",CODEX:"o4-mini",GEMINI:"gemini-3-pro",OPENAI_POSTPROCESSING:"gpt-4o-mini"};var tt={auto:"gemini-3-pro","gemini-3-pro":"gemini-3-pro","gemini-3-flash":"gemini-3-flash","gemini-2.5-pro":"gemini-2.5-pro","gemini-2.5-flash":"gemini-2.5-flash"},It={CURSOR_AGENT_DEFAULT:1200*1e3,OPENAI_REQUEST:18e4};import{zodToJsonSchema as pt}from"zod-to-json-schema";var $=class{static generateFileOutputInstructions(t,e){let s;typeof t?.parse=="function"?s=pt(t,{target:"openApi3"}):s=t;let n=this._buildExample(s);return`
|
|
2
2
|
\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550
|
|
3
3
|
\u{1F6A8} MANDATORY: WRITE RESULT TO FILE \u{1F6A8}
|
|
4
4
|
\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550
|
|
@@ -31,13 +31,13 @@ ${t.trim()}`;this.systemInstructions.push({type:"extra_instructions",content:e,p
|
|
|
31
31
|
`)}getStats(){let t=this.userPrompt.length,e=this.build().length;return{userPromptLength:t,fullPromptLength:e,systemInstructionsLength:e-t,instructionCount:this.systemInstructions.length,instructionTypes:this.systemInstructions.map(s=>s.type)}}clone(){let t=new c(this.userPrompt);return t.systemInstructions=[...this.systemInstructions],t.metadata={...this.metadata},t}};var J=class c{constructor(){this.buffer="",this.extractedResult=null,this.rawText="",this.zodSchema=null,this.lastOutputLength=0,this.onToolCall=null,this._lastToolEmit=null}processChunk(t){if(!t)return null;this.buffer+=t;let e=this.buffer.split(`
|
|
32
32
|
`);this.buffer=e.pop()||"";let s="";for(let n of e)if(n.trim())try{let i=JSON.parse(n);this._emitToolCalls(i);let r=this.extractText(i);if(r){if(this.rawText&&r.startsWith(this.rawText)){let o=r.substring(this.rawText.length);this.rawText=r,s+=o}else(!this.rawText.includes(r)||r.length<20)&&(this.rawText+=r,s+=r);this.tryExtractResult(this.rawText)}else this.isValidResult(i)&&(this.rawText+=`${n}
|
|
33
33
|
`,s+=`${n}
|
|
34
|
-
`,this.extractedResult=i)}catch{if(n.includes('"text"')||n.includes('"content"')){let r=n.match(/"text"\s*:\s*"([^"]*)/),o=n.match(/"content"\s*:\s*"([^"]*)/),l=r?r[1]:o?o[1]:null;l&&!this.rawText.includes(l)&&(s+=l,this.rawText+=l)}}return s||null}flush(){if(!this.buffer.trim())return null;let t="";try{let e=JSON.parse(this.buffer);this._emitToolCalls(e);let s=this.extractText(e);s&&(this.rawText+=s,t+=s,this.tryExtractResult(s))}catch{this.rawText+=this.buffer,t+=this.buffer,this.tryExtractResult(this.buffer)}return this.buffer="",t||null}_emitToolCalls(t){if(!this.onToolCall)return;let e=(r,o)=>{if(!r)return;let l=`${r}:${JSON.stringify(o??{})}`;this._lastToolEmit!==l&&(this._lastToolEmit=l,this.onToolCall(r,o??void 0))},s=r=>{if(r!=null){if(typeof r=="object"&&!Array.isArray(r))return r;if(typeof r=="string")try{return JSON.parse(r)}catch{return}}};if(t.type==="tool_use"||t.type==="tool_call"){if(t.name){e(t.name,s(t.input??t.arguments));return}let r=t.tool_call;if(r&&typeof r=="object"&&!Array.isArray(r)){let o=Object.keys(r);if(o.length===1){let l=o[0],a=r[l],
|
|
35
|
-
${
|
|
36
|
-
${
|
|
34
|
+
`,this.extractedResult=i)}catch{if(n.includes('"text"')||n.includes('"content"')){let r=n.match(/"text"\s*:\s*"([^"]*)/),o=n.match(/"content"\s*:\s*"([^"]*)/),l=r?r[1]:o?o[1]:null;l&&!this.rawText.includes(l)&&(s+=l,this.rawText+=l)}}return s||null}flush(){if(!this.buffer.trim())return null;let t="";try{let e=JSON.parse(this.buffer);this._emitToolCalls(e);let s=this.extractText(e);s&&(this.rawText+=s,t+=s,this.tryExtractResult(s))}catch{this.rawText+=this.buffer,t+=this.buffer,this.tryExtractResult(this.buffer)}return this.buffer="",t||null}_emitToolCalls(t){if(!this.onToolCall)return;let e=(r,o)=>{if(!r)return;let l=`${r}:${JSON.stringify(o??{})}`;this._lastToolEmit!==l&&(this._lastToolEmit=l,this.onToolCall(r,o??void 0))},s=r=>{if(r!=null){if(typeof r=="object"&&!Array.isArray(r))return r;if(typeof r=="string")try{return JSON.parse(r)}catch{return}}};if(t.type==="tool_use"||t.type==="tool_call"){if(t.name){e(t.name,s(t.input??t.arguments));return}let r=t.tool_call;if(r&&typeof r=="object"&&!Array.isArray(r)){let o=Object.keys(r);if(o.length===1){let l=o[0],a=r[l],p=a&&typeof a=="object"?a.args??a.input??a:void 0;e(l,s(p))}return}return}if(Array.isArray(t.tool_calls)){for(let r of t.tool_calls)e(r.name,s(r.input??r.arguments));return}let n=t.message??t;if(Array.isArray(n?.tool_calls)){for(let r of n.tool_calls)e(r.name,s(r.input??r.arguments));return}let i=n?.content??t.content;if(Array.isArray(i))for(let r of i)(r.type==="tool_use"||r.type==="tool_call")&&r.name&&e(r.name,s(r.input??r.arguments))}extractText(t){if(t.type==="assistant"&&t.message?.content){let e=t.message.content;if(Array.isArray(e))return e.filter(s=>s.type==="text"&&s.text).map(s=>s.text).join("")}return t.type==="thinking"&&t.text||t.text?t.text:t.content&&typeof t.content=="string"?t.content:t.delta?t.delta:null}tryExtractResult(t){if(!t||typeof t!="string")return;let e=[],s=/```json\s*\n?([\s\S]*?)\n?```/g,n;for(;(n=s.exec(t))!==null;){let m=n[1].trim();try{JSON.parse(m),e.push({text:m,source:"markdown"})}catch{}}let i=0,r=0;for(;i<t.length&&(i=t.indexOf("{",i),i!==-1);){let m=0,d=i;for(let h=i;h<t.length;h++)if(t[h]==="{")m++;else if(t[h]==="}"&&(m--,m===0)){d=h,e.push({text:t.substring(i,d+1),source:"brace"}),r++;break}i=d+1}let o=this.extractedResult,l=o?JSON.stringify(o).length:0,a=0,p=-1;for(let m=0;m<e.length;m++){let d=e[m];try{let h=d.text.replace(/,(\s*[}\]])/g,"$1"),T=JSON.parse(h);this.isValidResult(T)&&(a++,l=JSON.stringify(T).length,o=T,p=m)}catch{}}o&&(this.extractedResult=o)}isValidResult(t){if(!t||typeof t!="object"||Array.isArray(t)||t.session_id||t.timestamp_ms||t.type||t.call_id||t.tool_call||t.result&&typeof t.result=="object"&&(t.result.success&&typeof t.result.success=="object"||t.result.error&&typeof t.result.error=="object")||t.args&&typeof t.args=="object")return!1;if(this.zodSchema)try{return this.zodSchema.parse(t),!0}catch{return!1}return!0}getResult(){return this.extractedResult}getRawText(){return this.rawText}static extractResult(t,e=null){let s=new c;s.zodSchema=e,s.processChunk(t),s.flush();let n=s.getResult();return!n&&process.env.LOG_LEVEL==="debug"&&console.error("[StreamingParser] No result extracted from",t?.length||0,"chars"),n}};function H(c){let t=`${c}_POOL`,e=process.env[t];if(!e||typeof e!="string")return{picked:null,count:0,dispose:()=>{}};let s=e.split(/[,\n]+/).map(r=>r.trim()).filter(Boolean);if(s.length===0)return{picked:null,count:0,dispose:()=>{}};let n=s[Math.floor(Math.random()*s.length)],i=process.env[c];return process.env[c]=n,u.debug(`[auth-pool] ${c}: picked 1 of ${s.length} from pool (***${n.slice(-4)})`),{picked:n,count:s.length,dispose(){i===void 0?delete process.env[c]:process.env[c]=i}}}function Et(c){if(!c)return null;let t=String(c),e=t.match(/```(?:json)?\s*([\s\S]*?)```/i);if(e?.[1])try{return JSON.parse(e[1].trim())}catch{}let s=t.indexOf("{");if(s<0)return null;let n=0,i=!1,r=!1,o=-1;for(let l=s;l<t.length;l++){let a=t[l];if(i){r?r=!1:a==="\\"?r=!0:a==='"'&&(i=!1);continue}if(a==='"'){i=!0;continue}if(a==="{"){n===0&&(o=l),n+=1;continue}if(a==="}"){if(n===0)continue;if(n-=1,n===0&&o>=0){let p=t.slice(o,l+1);try{return JSON.parse(p)}catch{o=-1}}}}return null}function _t(c){let t=String(c||"").trim();if(!t)return null;try{return JSON.parse(t)}catch{return Et(t)}}function Ot(c){try{let t=JSON.parse(c);if(typeof t=="string")return t;if(typeof t?.response=="string")return t.response;if(typeof t?.text=="string")return t.text;if(typeof t?.output=="string")return t.output;if(Array.isArray(t?.candidates)&&t.candidates.length>0){let e=t.candidates[0];if(typeof e?.content=="string")return e.content;if(Array.isArray(e?.content?.parts)){let s=e.content.parts.map(n=>typeof n?.text=="string"?n.text:"").join("");if(s.trim())return s}}}catch{}return c}var it=class extends ft{constructor(){super("gemini","Gemini (Google)",70)}canHandle(t){if(!!!(process.env.GEMINI_API_KEY||process.env.GEMINI_API_KEY_POOL||process.env.GOOGLE_API_KEY||process.env.GOOGLE_API_KEY_POOL))return u.debug("GeminiAgentStrategy: GEMINI_API_KEY or GOOGLE_API_KEY not set"),!1;try{return mt("gemini --version",{encoding:"utf-8",timeout:5e3,stdio:"pipe"}),!0}catch{return u.warn("[Gemini] gemini CLI not found. Install: npm install -g @google/gemini-cli"),!1}}async invoke(t,e={}){let{model:s,workspace:n=process.cwd(),schema:i=null,skills:r=null,sessionPath:o=null,nodeName:l=null,timeout:a=600*1e3,signal:p=null}=e,m=[H("GEMINI_API_KEY"),H("GOOGLE_API_KEY")];try{let d=s;(!d||d==="auto")&&(d=Q.GEMINI);let h=tt[d]||d,T=String(process.env.GEMINI_API_KEY||"").trim(),D=String(process.env.GOOGLE_API_KEY||"").trim(),R=this._resolveSkillsToMcp(r,{sessionPath:o,workspace:n,nodeName:l}),ot=Object.keys(R).length>0,v=new C(t),U=i&&typeof i.parse=="function",b=null;if(i){let f;try{let E=U?gt(i,{target:"openAi"}):i;f=JSON.stringify(E,null,2)}catch{f="{}"}if(ot){v.addSystemInstruction(`Write valid JSON that matches this schema:
|
|
35
|
+
${f}`,"schema_instruction","append");let E=`zibby-result-${Date.now()}.json`,_=w(n,".zibby","tmp");b=w(_,E),rt(_,{recursive:!0}),v.addStructuredOutput(i,b)}else v.addSystemInstruction(`Return ONLY valid JSON (no markdown, no commentary) that matches this schema:
|
|
36
|
+
${f}`,"json_instruction","append")}let lt=v.build(),ut=v.getUserPrompt(),M=v.getStats(),q=String(process.env.GEMINI_API_KEY||process.env.GOOGLE_API_KEY||"").trim(),ct=q?` | key: ***${q.slice(-4)}`:" | key: not set";console.log(`
|
|
37
37
|
\u25C6 Model: ${h||"auto"}${ct}
|
|
38
|
-
`);let
|
|
39
|
-
${
|
|
38
|
+
`);let k=(await import("chalk")).default;console.log(`
|
|
39
|
+
${k.bold("Prompt sent to LLM:")}`),console.log(k.dim("\u2500".repeat(60))),console.log(k.dim(ut)),console.log(k.dim("\u2500".repeat(60)));let K=this._createGeminiConfigDir(n,R),x=["--output-format","json"];h&&h!=="auto"&&x.push("--model",h);let Y=Object.keys(R);if(Y.length>0){x.push("--approval-mode","yolo");for(let f of Y)x.push("--allowed-mcp-server-names",f);u.info(`[Gemini] Enabling MCP servers: ${Y.join(", ")}`)}else r&&r.length>0&&u.warn(`[Gemini] Skills requested but no MCP servers configured: ${r.join(", ")}`);x.push("-p",lt);let A={...process.env,GEMINI_CLI_HOME:K};T?(A.GEMINI_API_KEY=T,delete A.GOOGLE_API_KEY):D&&(A.GOOGLE_API_KEY=D,delete A.GEMINI_API_KEY),u.debug(`[Gemini] Command: gemini ${x.slice(0,8).join(" ")}... (${x.length} total args)`),u.debug(`[Gemini] User prompt: ${M.userPromptLength} chars, System instructions: ${M.systemInstructionsLength} chars (${M.instructionCount} blocks), Full: ${M.fullPromptLength} chars`),u.debug(`[Gemini] Config home: ${K}`),u.debug(`[Gemini] GEMINI_CLI_HOME env: ${A.GEMINI_CLI_HOME}`);let F="",N=null;try{F=await new Promise((E,_)=>{let O=ht("gemini",x,{cwd:n,env:A,stdio:["ignore","pipe","pipe"],...p&&{signal:p}}),z="",X="",B=!1,G=null,V=!1,Z=setTimeout(()=>{try{O.kill("SIGTERM")}catch{}},a),L=()=>{V||B||(V=!0,G=setTimeout(()=>{if(!B)try{O.kill("SIGKILL")}catch{}},5e3))};p&&(p.aborted?L():p.addEventListener("abort",L,{once:!0})),O.stdout.on("data",S=>{z+=S.toString()}),O.stderr.on("data",S=>{X+=S.toString()}),O.on("error",S=>{if(clearTimeout(Z),G&&clearTimeout(G),p&&!p.aborted)try{p.removeEventListener("abort",L)}catch{}_(S)}),O.on("close",S=>{if(B=!0,clearTimeout(Z),G&&clearTimeout(G),p&&!p.aborted)try{p.removeEventListener("abort",L)}catch{}if(V){let j=new Error("Aborted via signal");return j.name="AbortError",_(j)}if(S===0)return E(z.trim());_(new Error(`gemini failed with code ${S}: ${(X||z).trim()}`))})})}catch(f){N=f}finally{try{yt(K,{recursive:!0,force:!0})}catch{}}let y=Ot(F).trim();if(!i){if(N)throw N;return y}if(b){let f=et(b);if(u.info(`[Gemini] Result file: ${f?"present":"missing"} at ${b}`),f)try{let E=st(b,"utf-8").trim(),_=JSON.parse(E),O=U?i.parse(_):_;return u.info("[Gemini] Structured output recovered from result file"),{raw:y,structured:O}}catch(E){u.warn(`[Gemini] Result file parse/validation failed: ${E.message}`)}else N||u.warn("[Gemini] Result file missing; falling back to stream-parsed JSON")}let I=null;if(i){let f=new J;f.zodSchema=i,f.processChunk(y),f.flush(),I=f.getResult()}if(u.info(`[Gemini] Raw stdout length: ${F.length} chars`),u.info(`[Gemini] Extracted text length: ${y.length} chars`),u.info(`[Gemini] StreamParser result: ${I?"extracted":"null"}`),I||(y.length<2e3?u.info(`[Gemini] Raw text preview:
|
|
40
40
|
${y}`):u.info(`[Gemini] Raw text preview (first 1000 chars):
|
|
41
|
-
${y.slice(0,1e3)}`),I=_t(y)),!I)throw N||(u.error("[Gemini] Failed to extract valid JSON from output"),u.error("\u{1F4A1} Tip: Set strictMode=true in .zibby.config.js for OpenAI proxy fallback"),new Error("Gemini did not return valid JSON for structured output. Enable strictMode for proxy fallback."));let at=U?i.parse(I):I;return{raw:y,structured:at}}finally{for(let
|
|
42
|
-
`,"utf-8");let
|
|
41
|
+
${y.slice(0,1e3)}`),I=_t(y)),!I)throw N||(u.error("[Gemini] Failed to extract valid JSON from output"),u.error("\u{1F4A1} Tip: Set strictMode=true in .zibby.config.js for OpenAI proxy fallback"),new Error("Gemini did not return valid JSON for structured output. Enable strictMode for proxy fallback."));let at=U?i.parse(I):I;return{raw:y,structured:at}}finally{for(let d of m)d.dispose()}}_resolveSkillsToMcp(t,e={}){if(!Array.isArray(t)||t.length===0)return{};let s={};for(let n of t){let i=dt(n);if(!i||typeof i.resolve!="function")continue;let r=i.resolve(e);if(!r)continue;let o=i.cursorKey||i.serverName||n,l={command:r.command};r.args?.length&&(l.args=r.args),r.env&&Object.keys(r.env).length>0&&(l.env=r.env),r.cwd&&(l.cwd=r.cwd),s[o]=l}return s}_createGeminiConfigDir(t,e){let s=`${Date.now()}-${Math.random().toString(16).slice(2,10)}`,n=w(t||process.cwd(),".zibby","tmp",`gemini-home-${s}`),i=w(n,".gemini");rt(i,{recursive:!0});let r=w(i,"settings.json"),o={},l=w(process.env.HOME||"",".gemini","settings.json");if(et(l))try{o=JSON.parse(st(l,"utf-8"))}catch{o={}}let a={...o,mcpServers:{...o.mcpServers&&typeof o.mcpServers=="object"?o.mcpServers:{},...e||{}}};nt(r,`${JSON.stringify(a,null,2)}
|
|
42
|
+
`,"utf-8");let p=w(t||process.cwd(),".zibby","tmp","gemini-settings-debug.json");try{nt(p,`${JSON.stringify(a,null,2)}
|
|
43
43
|
`,"utf-8")}catch{}return u.debug(`[Gemini] Created isolated config with ${Object.keys(a.mcpServers||{}).length} MCP servers`),u.debug(`[Gemini] MCP servers: ${JSON.stringify(Object.keys(a.mcpServers||{}),null,2)}`),n}};export{it as GeminiAgentStrategy};
|
package/dist/strategies/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import{AgentStrategy as Ct,DEFAULT_OUTPUT_BASE as kt,SESSION_INFO_FILE as Pt,STOP_REQUEST_FILE as Nt,getAllSkills as Rt,getSkill as Xe}from"@zibby/agent-workflow";import{spawn as Mt,execSync as Z}from"node:child_process";import{writeFileSync as We,readFileSync as Ze,mkdirSync as qe,existsSync as ce,accessSync as Ve,constants as Qe,unlinkSync as Lt}from"node:fs";import{join as Y,resolve as Dt}from"node:path";import{homedir as ue}from"node:os";import ae from"chalk";var z={debug:0,info:1,warn:2,error:3,silent:4},Ce=class{constructor(){this._level=this._getLogLevel()}_getLogLevel(){if(process.env.ZIBBY_DEBUG==="true")return z.debug;if(process.env.ZIBBY_VERBOSE==="true")return z.info;let e=process.env.LOG_LEVEL?.toLowerCase();return e&&e in z?z[e]:z.info}_shouldLog(e){return z[e]>=this._level}_formatMessage(e,t,r={}){let o=new Date().toISOString(),i=`${this._getPrefix(e)} ${t}`;return Object.keys(r).length>0&&(i+=ae.dim(` ${JSON.stringify(r)}`)),i}_getPrefix(e){return{debug:ae.gray("[DEBUG]"),info:ae.cyan("[INFO]"),warn:ae.yellow("[WARN]"),error:ae.red("\u274C [ERROR]")}[e]||""}debug(e,t){this._shouldLog("debug")&&console.log(this._formatMessage("debug",e,t))}info(e,t){this._shouldLog("info")&&console.log(this._formatMessage("info",e,t))}warn(e,t){this._shouldLog("warn")&&console.warn(this._formatMessage("warn",e,t))}error(e,t){this._shouldLog("error")&&console.error(this._formatMessage("error",e,t))}setLevel(e){e in z&&(this._level=z[e])}getLevel(){return Object.keys(z).find(e=>z[e]===this._level)}},l=new Ce;var j={ASSISTANT:"gpt-5.4-nano-2026-03-17",CLAUDE:"claude-sonnet-4-6",CURSOR:"auto",CODEX:"o4-mini",GEMINI:"gemini-
|
|
1
|
+
import{AgentStrategy as Ct,DEFAULT_OUTPUT_BASE as kt,SESSION_INFO_FILE as Pt,STOP_REQUEST_FILE as Nt,getAllSkills as Rt,getSkill as Xe}from"@zibby/agent-workflow";import{spawn as Mt,execSync as Z}from"node:child_process";import{writeFileSync as We,readFileSync as Ze,mkdirSync as qe,existsSync as ce,accessSync as Ve,constants as Qe,unlinkSync as Lt}from"node:fs";import{join as Y,resolve as Dt}from"node:path";import{homedir as ue}from"node:os";import ae from"chalk";var z={debug:0,info:1,warn:2,error:3,silent:4},Ce=class{constructor(){this._level=this._getLogLevel()}_getLogLevel(){if(process.env.ZIBBY_DEBUG==="true")return z.debug;if(process.env.ZIBBY_VERBOSE==="true")return z.info;let e=process.env.LOG_LEVEL?.toLowerCase();return e&&e in z?z[e]:z.info}_shouldLog(e){return z[e]>=this._level}_formatMessage(e,t,r={}){let o=new Date().toISOString(),i=`${this._getPrefix(e)} ${t}`;return Object.keys(r).length>0&&(i+=ae.dim(` ${JSON.stringify(r)}`)),i}_getPrefix(e){return{debug:ae.gray("[DEBUG]"),info:ae.cyan("[INFO]"),warn:ae.yellow("[WARN]"),error:ae.red("\u274C [ERROR]")}[e]||""}debug(e,t){this._shouldLog("debug")&&console.log(this._formatMessage("debug",e,t))}info(e,t){this._shouldLog("info")&&console.log(this._formatMessage("info",e,t))}warn(e,t){this._shouldLog("warn")&&console.warn(this._formatMessage("warn",e,t))}error(e,t){this._shouldLog("error")&&console.error(this._formatMessage("error",e,t))}setLevel(e){e in z&&(this._level=z[e])}getLevel(){return Object.keys(z).find(e=>z[e]===this._level)}},l=new Ce;var j={ASSISTANT:"gpt-5.4-nano-2026-03-17",CLAUDE:"claude-sonnet-4-6",CURSOR:"auto",CODEX:"o4-mini",GEMINI:"gemini-3-pro",OPENAI_POSTPROCESSING:"gpt-4o-mini"};var ke={auto:"claude-sonnet-4-6","opus-4.7":"claude-opus-4-7","opus-4-7":"claude-opus-4-7","sonnet-4.7":"claude-sonnet-4-7","sonnet-4-7":"claude-sonnet-4-7","sonnet-4.6":"claude-sonnet-4-6","sonnet-4-6":"claude-sonnet-4-6","opus-4.6":"claude-opus-4-6","opus-4-6":"claude-opus-4-6","sonnet-4.5":"claude-sonnet-4-5-20250929","sonnet-4-5":"claude-sonnet-4-5-20250929","opus-4.5":"claude-opus-4-5-20251101","opus-4-5":"claude-opus-4-5-20251101","haiku-4.5":"claude-haiku-4-5-20251001","haiku-4-5":"claude-haiku-4-5-20251001","claude-opus-4-7":"claude-opus-4-7","claude-sonnet-4-7":"claude-sonnet-4-7","claude-sonnet-4-6":"claude-sonnet-4-6","claude-opus-4-6":"claude-opus-4-6","claude-sonnet-4-5-20250929":"claude-sonnet-4-5-20250929","claude-opus-4-5-20251101":"claude-opus-4-5-20251101","claude-haiku-4-5-20251001":"claude-haiku-4-5-20251001","claude-opus-4-20250514":"claude-opus-4-20250514"},Pe={auto:"o4-mini","o4-mini":"o4-mini",o3:"o3","o3-mini":"o3-mini","codex-mini":"codex-mini-latest","gpt-4o":"gpt-4o","gpt-4o-mini":"gpt-4o-mini","gpt-5.2-codex":"gpt-5.2-codex","gpt-5.2":"gpt-5.2","gpt-5.3":"gpt-5.3","gpt-5.3-codex":"gpt-5.3-codex","gpt-5.4":"gpt-5.4","gpt-5.5":"gpt-5.5"},Ge={auto:"gemini-3-pro","gemini-3-pro":"gemini-3-pro","gemini-3-flash":"gemini-3-flash","gemini-2.5-pro":"gemini-2.5-pro","gemini-2.5-flash":"gemini-2.5-flash"},ge={CURSOR_AGENT_DEFAULT:1200*1e3,OPENAI_REQUEST:18e4};var V=class s{constructor(){this.buffer="",this.extractedResult=null,this.rawText="",this.zodSchema=null,this.lastOutputLength=0,this.onToolCall=null,this._lastToolEmit=null}processChunk(e){if(!e)return null;this.buffer+=e;let t=this.buffer.split(`
|
|
2
2
|
`);this.buffer=t.pop()||"";let r="";for(let o of t)if(o.trim())try{let n=JSON.parse(o);this._emitToolCalls(n);let i=this.extractText(n);if(i){if(this.rawText&&i.startsWith(this.rawText)){let a=i.substring(this.rawText.length);this.rawText=i,r+=a}else(!this.rawText.includes(i)||i.length<20)&&(this.rawText+=i,r+=i);this.tryExtractResult(this.rawText)}else this.isValidResult(n)&&(this.rawText+=`${o}
|
|
3
3
|
`,r+=`${o}
|
|
4
4
|
`,this.extractedResult=n)}catch{if(o.includes('"text"')||o.includes('"content"')){let i=o.match(/"text"\s*:\s*"([^"]*)/),a=o.match(/"content"\s*:\s*"([^"]*)/),c=i?i[1]:a?a[1]:null;c&&!this.rawText.includes(c)&&(r+=c,this.rawText+=c)}}return r||null}flush(){if(!this.buffer.trim())return null;let e="";try{let t=JSON.parse(this.buffer);this._emitToolCalls(t);let r=this.extractText(t);r&&(this.rawText+=r,e+=r,this.tryExtractResult(r))}catch{this.rawText+=this.buffer,e+=this.buffer,this.tryExtractResult(this.buffer)}return this.buffer="",e||null}_emitToolCalls(e){if(!this.onToolCall)return;let t=(i,a)=>{if(!i)return;let c=`${i}:${JSON.stringify(a??{})}`;this._lastToolEmit!==c&&(this._lastToolEmit=c,this.onToolCall(i,a??void 0))},r=i=>{if(i!=null){if(typeof i=="object"&&!Array.isArray(i))return i;if(typeof i=="string")try{return JSON.parse(i)}catch{return}}};if(e.type==="tool_use"||e.type==="tool_call"){if(e.name){t(e.name,r(e.input??e.arguments));return}let i=e.tool_call;if(i&&typeof i=="object"&&!Array.isArray(i)){let a=Object.keys(i);if(a.length===1){let c=a[0],f=i[c],u=f&&typeof f=="object"?f.args??f.input??f:void 0;t(c,r(u))}return}return}if(Array.isArray(e.tool_calls)){for(let i of e.tool_calls)t(i.name,r(i.input??i.arguments));return}let o=e.message??e;if(Array.isArray(o?.tool_calls)){for(let i of o.tool_calls)t(i.name,r(i.input??i.arguments));return}let n=o?.content??e.content;if(Array.isArray(n))for(let i of n)(i.type==="tool_use"||i.type==="tool_call")&&i.name&&t(i.name,r(i.input??i.arguments))}extractText(e){if(e.type==="assistant"&&e.message?.content){let t=e.message.content;if(Array.isArray(t))return t.filter(r=>r.type==="text"&&r.text).map(r=>r.text).join("")}return e.type==="thinking"&&e.text||e.text?e.text:e.content&&typeof e.content=="string"?e.content:e.delta?e.delta:null}tryExtractResult(e){if(!e||typeof e!="string")return;let t=[],r=/```json\s*\n?([\s\S]*?)\n?```/g,o;for(;(o=r.exec(e))!==null;){let h=o[1].trim();try{JSON.parse(h),t.push({text:h,source:"markdown"})}catch{}}let n=0,i=0;for(;n<e.length&&(n=e.indexOf("{",n),n!==-1);){let h=0,m=n;for(let y=n;y<e.length;y++)if(e[y]==="{")h++;else if(e[y]==="}"&&(h--,h===0)){m=y,t.push({text:e.substring(n,m+1),source:"brace"}),i++;break}n=m+1}let a=this.extractedResult,c=a?JSON.stringify(a).length:0,f=0,u=-1;for(let h=0;h<t.length;h++){let m=t[h];try{let y=m.text.replace(/,(\s*[}\]])/g,"$1"),O=JSON.parse(y);this.isValidResult(O)&&(f++,c=JSON.stringify(O).length,a=O,u=h)}catch{}}a&&(this.extractedResult=a)}isValidResult(e){if(!e||typeof e!="object"||Array.isArray(e)||e.session_id||e.timestamp_ms||e.type||e.call_id||e.tool_call||e.result&&typeof e.result=="object"&&(e.result.success&&typeof e.result.success=="object"||e.result.error&&typeof e.result.error=="object")||e.args&&typeof e.args=="object")return!1;if(this.zodSchema)try{return this.zodSchema.parse(e),!0}catch{return!1}return!0}getResult(){return this.extractedResult}getRawText(){return this.rawText}static extractResult(e,t=null){let r=new s;r.zodSchema=t,r.processChunk(e),r.flush();let o=r.getResult();return!o&&process.env.LOG_LEVEL==="debug"&&console.error("[StreamingParser] No result extracted from",e?.length||0,"chars"),o}};import{zodToJsonSchema as pt}from"zod-to-json-schema";var he=class{static generateFileOutputInstructions(e,t){let r;typeof e?.parse=="function"?r=pt(e,{target:"openApi3"}):r=e;let o=this._buildExample(r);return`
|
|
@@ -39,7 +39,7 @@ ${a}
|
|
|
39
39
|
|
|
40
40
|
Extract all relevant information and format it according to the schema. If any required fields are missing, do your best to infer them from the content.`,f={model:j.OPENAI_POSTPROCESSING,messages:[{role:"user",content:c}],response_format:{type:"json_schema",json_schema:{name:"extract",schema:n,strict:!0}}};l.info(`\u{1F4E4} Sending to OpenAI proxy: model=${j.OPENAI_POSTPROCESSING}, schema keys=${Object.keys(n.properties||{}).join(", ")}`),l.debug(` Schema size: ${JSON.stringify(n).length} chars`),l.debug(` Prompt size: ${c.length} chars`);try{let u={"Content-Type":"application/json"};process.env.OPENAI_PROXY_TOKEN?(u["x-proxy-token"]=t,u["x-execution-id"]=process.env.EXECUTION_ID||""):(u.Authorization=`Bearer ${t}`,u["x-api-key"]=process.env.ZIBBY_API_KEY||"",u["x-execution-id"]=process.env.EXECUTION_ID||"");let m=(await mt.post(r,f,{headers:u,timeout:ge.OPENAI_REQUEST})).data?.choices?.[0]?.message?.content;if(!m)throw new Error("OpenAI proxy returned empty response");let y=JSON.parse(m);return l.info("\u2705 Successfully formatted with OpenAI proxy"),{structured:y,raw:s}}catch(u){if(u.response){let h=u.response.status,m=u.response.data;throw l.error(`\u274C OpenAI proxy request failed: ${h}`),l.error(` Status: ${h}`),l.error(` Response: ${JSON.stringify(m,null,2)}`),h===401||h===403?new Error(`Authentication failed for OpenAI proxy.
|
|
41
41
|
Run \`zibby login\` or set ZIBBY_USER_TOKEN environment variable.
|
|
42
|
-
Response: ${JSON.stringify(m)}`,{cause:u}):new Error(`Failed to format Cursor output: ${m?.error?.message||"Unknown error"}`,{cause:u})}throw l.error(`\u274C OpenAI proxy request failed: ${u.message}`),new Error(`Failed to format output: ${u.message}`,{cause:u})}}function F(s){let e=`${s}_POOL`,t=process.env[e];if(!t||typeof t!="string")return{picked:null,count:0,dispose:()=>{}};let r=t.split(/[,\n]+/).map(i=>i.trim()).filter(Boolean);if(r.length===0)return{picked:null,count:0,dispose:()=>{}};let o=r[Math.floor(Math.random()*r.length)],n=process.env[s];return process.env[s]=o,l.debug(`[auth-pool] ${s}: picked 1 of ${r.length} from pool (***${o.slice(-4)})`),{picked:o,count:r.length,dispose(){n===void 0?delete process.env[s]:process.env[s]=n}}}import{timeline as H,Timeline as jo,WORKFLOW_GRAPH_LOG_MARKER_PREFIX as Fo}from"@zibby/agent-workflow";import{copyFileSync as At,existsSync as Ne,lstatSync as bt,mkdirSync as Fe,rmSync as wt,symlinkSync as Tt,unlinkSync as $t}from"node:fs";import{join as X}from"node:path";import{homedir as
|
|
42
|
+
Response: ${JSON.stringify(m)}`,{cause:u}):new Error(`Failed to format Cursor output: ${m?.error?.message||"Unknown error"}`,{cause:u})}throw l.error(`\u274C OpenAI proxy request failed: ${u.message}`),new Error(`Failed to format output: ${u.message}`,{cause:u})}}function F(s){let e=`${s}_POOL`,t=process.env[e];if(!t||typeof t!="string")return{picked:null,count:0,dispose:()=>{}};let r=t.split(/[,\n]+/).map(i=>i.trim()).filter(Boolean);if(r.length===0)return{picked:null,count:0,dispose:()=>{}};let o=r[Math.floor(Math.random()*r.length)],n=process.env[s];return process.env[s]=o,l.debug(`[auth-pool] ${s}: picked 1 of ${r.length} from pool (***${o.slice(-4)})`),{picked:o,count:r.length,dispose(){n===void 0?delete process.env[s]:process.env[s]=n}}}import{timeline as H,Timeline as jo,WORKFLOW_GRAPH_LOG_MARKER_PREFIX as Fo}from"@zibby/agent-workflow";import{copyFileSync as At,existsSync as Ne,lstatSync as bt,mkdirSync as Fe,rmSync as wt,symlinkSync as Tt,unlinkSync as $t}from"node:fs";import{join as X}from"node:path";import{homedir as xt}from"node:os";import{randomBytes as vt}from"node:crypto";var It=["cli-config.json","config.json","auth.json","argv.json"];function Ye(s){return!(!s||typeof s!="string"||process.env.ZIBBY_CURSOR_USE_GLOBAL_MCP==="1"||process.env.ZIBBY_CURSOR_USE_GLOBAL_MCP==="true")}function ze(s){let e=X(s||process.cwd(),".zibby","tmp");Fe(e,{recursive:!0});let t=`${process.pid}-${Date.now()}-${vt(4).toString("hex")}`,r=X(e,`cursor-agent-home-${t}`),o=X(r,".cursor");Fe(o,{recursive:!0});let n=xt(),i=X(n,".cursor");if(Ne(i))for(let a of It){let c=X(i,a);if(Ne(c))try{At(c,X(o,a))}catch{}}if(process.platform==="darwin"){let a=X(n,"Library");if(Ne(a))try{Tt(a,X(r,"Library"))}catch{}}return r}function He(s){if(!(!s||typeof s!="string"))try{let e=X(s,"Library");try{bt(e).isSymbolicLink()&&$t(e)}catch{}wt(s,{recursive:!0,force:!0})}catch{}}var ye=class extends Ct{constructor(){super("cursor","Cursor (CLI)",100)}canHandle(e){let t=[Y(ue(),".local","bin","cursor-agent"),Y(ue(),".cursor","bin","cursor-agent"),"/usr/local/bin/cursor-agent","/usr/local/bin/agent","agent","cursor-agent"];for(let r of t)try{if(r.startsWith("/")){Ve(r,Qe.X_OK);let o=Z(`"${r}" --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"});if(o&&o.length>0)return l.debug(`[Cursor] Found agent at: ${r} (version: ${o.trim().slice(0,50)})`),!0}else{let o=Z(`which ${r}`,{encoding:"utf-8",timeout:2e3,stdio:"pipe"}).trim();if(!o)continue;let n=Z(`${r} --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"});if(n&&n.length>0)return l.debug(`[Cursor] Found '${r}' in PATH at ${o} (version: ${n.trim().slice(0,50)})`),!0}}catch{continue}return l.warn("[Cursor] \u274C Cursor Agent CLI not found or not working. Run: agent --version"),!1}async invoke(e,t={}){let{workspace:r=process.cwd(),print:o=!1,schema:n=null,skills:i=null,sessionPath:a=null,nodeName:c=null,timeout:f=ge.CURSOR_AGENT_DEFAULT,config:u={},signal:h=null}=t,m=u?.agent?.strictMode||!1,y=t.model??u?.agent?.cursor?.model??j.CURSOR,O=F("CURSOR_API_KEY");try{l.debug(`[Cursor] Invoking (model: ${y}, timeout: ${f/1e3}s, skills: ${JSON.stringify(i)})`);let _=(this._setupMcpConfig(a,r,u,i,c)||{}).isolatedMcpHome??null,E=[Y(ue(),".local","bin","cursor-agent"),Y(ue(),".cursor","bin","cursor-agent"),"/usr/local/bin/cursor-agent","/usr/local/bin/agent","agent","cursor-agent"],b=null;for(let T of E)try{if(T.startsWith("/"))Ve(T,Qe.X_OK),Z(`"${T}" --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"});else{if(!Z(`which ${T}`,{encoding:"utf-8",timeout:2e3}).trim())throw new Error("not in PATH");Z(`${T} --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"})}b=T,l.debug(`[Agent] Using binary: ${T}`);break}catch(d){l.debug(`[Agent] Binary '${T}' check failed: ${d.message}`);continue}if(!b)throw new Error(`Cursor Agent CLI not found or not working.
|
|
43
43
|
|
|
44
44
|
Checked paths:
|
|
45
45
|
${E.map(T=>` - ${T}`).join(`
|
|
@@ -62,11 +62,11 @@ ${JSON.stringify(d,null,2).slice(0,500)}`),!m)throw new Error(`Agent output fail
|
|
|
62
62
|
${p}
|
|
63
63
|
|
|
64
64
|
The agent wrote invalid data that doesn't match the required outputSchema.
|
|
65
|
-
Enable strictMode in .zibby.config.js for automatic repair.`,{cause:S})}else{if(d)return l.info("\u2705 [Agent] File-based output extracted (no Zod parse fn) \u2014 accepting as structured"),m&&l.debug("[Agent] strictMode enabled but not needed \u2014 agent wrote valid file"),{raw:P,structured:d};R&&l.error("\u274C [Agent] Result file exists but produced no in-memory JSON (parse failed earlier)")}if(m&&!k){let S=C.parsedText,p=d?JSON.stringify(d):S;l.info(`[Agent] strictMode: calling OpenAI proxy to fix structured output (${p.length} chars in)`);try{let I=await je(p,n);if(T){let
|
|
65
|
+
Enable strictMode in .zibby.config.js for automatic repair.`,{cause:S})}else{if(d)return l.info("\u2705 [Agent] File-based output extracted (no Zod parse fn) \u2014 accepting as structured"),m&&l.debug("[Agent] strictMode enabled but not needed \u2014 agent wrote valid file"),{raw:P,structured:d};R&&l.error("\u274C [Agent] Result file exists but produced no in-memory JSON (parse failed earlier)")}if(m&&!k){let S=C.parsedText,p=d?JSON.stringify(d):S;l.info(`[Agent] strictMode: calling OpenAI proxy to fix structured output (${p.length} chars in)`);try{let I=await je(p,n);if(T){let x=n.parse(I.structured);return l.info("\u2705 [Agent] Proxy output passed Zod validation"),{raw:P,structured:x}}return{raw:P,...I}}catch(I){if(l.warn(`\u26A0\uFE0F [Agent] strictMode proxy failed: ${I.message}`),d)return l.warn("[Agent] Using agent's original result file as fallback"),{raw:P,structured:d}}}if(k)throw k;let U=R?d==null?"file existed but JSON.parse failed \u2014 see WARN log above":T?"JSON was valid but Zod validation failed \u2014 see WARN log above":"no structured object after read (unexpected)":"file never appeared (agent may not have run Write tool to the path above)";throw l.error(`\u274C [Agent] No validated structured output: ${U}`),l.error("\u{1F4A1} Tip: Set strictMode=true in .zibby.config.js for OpenAI proxy fallback"),new Error(`Agent did not produce a valid result file at ${g}. Enable strictMode for proxy fallback.`)}if(k)throw k;return this._extractFinalResult(P)||C?.parsedText||P}finally{O.dispose()}}_extractFinalResult(e){if(!e)return null;let t=e.split(`
|
|
66
66
|
`),r=null;for(let o of t){let n=o.trim();if(n)try{let i=JSON.parse(n);if(i.type==="assistant"&&i.message?.content){let a=i.message.content;if(Array.isArray(a)){let c=a.filter(f=>f.type==="text"&&f.text).map(f=>f.text).join("");c&&(r=c)}else typeof a=="string"&&a&&(r=a)}}catch{}}return r?.trim()||null}_setupMcpConfig(e,t,r,o=null,n=null){let i=r?.headless,a=Y(ue(),".cursor"),c=Y(a,"mcp.json"),f={};if(ce(c))try{f=JSON.parse(Ze(c,"utf-8"))}catch{}let u=f.mcpServers||{},h=r?.paths?.output||kt,m=Y(t||process.cwd(),h,Pt),y=Array.isArray(o)?o.map(_=>Xe(_)).filter(Boolean):[...Rt()].map(([,_])=>_),O=new Set;for(let _ of y)typeof _.resolve=="function"&&(O.has(_.serverName)||(O.add(_.serverName),this._ensureSkillConfigured(u,_,e,m,n,i)));if(e){let _=Xe("browser");_&&typeof _.resolve=="function"&&!O.has(_.serverName)&&this._ensureSkillConfigured(u,_,e,m,"execute_live",i)}if(Object.keys(u).length===0)return l.debug("[MCP] No MCP servers configured - agent will run without tool access"),{isolatedMcpHome:null};let D=`${JSON.stringify({mcpServers:u},null,2)}
|
|
67
|
-
`;if(Ye(e)){let _=ze(t||process.cwd()),E=Y(_,".cursor","mcp.json");return We(E,D,"utf8"),l.debug(`[MCP] Isolated cursor-agent HOME (session-scoped mcp.json): ${_} | servers: ${Object.keys(u).join(", ")}`),{isolatedMcpHome:_}}return ce(a)||qe(a,{recursive:!0}),We(c,D,"utf8"),l.debug(`[MCP] Global ~/.cursor/mcp.json | servers: ${Object.keys(u).join(", ")}`),{isolatedMcpHome:null}}_ensureSkillConfigured(e,t,r,o,n=null,i){let a=t.cursorKey||t.serverName,c=e[a]?a:e[t.serverName]?t.serverName:null;if(c&&r){let u=typeof t.resolve=="function"?t.resolve({sessionPath:r,nodeName:n,headless:i}):null;u?.args?e[c].args=u.args:e[c].args=(e[c].args||[]).map(y=>y.startsWith("--output-dir=")?`--output-dir=${r}`:y);let h=u?.env||{},m=t.sessionEnvKey?{[t.sessionEnvKey]:o}:{};e[c].env={...e[c].env||{},...h,...m},l.debug(`[MCP] Updated ${c} session \u2192 ${r}`);return}if(c)return;let f=t.resolve({sessionPath:r,nodeName:n,headless:i});f&&(e[a]={...f,...t.sessionEnvKey&&{env:{...f.env||{},[t.sessionEnvKey]:o}}},l.debug(`[MCP] Configured ${a}`))}_spawnWithStreaming(e,t,r,o,n=null,i=null,a=null,c=null){return new Promise((f,u)=>{let h=Date.now(),m="",y="",O=Date.now(),D=0,_=!1,E=null,b=!1,L=!1,g=null;if(i)try{g=Y(Dt(String(i)),Nt)}catch{g=null}let K=!1,B=()=>{K||(K=!0,He(a))},M={...process.env};a&&(M.HOME=a,process.platform==="win32"&&(M.USERPROFILE=a),l.debug(`[Agent] cursor-agent HOME=${a} (isolated MCP config)`));let A=Mt(e,t,{cwd:r,shell:!1,stdio:["pipe","pipe","pipe"],env:M,...c&&{signal:c}});l.debug(`[Agent] PID: ${A.pid}`);let $=null,N=()=>{_||L||(_=!0,E="aborted",l.warn("\u{1F6D1} Abort signal \u2014 terminating cursor-agent (SIGKILL in 5s if SIGTERM trapped)"),$=setTimeout(()=>{if(!L){l.warn("\u{1F6D1} SIGTERM not honored \u2014 sending SIGKILL");try{A.kill("SIGKILL")}catch{}}},5e3))};c&&(c.aborted?N():c.addEventListener("abort",N,{once:!0})),A.stdin.on("error",d=>{d.code!=="EPIPE"&&l.warn(`[Agent] stdin error: ${d.message}`)}),A.stdout.on("error",d=>{d.code!=="EPIPE"&&l.warn(`[Agent] stdout error: ${d.message}`)}),A.stderr.on("error",d=>{d.code!=="EPIPE"&&l.warn(`[Agent] stderr error: ${d.message}`)}),n?(A.stdin.write(n,d=>{d&&d.code!=="EPIPE"&&l.warn(`[Agent] Failed to write to stdin: ${d.message}`),A.stdin.end()}),l.debug(`[Agent] Prompt also piped to stdin (${n.length} chars)`)):A.stdin.end();let w=null;g&&(w=setInterval(()=>{if(!(_||L))try{if(ce(g)){_=!0,E="aborted";try{Lt(g)}catch{}l.warn("\u{1F6D1} External stop requested \u2014 terminating Cursor agent (and MCP browser session)"),A.kill("SIGTERM"),setTimeout(()=>{A.killed||A.kill("SIGKILL")},2e3)}}catch{}},600));let C=new Set,k=new Date(h).toISOString().replace(/\.\d+Z$/,""),P=setInterval(()=>{let d=Math.round((Date.now()-h)/1e3),R=Math.round((Date.now()-O)/1e3),U=[];try{let p=Math.ceil(d/60)+1,I=Z(`find "${r}" -type f -mmin -${p} -not -path '*/node_modules/*' -not -path '*/.git/*' -not -path '*/target/*' 2>/dev/null | head -20`,{encoding:"utf-8",timeout:5e3}).trim();if(I)for(let
|
|
68
|
-
`)){let x
|
|
69
|
-
${m.slice(-2e3)}`),A.kill("SIGTERM"),setTimeout(()=>{A.killed||A.kill("SIGKILL")},5e3)},o),T=new V;T.onToolCall=(d,R)=>{let U=d,S=R;if(d==="mcpToolCall"&&R?.name)U=R.name.replace(/^mcp_+[^_]+_+/,""),U.includes("-")&&U.split("-")[0]===U.split("-")[1]&&(U=U.split("-")[0]),S=R.args??R.input??R;else{if(d==="readToolCall"||d==="editToolCall"||d==="writeToolCall")return;(d.startsWith("mcp__")||d.includes("ToolCall"))&&(U=d.replace(/^mcp_+[^_]+_+/,"").replace(/ToolCall$/,""))}if(U.includes("memory")?H.stepMemory(`Tool: ${U}`):H.stepTool(`Tool: ${U}`),S!=null&&typeof S=="object"&&Object.keys(S).length>0&&!L){let I=JSON.stringify(S),
|
|
67
|
+
`;if(Ye(e)){let _=ze(t||process.cwd()),E=Y(_,".cursor","mcp.json");return We(E,D,"utf8"),l.debug(`[MCP] Isolated cursor-agent HOME (session-scoped mcp.json): ${_} | servers: ${Object.keys(u).join(", ")}`),{isolatedMcpHome:_}}return ce(a)||qe(a,{recursive:!0}),We(c,D,"utf8"),l.debug(`[MCP] Global ~/.cursor/mcp.json | servers: ${Object.keys(u).join(", ")}`),{isolatedMcpHome:null}}_ensureSkillConfigured(e,t,r,o,n=null,i){let a=t.cursorKey||t.serverName,c=e[a]?a:e[t.serverName]?t.serverName:null;if(c&&r){let u=typeof t.resolve=="function"?t.resolve({sessionPath:r,nodeName:n,headless:i}):null;u?.args?e[c].args=u.args:e[c].args=(e[c].args||[]).map(y=>y.startsWith("--output-dir=")?`--output-dir=${r}`:y);let h=u?.env||{},m=t.sessionEnvKey?{[t.sessionEnvKey]:o}:{};e[c].env={...e[c].env||{},...h,...m},l.debug(`[MCP] Updated ${c} session \u2192 ${r}`);return}if(c)return;let f=t.resolve({sessionPath:r,nodeName:n,headless:i});f&&(e[a]={...f,...t.sessionEnvKey&&{env:{...f.env||{},[t.sessionEnvKey]:o}}},l.debug(`[MCP] Configured ${a}`))}_spawnWithStreaming(e,t,r,o,n=null,i=null,a=null,c=null){return new Promise((f,u)=>{let h=Date.now(),m="",y="",O=Date.now(),D=0,_=!1,E=null,b=!1,L=!1,g=null;if(i)try{g=Y(Dt(String(i)),Nt)}catch{g=null}let K=!1,B=()=>{K||(K=!0,He(a))},M={...process.env};a&&(M.HOME=a,process.platform==="win32"&&(M.USERPROFILE=a),l.debug(`[Agent] cursor-agent HOME=${a} (isolated MCP config)`));let A=Mt(e,t,{cwd:r,shell:!1,stdio:["pipe","pipe","pipe"],env:M,...c&&{signal:c}});l.debug(`[Agent] PID: ${A.pid}`);let $=null,N=()=>{_||L||(_=!0,E="aborted",l.warn("\u{1F6D1} Abort signal \u2014 terminating cursor-agent (SIGKILL in 5s if SIGTERM trapped)"),$=setTimeout(()=>{if(!L){l.warn("\u{1F6D1} SIGTERM not honored \u2014 sending SIGKILL");try{A.kill("SIGKILL")}catch{}}},5e3))};c&&(c.aborted?N():c.addEventListener("abort",N,{once:!0})),A.stdin.on("error",d=>{d.code!=="EPIPE"&&l.warn(`[Agent] stdin error: ${d.message}`)}),A.stdout.on("error",d=>{d.code!=="EPIPE"&&l.warn(`[Agent] stdout error: ${d.message}`)}),A.stderr.on("error",d=>{d.code!=="EPIPE"&&l.warn(`[Agent] stderr error: ${d.message}`)}),n?(A.stdin.write(n,d=>{d&&d.code!=="EPIPE"&&l.warn(`[Agent] Failed to write to stdin: ${d.message}`),A.stdin.end()}),l.debug(`[Agent] Prompt also piped to stdin (${n.length} chars)`)):A.stdin.end();let w=null;g&&(w=setInterval(()=>{if(!(_||L))try{if(ce(g)){_=!0,E="aborted";try{Lt(g)}catch{}l.warn("\u{1F6D1} External stop requested \u2014 terminating Cursor agent (and MCP browser session)"),A.kill("SIGTERM"),setTimeout(()=>{A.killed||A.kill("SIGKILL")},2e3)}}catch{}},600));let C=new Set,k=new Date(h).toISOString().replace(/\.\d+Z$/,""),P=setInterval(()=>{let d=Math.round((Date.now()-h)/1e3),R=Math.round((Date.now()-O)/1e3),U=[];try{let p=Math.ceil(d/60)+1,I=Z(`find "${r}" -type f -mmin -${p} -not -path '*/node_modules/*' -not -path '*/.git/*' -not -path '*/target/*' 2>/dev/null | head -20`,{encoding:"utf-8",timeout:5e3}).trim();if(I)for(let x of I.split(`
|
|
68
|
+
`)){let v=x.replace(`${r}/`,"");C.has(v)||(C.add(v),U.push(v))}}catch{}let S="";U.length>0&&(S=` | \u{1F4C1} new: ${U.map(I=>I.split("/").pop()).join(", ")}`),C.size>0&&(S+=` | \u{1F4E6} total: ${C.size} files`),l.debug(`\u{1F493} [Agent] Running for ${d}s | ${D} lines output${S}`),D===0&&d>=30&&C.size===0&&(d<35&&l.warn(`\u26A0\uFE0F [Agent] No output after ${d}s \u2014 agent may be stuck. Check your CURSOR_API_KEY.`),d>=60&&(_=!0,E=E||"stall",l.error(`\u274C [Agent] No response after ${d}s \u2014 killing. Verify CURSOR_API_KEY is valid and agent CLI works: agent --version`),A.kill("SIGTERM"),setTimeout(()=>{A.killed||A.kill("SIGKILL")},3e3)))},3e4),G=setTimeout(()=>{_=!0,E=E||"timeout";let d=Math.round((Date.now()-h)/1e3);l.error(`\u23F1\uFE0F [Agent] Timeout after ${d}s \u2014 killing process (PID: ${A.pid})`),m.trim()&&l.warn(`\u{1F4E4} [Agent] Partial output (${m.length} chars) before timeout:
|
|
69
|
+
${m.slice(-2e3)}`),A.kill("SIGTERM"),setTimeout(()=>{A.killed||A.kill("SIGKILL")},5e3)},o),T=new V;T.onToolCall=(d,R)=>{let U=d,S=R;if(d==="mcpToolCall"&&R?.name)U=R.name.replace(/^mcp_+[^_]+_+/,""),U.includes("-")&&U.split("-")[0]===U.split("-")[1]&&(U=U.split("-")[0]),S=R.args??R.input??R;else{if(d==="readToolCall"||d==="editToolCall"||d==="writeToolCall")return;(d.startsWith("mcp__")||d.includes("ToolCall"))&&(U=d.replace(/^mcp_+[^_]+_+/,"").replace(/ToolCall$/,""))}if(U.includes("memory")?H.stepMemory(`Tool: ${U}`):H.stepTool(`Tool: ${U}`),S!=null&&typeof S=="object"&&Object.keys(S).length>0&&!L){let I=JSON.stringify(S),x=I.length>100?`${I.substring(0,100)}...`:I;console.log(` Input: ${x}`)}},A.stdout.on("data",d=>{let R=d.toString();m+=R,O=Date.now(),b||(b=!0);let U=T.processChunk(R);U&&!L&&process.stdout.write(U);let S=R.split(`
|
|
70
70
|
`).filter(p=>p.trim());D+=S.length}),A.stderr.on("data",d=>{let R=d.toString();y+=R,O=Date.now(),b||(b=!0);let U=R.split(`
|
|
71
71
|
`).filter(S=>S.trim());for(let S of U)l.warn(`\u26A0\uFE0F [Agent stderr] ${S}`)}),A.on("close",(d,R)=>{if(L=!0,B(),clearTimeout(G),clearInterval(P),w&&clearInterval(w),$&&clearTimeout($),c&&!c.aborted)try{c.removeEventListener("abort",N)}catch{}T.flush();let U=Math.round((Date.now()-h)/1e3);if(l.debug(`[Agent] Exited: code=${d}, signal=${R}, elapsed=${U}s, output=${m.length} chars`),_){if(E==="aborted"){let I=new Error("Aborted via signal");I.name="AbortError",u(I);return}u(new Error(`Cursor Agent timed out after ${U}s (limit: ${o/1e3}s). ${D} lines produced. Last output ${Math.round((Date.now()-O)/1e3)}s ago. ${m.trim()?`
|
|
72
72
|
Partial output (last 500 chars):
|
|
@@ -75,7 +75,7 @@ Stderr: ${y.slice(-1e3)}`:""}${m.trim()?`
|
|
|
75
75
|
Stdout (last 500 chars): ${m.slice(-500)}`:""}`));return}let S=T.getResult(),p=S?JSON.stringify(S,null,2):T.getRawText()||m||"";f({stdout:m||y||"",parsedText:p})}),A.on("error",d=>{if(B(),clearTimeout(G),clearInterval(P),w&&clearInterval(w),$&&clearTimeout($),c&&!c.aborted)try{c.removeEventListener("abort",N)}catch{}u(new Error(`Cursor Agent spawn error: ${d.message}
|
|
76
76
|
Binary: ${e}
|
|
77
77
|
This usually means the binary is not in PATH. Try:
|
|
78
|
-
echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.zshrc && source ~/.zshrc`))})})}};import{AgentStrategy as Ut,getSkill as Kt}from"@zibby/agent-workflow";import{query as Bt}from"@anthropic-ai/claude-agent-sdk";import{zodToJsonSchema as Jt}from"zod-to-json-schema";import{writeFileSync as Re,mkdirSync as Me,existsSync as et,readFileSync as tt}from"fs";import{homedir as ot}from"os";import{join as te}from"path";var _e=class extends Ut{constructor(){super("claude","Claude (Anthropic API)",50)}canHandle(e){let t=!!process.env.ANTHROPIC_API_KEY||!!process.env.ANTHROPIC_API_KEY_POOL,r=!!process.env.CLAUDE_CODE_OAUTH_TOKEN||!!process.env.CLAUDE_CODE_OAUTH_TOKEN_POOL,o=!!process.env.ANTHROPIC_AUTH_TOKEN||!!process.env.ANTHROPIC_AUTH_TOKEN_POOL,n=t||r||o;return n||l.debug("ClaudeAgentStrategy: no credentials. Set one of ANTHROPIC_API_KEY / CLAUDE_CODE_OAUTH_TOKEN / ANTHROPIC_AUTH_TOKEN (or a *_POOL variant for multi-token rotation)."),n}async invoke(e,t={}){let{model:r,workspace:o=process.cwd(),schema:n=null,images:i=[],skills:a=null,sessionPath:c=null,nodeName:f=null,timeout:u,config:h={},signal:m=null,sessionId:y,resume:O,forkSession:D,sessionStore:_}=t,E=r;(!E||E==="auto")&&(l.debug(`Model is '${E||"undefined"}', using default: ${j.CLAUDE}`),E=j.CLAUDE);let b=ke[E]||E;ke[E]&&E!==b&&l.debug(`Mapped model: ${E} \u2192 ${b}`);let L=[F("ANTHROPIC_API_KEY"),F("CLAUDE_CODE_OAUTH_TOKEN"),F("ANTHROPIC_AUTH_TOKEN")];try{l.debug(`Invoking Claude Agent SDK with model: ${b}, skills: ${JSON.stringify(a)}`);let g=process.env.CLAUDE_CODE_OAUTH_TOKEN,K=process.env.ANTHROPIC_API_KEY,B=process.env.ANTHROPIC_AUTH_TOKEN;process.env.CLAUDE_CODE_CREDENTIALS_JSON?Ft(process.env.CLAUDE_CODE_CREDENTIALS_JSON):g&&jt(g,process.env.__ZIBBY_CLAUDE_PLAN);let M=process.env.__ZIBBY_CLAUDE_PLAN,A=M?M.charAt(0).toUpperCase()+M.slice(1):null,$;g?$=A?`Claude ${A} plan \xB7 ***${g.slice(-4)}`:`Subscription \xB7 ***${g.slice(-4)}`:K?$=`API key \xB7 ***${K.slice(-4)}`:B?$=`Bearer \xB7 ***${B.slice(-4)}`:$="NONE \u2014 request will fail";let N=(await import("chalk")).default;console.log(""),console.log(` ${N.cyan("\u25C6")} ${N.bold(b)}`),console.log(` ${N.dim("Auth: ")}${$}`),console.log(` ${N.dim("Workdir: ")}${o}`),console.log(""),console.log(N.bold("Prompt sent to LLM:")),console.log(N.dim("\u2500".repeat(60))),console.log(N.dim(e)),console.log(N.dim("\u2500".repeat(60)));let{allowedTools:w,mcpServers:C}=this._resolveSkills(a,{sessionPath:c,workspace:o,nodeName:f});try{let k={cwd:o,allowedTools:w,settings:{permissions:{allow:["Bash(*)","Read(*)","Write(*)","Edit(*)","MultiEdit(*)","NotebookEdit(*)","Grep(*)","Glob(*)","WebFetch(*)","WebSearch(*)","Task(*)","TodoWrite(*)","Skill(*)"]}},model:b,...Object.keys(C).length>0&&{mcpServers:C},...y&&{sessionId:y},...O&&{resume:O},...D&&{forkSession:!0},..._&&{sessionStore:_}};if(n){let I=typeof n.parse=="function"?Jt(n,{target:"openApi3"}):n;k.outputFormat={type:"json_schema",schema:I},l.debug("Structured output enforced via SDK outputFormat")}l.debug(`Agent SDK options: ${JSON.stringify({cwd:k.cwd,toolCount:w.length,permissionMode:k.permissionMode,model:k.model,hasOutputFormat:!!k.outputFormat})}`);let P="",G=0,T=[];l.debug("Starting Claude Agent SDK query stream");let d;try{d=Bt({prompt:e,options:k})}catch(p){throw l.error(`Failed to initialize Claude Agent SDK: ${p.message}`),p}let R=null,U=0,S=3;if(m?.aborted){let p=new Error("Aborted via signal");throw p.name="AbortError",p}try{for await(let p of d){if(m?.aborted){let
|
|
78
|
+
echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.zshrc && source ~/.zshrc`))})})}};import{AgentStrategy as Ut,getSkill as Kt}from"@zibby/agent-workflow";import{query as Bt}from"@anthropic-ai/claude-agent-sdk";import{zodToJsonSchema as Jt}from"zod-to-json-schema";import{writeFileSync as Re,mkdirSync as Me,existsSync as et,readFileSync as tt}from"fs";import{homedir as ot}from"os";import{join as te}from"path";var _e=class extends Ut{constructor(){super("claude","Claude (Anthropic API)",50)}canHandle(e){let t=!!process.env.ANTHROPIC_API_KEY||!!process.env.ANTHROPIC_API_KEY_POOL,r=!!process.env.CLAUDE_CODE_OAUTH_TOKEN||!!process.env.CLAUDE_CODE_OAUTH_TOKEN_POOL,o=!!process.env.ANTHROPIC_AUTH_TOKEN||!!process.env.ANTHROPIC_AUTH_TOKEN_POOL,n=t||r||o;return n||l.debug("ClaudeAgentStrategy: no credentials. Set one of ANTHROPIC_API_KEY / CLAUDE_CODE_OAUTH_TOKEN / ANTHROPIC_AUTH_TOKEN (or a *_POOL variant for multi-token rotation)."),n}async invoke(e,t={}){let{model:r,workspace:o=process.cwd(),schema:n=null,images:i=[],skills:a=null,sessionPath:c=null,nodeName:f=null,timeout:u,config:h={},signal:m=null,sessionId:y,resume:O,forkSession:D,sessionStore:_}=t,E=r;(!E||E==="auto")&&(l.debug(`Model is '${E||"undefined"}', using default: ${j.CLAUDE}`),E=j.CLAUDE);let b=ke[E]||E;ke[E]&&E!==b&&l.debug(`Mapped model: ${E} \u2192 ${b}`);let L=[F("ANTHROPIC_API_KEY"),F("CLAUDE_CODE_OAUTH_TOKEN"),F("ANTHROPIC_AUTH_TOKEN")];try{l.debug(`Invoking Claude Agent SDK with model: ${b}, skills: ${JSON.stringify(a)}`);let g=process.env.CLAUDE_CODE_OAUTH_TOKEN,K=process.env.ANTHROPIC_API_KEY,B=process.env.ANTHROPIC_AUTH_TOKEN;process.env.CLAUDE_CODE_CREDENTIALS_JSON?Ft(process.env.CLAUDE_CODE_CREDENTIALS_JSON):g&&jt(g,process.env.__ZIBBY_CLAUDE_PLAN);let M=process.env.__ZIBBY_CLAUDE_PLAN,A=M?M.charAt(0).toUpperCase()+M.slice(1):null,$;g?$=A?`Claude ${A} plan \xB7 ***${g.slice(-4)}`:`Subscription \xB7 ***${g.slice(-4)}`:K?$=`API key \xB7 ***${K.slice(-4)}`:B?$=`Bearer \xB7 ***${B.slice(-4)}`:$="NONE \u2014 request will fail";let N=(await import("chalk")).default;console.log(""),console.log(` ${N.cyan("\u25C6")} ${N.bold(b)}`),console.log(` ${N.dim("Auth: ")}${$}`),console.log(` ${N.dim("Workdir: ")}${o}`),console.log(""),console.log(N.bold("Prompt sent to LLM:")),console.log(N.dim("\u2500".repeat(60))),console.log(N.dim(e)),console.log(N.dim("\u2500".repeat(60)));let{allowedTools:w,mcpServers:C}=this._resolveSkills(a,{sessionPath:c,workspace:o,nodeName:f});try{let k={cwd:o,allowedTools:w,settings:{permissions:{allow:["Bash(*)","Read(*)","Write(*)","Edit(*)","MultiEdit(*)","NotebookEdit(*)","Grep(*)","Glob(*)","WebFetch(*)","WebSearch(*)","Task(*)","TodoWrite(*)","Skill(*)"]}},model:b,...Object.keys(C).length>0&&{mcpServers:C},...y&&{sessionId:y},...O&&{resume:O},...D&&{forkSession:!0},..._&&{sessionStore:_}};if(n){let I=typeof n.parse=="function"?Jt(n,{target:"openApi3"}):n;k.outputFormat={type:"json_schema",schema:I},l.debug("Structured output enforced via SDK outputFormat")}l.debug(`Agent SDK options: ${JSON.stringify({cwd:k.cwd,toolCount:w.length,permissionMode:k.permissionMode,model:k.model,hasOutputFormat:!!k.outputFormat})}`);let P="",G=0,T=[];l.debug("Starting Claude Agent SDK query stream");let d;try{d=Bt({prompt:e,options:k})}catch(p){throw l.error(`Failed to initialize Claude Agent SDK: ${p.message}`),p}let R=null,U=0,S=3;if(m?.aborted){let p=new Error("Aborted via signal");throw p.name="AbortError",p}try{for await(let p of d){if(m?.aborted){let x=new Error("Aborted via signal");throw x.name="AbortError",x}if(T.push(p),p.type==="system"&&p.subtype==="init"){let x=p.mcp_servers||[];if(x.length>0){let v=x.map(J=>`${J.name}=${J.status}${J.error?` (${String(J.error).slice(0,120)})`:""}`).join(", ");l.info(`[mcp] SDK init \u2014 ${x.length} server(s): ${v}`);for(let J of x)J.status!=="connected"&&l.warn(`[mcp] server '${J.name}' did not connect: status=${J.status}`,{name:J.name,status:J.status,error:J.error})}else Object.keys(C||{}).length>0&&l.warn(`[mcp] SDK init returned no mcp_servers despite passing ${Object.keys(C).length} server(s) \u2014 SDK version may not expose this field, or config was dropped`);if(Array.isArray(p.tools)){let v=p.tools.filter(J=>J.startsWith("mcp__"));v.length>0?l.info(`[mcp] tools visible to model: ${v.join(", ")}`):Object.keys(C||{}).length>0&&l.warn("[mcp] no mcp__* tools in model's tool list \u2014 MCP servers configured but tools didn't reach the prompt")}}if(p.type==="error"||p.error){let x=p.error?.message||p.error||p.message||"Unknown API error";try{l.error("SDK error event raw payload",{fullMessage:JSON.stringify(p,null,2)})}catch{}throw new Error(typeof x=="string"?x:JSON.stringify(x))}let I=JSON.stringify(p.message?.content||p.text||"").slice(0,200);if(I===R){if(U++,U>=S){let x=(p.message?.content?.[0]?.text||p.text||"unknown").slice(0,100);throw new Error(`API stuck in loop (${U}x repeated): ${x}`)}}else R=I,U=1;if(p.type==="assistant"||p.constructor?.name==="AssistantMessage"){let x=p.message?.content||p.content||[];for(let v of x)if(v.type==="thinking"&&v.thinking)console.log(`${v.thinking.substring(0,200)}${v.thinking.length>200?"...":""}`);else if(v.type==="text"&&v.text)P+=v.text,v.text.length<500?console.log(`${v.text}`):console.log(`${v.text.substring(0,200)}... (${v.text.length} chars)`);else if(v.type==="tool_use"){G++,v.name.includes("memory")?H.stepMemory(`Tool: ${v.name}`):H.stepTool(`Tool: ${v.name}`);let ie=JSON.stringify(v.input).substring(0,100);console.log(` Input: ${ie}${JSON.stringify(v.input).length>100?"...":""}`)}}else if(!(p.type==="user"&&p.tool_use_result)){if(p.type==="result"||p.constructor?.name==="ResultMessage"){let x=p.result||p.text||p.content||P;try{Gt({message:p,sessionPath:c,nodeName:f,model:E,toolCallCount:G})}catch(v){l.debug(`usage.json write failed: ${v.message}`)}if(n){if(p.structured_output){l.debug("Using SDK native structured_output");let J=typeof n.parse=="function"?n.parse(p.structured_output):p.structured_output;return{raw:x,structured:J}}if(x){let v=this._extractJson(x,n);if(v)return{raw:x,structured:v}}l.warn(`Could not extract structured output \u2014 returning raw text (${(x||"").length} chars)`)}return x||""}}}if(l.warn(`Agent SDK ended without result. Collected ${T.length} messages`),P.length>0)return l.debug("Returning accumulated text from messages"),P;throw new Error("Claude Agent SDK query ended without result")}catch(p){let I={message:p?.message,name:p?.name,code:p?.code,cause:p?.cause?.message||p?.cause,stack:p?.stack?.split(`
|
|
79
79
|
`).slice(0,5).join(`
|
|
80
80
|
`),stringified:(()=>{try{return JSON.stringify(p,Object.getOwnPropertyNames(Object(p)))}catch{return String(p)}})()};throw l.error(`Error during query stream: ${p?.message||p}`,I),p}}catch(k){throw l.error("Claude Agent SDK call failed",{message:k?.message,name:k?.name,code:k?.code,cause:k?.cause?.message||k?.cause}),k}}finally{for(let g of L)g.dispose()}}_resolveSkills(e,t){let r=["Read","Write","Edit","Bash","Grep","Glob"];if(e===null)return l.debug("No skills \u2014 pure LLM mode"),{allowedTools:[],mcpServers:{}};if(!Array.isArray(e)||e.length===0)return l.debug("Default IDE skills for code generation"),{allowedTools:[...r],mcpServers:{}};let o=[...r],n={};for(let i of e){let a=Kt(i);if(!a){l.warn(`Unknown skill "${i}" \u2014 skipping`);continue}if(a.allowedTools&&o.push(...a.allowedTools),typeof a.resolve=="function"){let c=a.resolve(t);c&&(n[a.serverName]=c,l.debug(`MCP: ${a.serverName} \u2192 ${c.command} ${c.args[0]}`))}}return{allowedTools:o,mcpServers:n}}_extractJson(e,t){let r=[()=>{if(e.includes("===JSON_START===")){let o=e.indexOf("===JSON_START===")+16,n=e.indexOf("===JSON_END===");return e.substring(o,n).trim()}},()=>e.match(/```json\s*\n([\s\S]*?)\n```/)?.[1]?.trim(),()=>{if(!e.startsWith("{"))return e.match(/```\s*\n([\s\S]*?)\n```/)?.[1]?.trim()},()=>e.trim(),()=>{let o=e.indexOf("{"),n=e.lastIndexOf("}");if(o!==-1&&n>o)return e.substring(o,n+1)}];for(let o of r)try{let n=o();if(!n)continue;let i=JSON.parse(n);if(typeof i!="object"||i===null)continue;return typeof t.parse=="function"?t.parse(i):i}catch{}return null}};function Gt({message:s,sessionPath:e,nodeName:t,model:r,toolCallCount:o}){if(!e||!t)return;let n=s?.usage||s?.message?.usage||{},i=fe(n.input_tokens,n.inputTokens),a=fe(n.output_tokens,n.outputTokens),c=fe(n.cache_read_input_tokens,n.cacheReadInputTokens),f=fe(n.cache_creation_input_tokens,n.cacheCreationInputTokens),u=fe(s?.duration_ms,s?.durationMs),h={model:r||null,input_tokens:i,output_tokens:a,cache_read_tokens:c,cache_creation_tokens:f,tool_call_count:typeof o=="number"?o:null,duration_ms:u,captured_at:new Date().toISOString()},m=te(e,t);try{Me(m,{recursive:!0})}catch{}Re(te(m,"usage.json"),JSON.stringify(h,null,2),"utf-8")}function fe(...s){for(let e of s){if(typeof e=="number"&&Number.isFinite(e))return e;if(typeof e=="string"&&e.trim()!==""&&!isNaN(Number(e)))return Number(e)}return null}function jt(s,e){let t=te(ot(),".claude"),r=te(t,".credentials.json"),o={claudeAiOauth:{accessToken:s,...e?{subscriptionType:String(e).toLowerCase()}:{}}};try{if(et(r)&&JSON.parse(tt(r,"utf-8"))?.claudeAiOauth?.accessToken===s)return;Me(t,{recursive:!0}),Re(r,JSON.stringify(o,null,2),"utf-8"),l.debug(`Wrote Claude Code OAuth credentials to ${r}`)}catch(n){l.warn(`Could not write ${r}: ${n.message} \u2014 Claude SDK may fail to authenticate.`)}}function Ft(s){let e=te(ot(),".claude"),t=te(e,".credentials.json"),r;try{r=JSON.parse(s)}catch(o){l.warn(`CLAUDE_CODE_CREDENTIALS_JSON not valid JSON: ${o.message}`);return}if(!r?.claudeAiOauth?.accessToken){l.warn("CLAUDE_CODE_CREDENTIALS_JSON missing claudeAiOauth.accessToken \u2014 skipping write.");return}try{if(et(t)){let o=JSON.parse(tt(t,"utf-8"));if(o?.claudeAiOauth?.accessToken===r.claudeAiOauth.accessToken&&o?.claudeAiOauth?.expiresAt===r.claudeAiOauth.expiresAt)return}Me(e,{recursive:!0}),Re(t,JSON.stringify(r,null,2),"utf-8"),l.debug(`Wrote full Claude Code credentials blob to ${t}`)}catch(o){l.warn(`Could not write ${t}: ${o.message} \u2014 Claude SDK may fail to authenticate.`)}}import{AgentStrategy as Yt,getSkill as zt}from"@zibby/agent-workflow";import{execSync as Ht}from"node:child_process";import{zodToJsonSchema as Xt}from"zod-to-json-schema";var Se=class extends Yt{constructor(){super("codex","Codex (OpenAI)",75)}canHandle(e){if(!!!(process.env.OPENAI_API_KEY||process.env.OPENAI_API_KEY_POOL||process.env.CODEX_API_KEY||process.env.CODEX_API_KEY_POOL))return l.debug("CodexAgentStrategy: OPENAI_API_KEY or CODEX_API_KEY not set"),!1;try{return Ht("codex --version",{encoding:"utf-8",timeout:5e3,stdio:"pipe"}),!0}catch{return l.warn("[Codex] codex CLI not found. Install: npm install -g @openai/codex"),!1}}async invoke(e,t={}){let{model:r,workspace:o=process.cwd(),schema:n=null,skills:i=null,sessionPath:a=null,nodeName:c=null,timeout:f,config:u={},signal:h=null}=t,m=[F("OPENAI_API_KEY"),F("CODEX_API_KEY")];try{let{Codex:y}=await import("@openai/codex-sdk"),O=r;(!O||O==="auto")&&(l.debug(`Model is '${O||"undefined"}', using default: ${j.CODEX}`),O=j.CODEX);let D=Pe[O]||O;Pe[O]&&O!==D&&l.debug(`Mapped model: ${O} \u2192 ${D}`),l.debug(`Invoking Codex SDK with model: ${D}, skills: ${JSON.stringify(i)}`);let _=process.env.CODEX_API_KEY||process.env.OPENAI_API_KEY;_&&!process.env.CODEX_API_KEY&&(process.env.CODEX_API_KEY=_);let E=_?` | key: ***${_.slice(-4)}`:" | key: not set";console.log(`
|
|
81
81
|
\u25C6 Model: ${D}${E}
|
|
@@ -85,7 +85,7 @@ ${S}`,"schema_instruction","append");let p=`zibby-result-${Date.now()}.json`,I=q
|
|
|
85
85
|
${S}`,"json_instruction","append")}let K=b.build(),B=b.getUserPrompt(),M=b.getStats(),A=String(process.env.GEMINI_API_KEY||process.env.GOOGLE_API_KEY||"").trim(),$=A?` | key: ***${A.slice(-4)}`:" | key: not set";console.log(`
|
|
86
86
|
\u25C6 Model: ${y||"auto"}${$}
|
|
87
87
|
`);let N=(await import("chalk")).default;console.log(`
|
|
88
|
-
${N.bold("Prompt sent to LLM:")}`),console.log(N.dim("\u2500".repeat(60))),console.log(N.dim(B)),console.log(N.dim("\u2500".repeat(60)));let w=this._createGeminiConfigDir(o,_),C=["--output-format","json"];y&&y!=="auto"&&C.push("--model",y);let k=Object.keys(_);if(k.length>0){C.push("--approval-mode","yolo");for(let S of k)C.push("--allowed-mcp-server-names",S);l.info(`[Gemini] Enabling MCP servers: ${k.join(", ")}`)}else i&&i.length>0&&l.warn(`[Gemini] Skills requested but no MCP servers configured: ${i.join(", ")}`);C.push("-p",K);let P={...process.env,GEMINI_CLI_HOME:w};O?(P.GEMINI_API_KEY=O,delete P.GOOGLE_API_KEY):D&&(P.GOOGLE_API_KEY=D,delete P.GEMINI_API_KEY),l.debug(`[Gemini] Command: gemini ${C.slice(0,8).join(" ")}... (${C.length} total args)`),l.debug(`[Gemini] User prompt: ${M.userPromptLength} chars, System instructions: ${M.systemInstructionsLength} chars (${M.instructionCount} blocks), Full: ${M.fullPromptLength} chars`),l.debug(`[Gemini] Config home: ${w}`),l.debug(`[Gemini] GEMINI_CLI_HOME env: ${P.GEMINI_CLI_HOME}`);let G="",T=null;try{G=await new Promise((p,I)=>{let
|
|
88
|
+
${N.bold("Prompt sent to LLM:")}`),console.log(N.dim("\u2500".repeat(60))),console.log(N.dim(B)),console.log(N.dim("\u2500".repeat(60)));let w=this._createGeminiConfigDir(o,_),C=["--output-format","json"];y&&y!=="auto"&&C.push("--model",y);let k=Object.keys(_);if(k.length>0){C.push("--approval-mode","yolo");for(let S of k)C.push("--allowed-mcp-server-names",S);l.info(`[Gemini] Enabling MCP servers: ${k.join(", ")}`)}else i&&i.length>0&&l.warn(`[Gemini] Skills requested but no MCP servers configured: ${i.join(", ")}`);C.push("-p",K);let P={...process.env,GEMINI_CLI_HOME:w};O?(P.GEMINI_API_KEY=O,delete P.GOOGLE_API_KEY):D&&(P.GOOGLE_API_KEY=D,delete P.GEMINI_API_KEY),l.debug(`[Gemini] Command: gemini ${C.slice(0,8).join(" ")}... (${C.length} total args)`),l.debug(`[Gemini] User prompt: ${M.userPromptLength} chars, System instructions: ${M.systemInstructionsLength} chars (${M.instructionCount} blocks), Full: ${M.fullPromptLength} chars`),l.debug(`[Gemini] Config home: ${w}`),l.debug(`[Gemini] GEMINI_CLI_HOME env: ${P.GEMINI_CLI_HOME}`);let G="",T=null;try{G=await new Promise((p,I)=>{let x=Vt("gemini",C,{cwd:o,env:P,stdio:["ignore","pipe","pipe"],...u&&{signal:u}}),v="",J="",ie=!1,le=null,Ie=!1,Be=setTimeout(()=>{try{x.kill("SIGTERM")}catch{}},f),me=()=>{Ie||ie||(Ie=!0,le=setTimeout(()=>{if(!ie)try{x.kill("SIGKILL")}catch{}},5e3))};u&&(u.aborted?me():u.addEventListener("abort",me,{once:!0})),x.stdout.on("data",W=>{v+=W.toString()}),x.stderr.on("data",W=>{J+=W.toString()}),x.on("error",W=>{if(clearTimeout(Be),le&&clearTimeout(le),u&&!u.aborted)try{u.removeEventListener("abort",me)}catch{}I(W)}),x.on("close",W=>{if(ie=!0,clearTimeout(Be),le&&clearTimeout(le),u&&!u.aborted)try{u.removeEventListener("abort",me)}catch{}if(Ie){let Je=new Error("Aborted via signal");return Je.name="AbortError",I(Je)}if(W===0)return p(v.trim());I(new Error(`gemini failed with code ${W}: ${(J||v).trim()}`))})})}catch(S){T=S}finally{try{eo(w,{recursive:!0,force:!0})}catch{}}let d=ro(G).trim();if(!n){if(T)throw T;return d}if(g){let S=rt(g);if(l.info(`[Gemini] Result file: ${S?"present":"missing"} at ${g}`),S)try{let p=st(g,"utf-8").trim(),I=JSON.parse(p),x=L?n.parse(I):I;return l.info("[Gemini] Structured output recovered from result file"),{raw:d,structured:x}}catch(p){l.warn(`[Gemini] Result file parse/validation failed: ${p.message}`)}else T||l.warn("[Gemini] Result file missing; falling back to stream-parsed JSON")}let R=null;if(n){let S=new V;S.zodSchema=n,S.processChunk(d),S.flush(),R=S.getResult()}if(l.info(`[Gemini] Raw stdout length: ${G.length} chars`),l.info(`[Gemini] Extracted text length: ${d.length} chars`),l.info(`[Gemini] StreamParser result: ${R?"extracted":"null"}`),R||(d.length<2e3?l.info(`[Gemini] Raw text preview:
|
|
89
89
|
${d}`):l.info(`[Gemini] Raw text preview (first 1000 chars):
|
|
90
90
|
${d.slice(0,1e3)}`),R=oo(d)),!R)throw T||(l.error("[Gemini] Failed to extract valid JSON from output"),l.error("\u{1F4A1} Tip: Set strictMode=true in .zibby.config.js for OpenAI proxy fallback"),new Error("Gemini did not return valid JSON for structured output. Enable strictMode for proxy fallback."));let U=L?n.parse(R):R;return{raw:d,structured:U}}finally{for(let m of h)m.dispose()}}_resolveSkillsToMcp(e,t={}){if(!Array.isArray(e)||e.length===0)return{};let r={};for(let o of e){let n=Zt(o);if(!n||typeof n.resolve!="function")continue;let i=n.resolve(t);if(!i)continue;let a=n.cursorKey||n.serverName||o,c={command:i.command};i.args?.length&&(c.args=i.args),i.env&&Object.keys(i.env).length>0&&(c.env=i.env),i.cwd&&(c.cwd=i.cwd),r[a]=c}return r}_createGeminiConfigDir(e,t){let r=`${Date.now()}-${Math.random().toString(16).slice(2,10)}`,o=q(e||process.cwd(),".zibby","tmp",`gemini-home-${r}`),n=q(o,".gemini");nt(n,{recursive:!0});let i=q(n,"settings.json"),a={},c=q(process.env.HOME||"",".gemini","settings.json");if(rt(c))try{a=JSON.parse(st(c,"utf-8"))}catch{a={}}let f={...a,mcpServers:{...a.mcpServers&&typeof a.mcpServers=="object"?a.mcpServers:{},...t||{}}};it(i,`${JSON.stringify(f,null,2)}
|
|
91
91
|
`,"utf-8");let u=q(e||process.cwd(),".zibby","tmp","gemini-settings-debug.json");try{it(u,`${JSON.stringify(f,null,2)}
|
|
@@ -95,11 +95,11 @@ ${d.slice(0,1e3)}`),R=oo(d)),!R)throw T||(l.error("[Gemini] Failed to extract va
|
|
|
95
95
|
`);y=b.pop();for(let L of b){if(!L.startsWith("data: "))continue;let g=L.slice(6).trim();if(g==="[DONE]")continue;let K;try{K=JSON.parse(g)}catch{continue}let B=K.choices?.[0]?.delta;if(B&&(B.content&&(O+=B.content,r.onToken&&r.onToken(B.content)),B.tool_calls))for(let M of B.tool_calls){let A=M.index??0;D.has(A)||D.set(A,{id:"",name:"",args:""});let $=D.get(A);M.id&&($.id=M.id),M.function?.name&&($.name=M.function.name),M.function?.arguments!=null&&($.args+=M.function.arguments)}}}if(D.size>0){let _=[...D.entries()].sort(([E],[b])=>E-b).map(([,E])=>({id:E.id,type:"function",function:{name:E.name,arguments:E.args}}));return{choices:[{message:{role:"assistant",content:O||null,tool_calls:_}}]}}return{choices:[{message:{role:"assistant",content:O}}]}}#e(e={}){let t=[e.signal,e.timeout?AbortSignal.timeout(e.timeout):null].filter(Boolean);return t.length>1?AbortSignal.any(t):t[0]||void 0}};import{Client as so}from"@modelcontextprotocol/sdk/client/index.js";import{StdioClientTransport as io}from"@modelcontextprotocol/sdk/client/stdio.js";var be=class{#e=new Map;async ensureServer(e,t){if(this.#e.has(e))return this.#e.get(e);let{command:r,args:o=[],env:n={}}=t;l.debug(`[MCP] Starting ${e}: ${r} ${o.join(" ")}`);let i=new io({command:r,args:o,env:{...process.env,...n}}),a=new so({name:`zibby-chat-${e}`,version:"1.0.0"},{capabilities:{}});await a.connect(i);let c={client:a,transport:i,serverConfig:t};return this.#e.set(e,c),c}async callTool(e,t,r={}){let o=this.#e.get(e);if(!o)throw new Error(`MCP server "${e}" not running`);l.debug(`[MCP] ${e}.${t}(${JSON.stringify(r).slice(0,200)})`);let n=await o.client.callTool({name:t,arguments:r});return{text:n.content?.filter(a=>a.type==="text").map(a=>a.text).join(`
|
|
96
96
|
`)||"",isError:n.isError||!1}}isRunning(e){return this.#e.has(e)}async stopServer(e){let t=this.#e.get(e);if(t){try{await t.client.close()}catch(r){l.debug(`[MCP] Error closing ${e}: ${r.message}`)}this.#e.delete(e)}}async stopAll(){let e=[...this.#e.keys()];await Promise.allSettled(e.map(t=>this.stopServer(t)))}};import{existsSync as lo,readFileSync as ao}from"node:fs";import{join as co}from"node:path";import{homedir as uo}from"node:os";function fo(){try{let s=co(uo(),".zibby","config.json");return lo(s)?JSON.parse(ao(s,"utf-8")):{}}catch{return{}}}function we(s){return String(s||"").replace(/\/v1\/?$/,"")}function po(s,e){let t=process.env.OPENAI_PROXY_URL;if(t)return we(t);if(s==="session")return e.proxyUrl?we(e.proxyUrl):`${(process.env.ZIBBY_API_URL||"https://api-prod.zibby.app").replace(/\/$/,"")}/openai-proxy`;if(s==="byok"){let r=process.env.OPENAI_BASE_URL;return we(r||"https://api.openai.com")}return we(t||"")}function Ue(){let s=fo(),e=process.env.ZIBBY_USER_TOKEN||s.sessionToken||null,t=process.env.OPENAI_API_KEY||null,r=(process.env.ASSISTANT_AUTH_MODE||"").trim().toLowerCase(),o=process.env.OPENAI_PROXY_NO_AUTH==="true",n=process.env.OPENAI_PROXY_URL,i="session";r==="byok"||r==="local"||r==="session"?i=r:e?i="session":t?i="byok":n&&o&&(i="local");let a=po(i,s),c={"Content-Type":"application/json"};if(i==="session"){if(!e)return{ok:!1,mode:i,reason:"missing_session_token"};c.Authorization=`Bearer ${e}`}else if(i==="byok"){if(!t)return{ok:!1,mode:i,reason:"missing_openai_api_key"};c.Authorization=`Bearer ${t}`}else if(i==="local"){if(!a)return{ok:!1,mode:i,reason:"missing_openai_proxy_url"};!o&&t&&(c.Authorization=`Bearer ${t}`)}return a?{ok:!0,mode:i,baseUrl:a,headers:c,tokenPreview:c.Authorization?`***${c.Authorization.slice(-4)}`:"none"}:{ok:!1,mode:i,reason:"missing_base_url"}}function Te(s,e){let t=String(s??"");return t.length<=e?t:`${t.slice(0,Math.max(0,e-30))}
|
|
97
97
|
|
|
98
|
-
[tool result truncated for size]`}function mo(s,e){if(typeof s=="string")return Te(s,e);try{return Te(JSON.stringify(s),e)}catch{return Te(String(s),e)}}function ct(s){let e=new Set;for(let o of s)if(o.role==="assistant"&&Array.isArray(o.tool_calls))for(let n of o.tool_calls)e.add(n.id);let t=s.filter(o=>o.role==="tool"?e.has(o.tool_call_id):!0),r=new Set;for(let o of t)o.role==="tool"&&r.add(o.tool_call_id);return t.map(o=>{if(o.role!=="assistant"||!Array.isArray(o.tool_calls)||o.tool_calls.every(c=>r.has(c.id)))return o;let{tool_calls:i,...a}=o;return{...a,content:a.content||""}})}function go(s){let e=Array.isArray(s?.messages)?s.messages:[],t=e.find(n=>n.role==="system"),r=e.slice(-4).map(n=>({...n,content:Te(n.content,n.role==="tool"?1200:2500)}));r=ct(r);let o={...s,messages:[t,...r].filter(Boolean)};return delete o.tools,o}async function ho({body:s,streaming:e,auth:t,options:r,fetchCompletion:o,fetchStreamingCompletion:n,onFallbackLog:i}){try{return e?await n(s,t,r):await o(s,t,r)}catch(a){let c=String(a?.message||a||"");if(!/proxy error 413|payload too large/i.test(c))throw a;let f=go(s);return typeof i=="function"&&i(s,f),{data:e?await n(f,t,r):await o(f,t,r),fallback:f}}}async function ut({body:s,auth:e,options:t,streaming:r,toolContext:o,activeSkills:n,round:i,verbose:a,dependencies:c,config:f={}}){let u=f.maxToolResultChars||3e3,{fetchCompletion:h,fetchStreamingCompletion:m,onFallbackLog:y,hasToolCalls:O,getTextContent:D,parseToolCalls:_,buildAssistantMessage:E,buildToolResultMessage:b,executeTool:L,onToolCallLog:g,injectTools:K}=c;Array.isArray(s?.messages)&&(s.messages=ct(s.messages));let B=await ho({body:s,streaming:r,auth:e,options:t,fetchCompletion:h,fetchStreamingCompletion:m,onFallbackLog:y}),M=B?.data||B;if(!O(M))return{done:!0,text:D(M),body:B?.fallback||s};let A=_(M),$=B?.fallback||s;$.messages.push(E(M)),a&&typeof g=="function"&&g(A);let N=await Promise.all(A.map((w,C)=>(typeof t.onToolCall=="function"&&t.onToolCall(w.name,w.args,{round:i,index:C,total:A.length}),L(w,o))));for(let w=0;w<A.length;w++){let k=A[w].name==="get_skill_context"?typeof N[w]=="string"?N[w]:JSON.stringify(N[w]):mo(N[w],u);$.messages.push(b(A[w].id,k))}return typeof t.onToolCall=="function"&&t.onToolCall(null),K($,n),{done:!1,body:$}}var _o=j.ASSISTANT,So=15,Ke="get_skill_context";function se(s){!s||typeof s!="object"||(s.type==="object"&&s.properties&&(s.required=Object.keys(s.properties),s.additionalProperties=!1,Object.values(s.properties).forEach(se)),s.type==="array"&&s.items&&se(s.items),s.anyOf&&s.anyOf.forEach(se),s.oneOf&&s.oneOf.forEach(se),s.allOf&&s.allOf.forEach(se))}var ft={maxBytes:49e3,systemMaxChars:12e3},ne=()=>process.env.ZIBBY_VERBOSE==="true"||process.env.ZIBBY_DEBUG==="true",Eo=s=>Buffer.byteLength(JSON.stringify(s),"utf8");function
|
|
98
|
+
[tool result truncated for size]`}function mo(s,e){if(typeof s=="string")return Te(s,e);try{return Te(JSON.stringify(s),e)}catch{return Te(String(s),e)}}function ct(s){let e=new Set;for(let o of s)if(o.role==="assistant"&&Array.isArray(o.tool_calls))for(let n of o.tool_calls)e.add(n.id);let t=s.filter(o=>o.role==="tool"?e.has(o.tool_call_id):!0),r=new Set;for(let o of t)o.role==="tool"&&r.add(o.tool_call_id);return t.map(o=>{if(o.role!=="assistant"||!Array.isArray(o.tool_calls)||o.tool_calls.every(c=>r.has(c.id)))return o;let{tool_calls:i,...a}=o;return{...a,content:a.content||""}})}function go(s){let e=Array.isArray(s?.messages)?s.messages:[],t=e.find(n=>n.role==="system"),r=e.slice(-4).map(n=>({...n,content:Te(n.content,n.role==="tool"?1200:2500)}));r=ct(r);let o={...s,messages:[t,...r].filter(Boolean)};return delete o.tools,o}async function ho({body:s,streaming:e,auth:t,options:r,fetchCompletion:o,fetchStreamingCompletion:n,onFallbackLog:i}){try{return e?await n(s,t,r):await o(s,t,r)}catch(a){let c=String(a?.message||a||"");if(!/proxy error 413|payload too large/i.test(c))throw a;let f=go(s);return typeof i=="function"&&i(s,f),{data:e?await n(f,t,r):await o(f,t,r),fallback:f}}}async function ut({body:s,auth:e,options:t,streaming:r,toolContext:o,activeSkills:n,round:i,verbose:a,dependencies:c,config:f={}}){let u=f.maxToolResultChars||3e3,{fetchCompletion:h,fetchStreamingCompletion:m,onFallbackLog:y,hasToolCalls:O,getTextContent:D,parseToolCalls:_,buildAssistantMessage:E,buildToolResultMessage:b,executeTool:L,onToolCallLog:g,injectTools:K}=c;Array.isArray(s?.messages)&&(s.messages=ct(s.messages));let B=await ho({body:s,streaming:r,auth:e,options:t,fetchCompletion:h,fetchStreamingCompletion:m,onFallbackLog:y}),M=B?.data||B;if(!O(M))return{done:!0,text:D(M),body:B?.fallback||s};let A=_(M),$=B?.fallback||s;$.messages.push(E(M)),a&&typeof g=="function"&&g(A);let N=await Promise.all(A.map((w,C)=>(typeof t.onToolCall=="function"&&t.onToolCall(w.name,w.args,{round:i,index:C,total:A.length}),L(w,o))));for(let w=0;w<A.length;w++){let k=A[w].name==="get_skill_context"?typeof N[w]=="string"?N[w]:JSON.stringify(N[w]):mo(N[w],u);$.messages.push(b(A[w].id,k))}return typeof t.onToolCall=="function"&&t.onToolCall(null),K($,n),{done:!1,body:$}}var _o=j.ASSISTANT,So=15,Ke="get_skill_context";function se(s){!s||typeof s!="object"||(s.type==="object"&&s.properties&&(s.required=Object.keys(s.properties),s.additionalProperties=!1,Object.values(s.properties).forEach(se)),s.type==="array"&&s.items&&se(s.items),s.anyOf&&s.anyOf.forEach(se),s.oneOf&&s.oneOf.forEach(se),s.allOf&&s.allOf.forEach(se))}var ft={maxBytes:49e3,systemMaxChars:12e3},ne=()=>process.env.ZIBBY_VERBOSE==="true"||process.env.ZIBBY_DEBUG==="true",Eo=s=>Buffer.byteLength(JSON.stringify(s),"utf8");function xe(s){return Array.isArray(s)?new Set(s.map(e=>String(e||"").trim()).filter(Boolean)):new Set}function Oo(s){return Array.isArray(s)?s.map(e=>String(e||"").trim()).filter(Boolean):[]}var ve=class extends yo{#e;#t;#o=new be;constructor(e=null){super("assistant","Zibby Assistant",200),e&&typeof e=="object"&&(e.toolProvider||e.completionProvider)?(this.#e=e.toolProvider||new oe,this.#t=e.completionProvider||new re):(this.#e=e||new oe,this.#t=new re)}canHandle(e){return Ue().ok}async invoke(e,t={}){let r=F("OPENAI_API_KEY");try{let o=t.model&&t.model!=="auto"?t.model:_o,n=Ue();if(!n.ok)throw n.reason==="missing_session_token"?new Error("Login required. Run `zibby login` to authenticate."):n.reason==="missing_openai_api_key"?new Error("Missing OPENAI_API_KEY for BYOK mode."):n.reason==="missing_openai_proxy_url"?new Error("Missing OPENAI_PROXY_URL for local mode."):new Error(`Assistant auth unavailable (${n.reason}).`);let i=t.messages||[{role:"user",content:e}],a=n.baseUrl,c=ne();if(c?await this.#m(i,o,a,n.tokenPreview||"none"):l.debug(`[Assistant] ${a} | model: ${o} | messages: ${i.length}`),t.schema)return this.#c(o,i,n,t);let f=t.activeSkills||[],u=this.#f(t),h=this.#d(f,u),m=this.#p(h),y=this.#u(t),O={...t,payloadCompaction:y},D={activeSkills:h,options:O,executionRegistry:m,capabilityPolicy:u},_=!!t.stream,E={model:o,messages:[...i],stream:!1};this.#n(E,h,u);for(let b=0;b<So;b++){if(t.signal?.aborted){let g=new Error("Aborted via signal");throw g.name="AbortError",g}let L=await ut({body:E,auth:n,options:O,streaming:_,toolContext:D,activeSkills:h,round:b,verbose:c,dependencies:{fetchCompletion:this.#s.bind(this),fetchStreamingCompletion:this.#a.bind(this),onFallbackLog:(g,K)=>{ne()&&console.log(`413 fallback: messages ${g.messages.length} -> ${K.messages.length}, bytes=${Eo(K)}`)},hasToolCalls:g=>this.#e.hasToolCalls(g),getTextContent:g=>this.#e.getTextContent(g),parseToolCalls:g=>this.#e.parseToolCalls(g),buildAssistantMessage:g=>this.#e.buildAssistantMessage(g),buildToolResultMessage:(g,K)=>this.#e.buildToolResultMessage(g,K),executeTool:(g,K)=>this.#l(g,K),onToolCallLog:async g=>{let K=(await import("chalk")).default;console.log(K.dim(` ${g.map(B=>`${B.name}(${JSON.stringify(B.args).slice(0,80)})`).join(", ")}`))},injectTools:(g,K)=>this.#n(g,K,u)},config:{maxToolResultChars:t.maxToolResultChars||3e3}});if(L.done)return L.text;E.messages=L.body.messages,L.body.tools?E.tools=L.body.tools:delete E.tools}return"I hit my tool-calling limit for this turn. Please try again."}finally{r.dispose()}}async cleanup(){await this.#o.stopAll()}#n(e,t,r=null){let o=this.#i(t,r),n=this.#e.formatTools(o);this.#e.injectToolsIntoBody(e,n)}#i(e,t=null){let r=[],o=new Set;for(let n of e){let i=$e(n);if(i?.tools?.length)for(let a of i.tools)this.#r(a.name,t)&&(o.has(a.name)||(o.add(a.name),r.push({name:a.name,description:a.description,parameters:a.parameters||a.input_schema||{type:"object",properties:{}}})))}return!t?.disableSkillContextTool&&this.#r(Ke,t)&&r.push({name:Ke,description:"Fetch full prompt guidance/instructions for one installed skill on demand. Use this before making complex tool decisions if guidance is needed.",parameters:{type:"object",properties:{skillId:{type:"string",description:"Installed skill id to inspect (e.g. jira, github, runner, chat-memory)"}},required:["skillId"]}}),r}async#l(e,t){let{activeSkills:r,options:o,executionRegistry:n,capabilityPolicy:i}=t;if(!this.#r(e.name,i))return`Tool "${e.name}" blocked by policy`;if(e.name===Ke){let f=String(e.args?.skillId||"").trim();if(!f)return JSON.stringify({error:"skillId is required"});if(!r.includes(f))return JSON.stringify({error:`Skill "${f}" is not active`,activeSkills:r});let u=$e(f);if(!u)return JSON.stringify({error:`Skill "${f}" not found`});let h=typeof u.promptFragment=="function"?u.promptFragment():u.promptFragment||"",m=(u.tools||[]).map(O=>O.name),y=JSON.stringify({skillId:f,description:u.description||"",toolNames:m,promptFragment:h||""});return ne()&&(console.log(`
|
|
99
99
|
\u{1F4D6} get_skill_context("${f}") \u2192 ${y.length} chars (fragment: ${h.length} chars)`),console.log(` tools: [${m.join(", ")}]`),console.log(` fragment preview: ${h.slice(0,200).replace(/\n/g,"\\n")}\u2026
|
|
100
|
-
`)),y}let a=n?.get(e.name)||null;if(!a)return`Unknown tool: ${e.name}`;let c=$e(a.skillId);if(!c)return`Skill "${a.skillId}" not found for tool "${e.name}"`;if(a.mode==="handler")try{return c.handleToolCall(e.name,e.args,t)}catch(f){return`Error in ${e.name}: ${f.message}`}if(a.mode==="mcp")try{if(!this.#o.isRunning(c.serverName)){let u=c.resolve(o);if(!u)return`Skill "${a.skillId}" is not available (cannot start server)`;await this.#o.ensureServer(c.serverName,u)}let f=await this.#o.callTool(c.serverName,e.name,e.args);return f.text||(f.isError?"Tool call failed":"Done")}catch(f){return`MCP error (${c.serverName}): ${f.message}`}return`Skill "${a.skillId}" owns tool "${e.name}" but has no execution mode`}async#a(e,t,r){return this.#t.fetchStreamingCompletion(e,t,{...r,onBudget:({beforeBytes:o,meta:n})=>{ne()&&console.log(`payload bytes (stream) before=${o} after=${n.bytes} trimmed=${n.trimmed} messages=${n.messageCount}`)}})}async#s(e,t,r){return this.#t.fetchCompletion(e,t,{...r,onBudget:({beforeBytes:o,meta:n})=>{ne()&&console.log(`payload bytes before=${o} after=${n.bytes} trimmed=${n.trimmed} messages=${n.messageCount}`)}})}async#c(e,t,r,o){let{zodToJsonSchema:n}=await import("zod-to-json-schema"),i=typeof o.schema?.parse=="function",a=i?n(o.schema):o.schema;delete a.$schema,se(a);let c={model:e,messages:t,stream:!1,response_format:{type:"json_schema",json_schema:{name:"extract",schema:a,strict:!0}}},f=await this.#s(c,r,o),u=this.#e.getTextContent(f),h=JSON.parse(u),m=i?o.schema.parse(h):h;return{raw:u,structured:m}}#u(e={}){let t=e?.config?.agent?.assistant?.payloadCompaction||{};return{maxBytes:Number(t.maxBytes||e.maxPayloadBytes||ft.maxBytes),systemMaxChars:Number(t.systemMaxChars||ft.systemMaxChars)}}#f(e={}){let t=e?.config?.agent?.assistant?.toolPolicy||{};return{allowTools:
|
|
100
|
+
`)),y}let a=n?.get(e.name)||null;if(!a)return`Unknown tool: ${e.name}`;let c=$e(a.skillId);if(!c)return`Skill "${a.skillId}" not found for tool "${e.name}"`;if(a.mode==="handler")try{return c.handleToolCall(e.name,e.args,t)}catch(f){return`Error in ${e.name}: ${f.message}`}if(a.mode==="mcp")try{if(!this.#o.isRunning(c.serverName)){let u=c.resolve(o);if(!u)return`Skill "${a.skillId}" is not available (cannot start server)`;await this.#o.ensureServer(c.serverName,u)}let f=await this.#o.callTool(c.serverName,e.name,e.args);return f.text||(f.isError?"Tool call failed":"Done")}catch(f){return`MCP error (${c.serverName}): ${f.message}`}return`Skill "${a.skillId}" owns tool "${e.name}" but has no execution mode`}async#a(e,t,r){return this.#t.fetchStreamingCompletion(e,t,{...r,onBudget:({beforeBytes:o,meta:n})=>{ne()&&console.log(`payload bytes (stream) before=${o} after=${n.bytes} trimmed=${n.trimmed} messages=${n.messageCount}`)}})}async#s(e,t,r){return this.#t.fetchCompletion(e,t,{...r,onBudget:({beforeBytes:o,meta:n})=>{ne()&&console.log(`payload bytes before=${o} after=${n.bytes} trimmed=${n.trimmed} messages=${n.messageCount}`)}})}async#c(e,t,r,o){let{zodToJsonSchema:n}=await import("zod-to-json-schema"),i=typeof o.schema?.parse=="function",a=i?n(o.schema):o.schema;delete a.$schema,se(a);let c={model:e,messages:t,stream:!1,response_format:{type:"json_schema",json_schema:{name:"extract",schema:a,strict:!0}}},f=await this.#s(c,r,o),u=this.#e.getTextContent(f),h=JSON.parse(u),m=i?o.schema.parse(h):h;return{raw:u,structured:m}}#u(e={}){let t=e?.config?.agent?.assistant?.payloadCompaction||{};return{maxBytes:Number(t.maxBytes||e.maxPayloadBytes||ft.maxBytes),systemMaxChars:Number(t.systemMaxChars||ft.systemMaxChars)}}#f(e={}){let t=e?.config?.agent?.assistant?.toolPolicy||{};return{allowTools:xe(t.allowTools||e.allowTools),denyTools:xe(t.denyTools||e.denyTools),denyPrefixes:Oo(t.denyPrefixes||e.denyToolPrefixes),includeSkills:xe(t.includeSkills||e.includeSkills),excludeSkills:xe(t.excludeSkills||e.excludeSkills),disableSkillContextTool:!!(t.disableSkillContextTool||e.disableSkillContextTool)}}#d(e,t){let r=t?.includeSkills||new Set,o=t?.excludeSkills||new Set;return r.size===0&&o.size===0?e:e.filter(n=>!(r.size>0&&!r.has(n)||o.has(n)))}#r(e,t){let r=String(e||"").trim();if(!r)return!1;let o=t?.allowTools;if(o&&o.size>0&&!o.has(r))return!1;let n=t?.denyTools;return!(n&&n.has(r)||(t?.denyPrefixes||[]).some(a=>r.startsWith(a)))}#p(e){let t=new Map,r=[];for(let o of e){let n=$e(o);if(!n?.tools?.length)continue;let i=typeof n.handleToolCall=="function"?"handler":n.serverName&&typeof n.resolve=="function"?"mcp":null;if(i)for(let a of n.tools){let c=String(a?.name||"").trim();if(c){if(t.has(c)){r.push({tool:c,winner:t.get(c).skillId,skipped:o});continue}t.set(c,{skillId:o,mode:i})}}}if(r.length>0&&ne()){let o=r.slice(0,5).map(n=>`${n.tool}:${n.winner}>${n.skipped}`).join(", ");console.log(`tool registry collisions: ${o}${r.length>5?" ...":""}`)}return t}async#m(e,t,r,o){console.log(`
|
|
101
101
|
\u25C6 Model: ${t} | proxy: ${r} | token: ${o||"none"}
|
|
102
|
-
`);let n=(await import("chalk")).default;console.log(n.bold("Prompt sent to LLM:")),console.log(n.dim("\u2500".repeat(60)));let i=!1;for(let a of e)if(a.role==="system")console.log(n.dim(`[System] ${a.content||""}`));else{i||(console.log(n.dim("\u2500\u2500\u2500 chat history \u2500\u2500\u2500")),i=!0);let c=a.role==="user"?"Human":"AI",f=a.content?.length>200?`${a.content.slice(0,200)}...`:a.content||"";console.log(n.dim(`[${c}] ${f}`))}console.log(n.dim("\u2500".repeat(60)))}};import{AgentStrategy as
|
|
102
|
+
`);let n=(await import("chalk")).default;console.log(n.bold("Prompt sent to LLM:")),console.log(n.dim("\u2500".repeat(60)));let i=!1;for(let a of e)if(a.role==="system")console.log(n.dim(`[System] ${a.content||""}`));else{i||(console.log(n.dim("\u2500\u2500\u2500 chat history \u2500\u2500\u2500")),i=!0);let c=a.role==="user"?"Human":"AI",f=a.content?.length>200?`${a.content.slice(0,200)}...`:a.content||"";console.log(n.dim(`[${c}] ${f}`))}console.log(n.dim("\u2500".repeat(60)))}};import{AgentStrategy as xn}from"@zibby/agent-workflow";var dt=[new ve,new ye,new _e,new Se,new Ee];function Ao(s={}){let{state:e={},preferredAgent:t=null}=s,r=t||e.agentType||process.env.AGENT_TYPE;if(!r)throw new Error("No agent specified. Set agent.claude, agent.cursor, agent.codex, or agent.gemini in .zibby.config.js");l.debug(`Agent selection: requested=${r}`);let o=dt.find(n=>n.getName()===r);if(!o)throw new Error(`Unknown agent '${r}'. Available: ${dt.map(n=>n.getName()).join(", ")}`);if(l.debug(`Checking if ${r} can handle this environment...`),!o.canHandle(s)){let i={assistant:"Run `zibby login` to authenticate",claude:"Set ANTHROPIC_API_KEY in .env",cursor:"Install cursor-agent CLI or set CURSOR_API_KEY",codex:"Install codex CLI (npm i -g @openai/codex) and set OPENAI_API_KEY in .env",gemini:"Install gemini CLI (npm i -g @google/gemini-cli) and set GEMINI_API_KEY in .env"}[r]||"Check your environment configuration";throw new Error(`Agent '${r}' is not available. ${i}`)}return l.debug(`Using agent: ${o.getName()}`),o}async function wn(s,e={},t={}){try{await import("@zibby/skills")}catch{}let r=Ao(e),o=e.state?.config||t.config||{},n=o.models||{},i=t.nodeName&&n[t.nodeName]||null,a=n.default||null,c=r.name,f=o.agent?.[c]?.model||null,u=i||a||f||t.model||null,h={...t,model:u,workspace:e.state?.workspace||t.workspace,schema:t.schema||e.schema,images:t.images||e.images||[],skills:t.skills||e.skills||[],config:o},m=h.skills||[],y=s;if(m.length>0&&!t.skipPromptFragments){let{getSkill:D}=await import("@zibby/agent-workflow"),_=m.map(E=>{let b=D(E)?.promptFragment;return typeof b=="function"?b():b}).filter(Boolean);_.length>0&&(y+=`
|
|
103
103
|
|
|
104
104
|
${_.join(`
|
|
105
105
|
|
|
@@ -111,4 +111,4 @@ ${_.join(`
|
|
|
111
111
|
|
|
112
112
|
${O}
|
|
113
113
|
`),l.debug(`Prompt length: ${y.length} chars`),process.env.STAGE!=="prod"&&l.debug(`Full prompt:
|
|
114
|
-
${y}`),r.invoke(y,h)}export{
|
|
114
|
+
${y}`),r.invoke(y,h)}export{xn as AgentStrategy,ve as AssistantStrategy,_e as ClaudeAgentStrategy,Se as CodexAgentStrategy,ye as CursorAgentStrategy,Ee as GeminiAgentStrategy,Ao as getAgentStrategy,wn as invokeAgent};
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import
|
|
2
|
-
${e.slice(-
|
|
1
|
+
import S from"axios";import{homedir as I}from"node:os";import{join as A}from"node:path";import{existsSync as x,readFileSync as N}from"node:fs";import{toJSONSchema as P}from"zod";import d from"chalk";var i={debug:0,info:1,warn:2,error:3,silent:4},g=class{constructor(){this._level=this._getLogLevel()}_getLogLevel(){if(process.env.ZIBBY_DEBUG==="true")return i.debug;if(process.env.ZIBBY_VERBOSE==="true")return i.info;let o=process.env.LOG_LEVEL?.toLowerCase();return o&&o in i?i[o]:i.info}_shouldLog(o){return i[o]>=this._level}_formatMessage(o,t,l={}){let s=new Date().toISOString(),u=`${this._getPrefix(o)} ${t}`;return Object.keys(l).length>0&&(u+=d.dim(` ${JSON.stringify(l)}`)),u}_getPrefix(o){return{debug:d.gray("[DEBUG]"),info:d.cyan("[INFO]"),warn:d.yellow("[WARN]"),error:d.red("\u274C [ERROR]")}[o]||""}debug(o,t){this._shouldLog("debug")&&console.log(this._formatMessage("debug",o,t))}info(o,t){this._shouldLog("info")&&console.log(this._formatMessage("info",o,t))}warn(o,t){this._shouldLog("warn")&&console.warn(this._formatMessage("warn",o,t))}error(o,t){this._shouldLog("error")&&console.error(this._formatMessage("error",o,t))}setLevel(o){o in i&&(this._level=i[o])}getLevel(){return Object.keys(i).find(o=>i[o]===this._level)}},n=new g;var O={ASSISTANT:"gpt-5.4-nano-2026-03-17",CLAUDE:"claude-sonnet-4-6",CURSOR:"auto",CODEX:"o4-mini",GEMINI:"gemini-3-pro",OPENAI_POSTPROCESSING:"gpt-4o-mini"};var _={CURSOR_AGENT_DEFAULT:1200*1e3,OPENAI_REQUEST:18e4};function b(){if(process.env.OPENAI_PROXY_TOKEN)return n.debug("[Auth] Using OPENAI_PROXY_TOKEN (ECS execution)"),process.env.OPENAI_PROXY_TOKEN;if(process.env.ZIBBY_USER_TOKEN)return n.debug("[Auth] Using ZIBBY_USER_TOKEN (CI/CD PAT)"),process.env.ZIBBY_USER_TOKEN;try{let e=A(I(),".zibby","config.json");if(x(e)){let o=JSON.parse(N(e,"utf-8"));if(o.sessionToken)return n.debug("[Auth] Using session token from zibby login"),o.sessionToken}}catch(e){n.debug(`[Auth] Could not read zibby login session: ${e.message}`)}return null}function R(){return process.env.OPENAI_PROXY_URL?process.env.OPENAI_PROXY_URL.replace(/\/v1\/?$/,""):"https://api-prod.zibby.app/openai-proxy"}function c(e){if(!(typeof e!="object"||e===null)){if(Object.keys(e).length===0){e.type="object",e.additionalProperties=!0;return}if(e.type||(e.properties?e.type="object":e.items&&(e.type="array")),e.type==="object")if(e.properties){for(let[o,t]of Object.entries(e.properties))t.type==="object"&&t.additionalProperties&&t.additionalProperties!==!1&&(!t.properties||Object.keys(t.properties).length===0)&&(e.properties[o]={type:["object","null"]});e.additionalProperties=!1,e.required=Object.keys(e.properties),Object.values(e.properties).forEach(c)}else"additionalProperties"in e||(e.additionalProperties=!0);e.type==="array"&&e.items&&c(e.items),e.anyOf&&e.anyOf.forEach(c),e.oneOf&&e.oneOf.forEach(c),e.allOf&&e.allOf.forEach(c)}}async function j(e,o){n.info("\u{1F527} [OpenAI Proxy] Formatting structured output...");let t=b();if(!t)throw new Error("Authentication required for structured output processing.\n Local development: Run `zibby login`\n CI/CD: Set ZIBBY_USER_TOKEN environment variable (Personal Access Token from UI settings)");let l=R();n.info(`\u{1F517} Using OpenAI proxy: ${l}`);let s=P(o),p=s;if(s.$ref&&s.definitions){let r=s.$ref.split("/").pop();p=s.definitions[r]||s,n.debug(`Extracted schema from $ref: ${r}`)}delete p.$schema,c(p);let u=4e5,E=e;e.length>u&&(n.warn(`\u26A0\uFE0F [OpenAI Proxy] Raw text (${e.length} chars) exceeds limit, keeping last ${u} chars`),E=`... [truncated early content] ...
|
|
2
|
+
${e.slice(-u)}`);let m=`Extract and format the following information into structured JSON matching the schema.
|
|
3
3
|
|
|
4
4
|
RAW CONTENT:
|
|
5
5
|
${E}
|
|
6
6
|
|
|
7
|
-
Extract all relevant information and format it according to the schema. If any required fields are missing, do your best to infer them from the content.`,y={model:O.OPENAI_POSTPROCESSING,messages:[{role:"user",content:
|
|
7
|
+
Extract all relevant information and format it according to the schema. If any required fields are missing, do your best to infer them from the content.`,y={model:O.OPENAI_POSTPROCESSING,messages:[{role:"user",content:m}],response_format:{type:"json_schema",json_schema:{name:"extract",schema:p,strict:!0}}};n.info(`\u{1F4E4} Sending to OpenAI proxy: model=${O.OPENAI_POSTPROCESSING}, schema keys=${Object.keys(p.properties||{}).join(", ")}`),n.debug(` Schema size: ${JSON.stringify(p).length} chars`),n.debug(` Prompt size: ${m.length} chars`);try{let r={"Content-Type":"application/json"};process.env.OPENAI_PROXY_TOKEN?(r["x-proxy-token"]=t,r["x-execution-id"]=process.env.EXECUTION_ID||""):(r.Authorization=`Bearer ${t}`,r["x-api-key"]=process.env.ZIBBY_API_KEY||"",r["x-execution-id"]=process.env.EXECUTION_ID||"");let a=(await S.post(l,y,{headers:r,timeout:_.OPENAI_REQUEST})).data?.choices?.[0]?.message?.content;if(!a)throw new Error("OpenAI proxy returned empty response");let h=JSON.parse(a);return n.info("\u2705 Successfully formatted with OpenAI proxy"),{structured:h,raw:e}}catch(r){if(r.response){let f=r.response.status,a=r.response.data;throw n.error(`\u274C OpenAI proxy request failed: ${f}`),n.error(` Status: ${f}`),n.error(` Response: ${JSON.stringify(a,null,2)}`),f===401||f===403?new Error(`Authentication failed for OpenAI proxy.
|
|
8
8
|
Run \`zibby login\` or set ZIBBY_USER_TOKEN environment variable.
|
|
9
|
-
Response: ${JSON.stringify(
|
|
9
|
+
Response: ${JSON.stringify(a)}`,{cause:r}):new Error(`Failed to format Cursor output: ${a?.error?.message||"Unknown error"}`,{cause:r})}throw n.error(`\u274C OpenAI proxy request failed: ${r.message}`),new Error(`Failed to format output: ${r.message}`,{cause:r})}}export{j as formatWithOpenAIProxy};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zibby/core",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.5",
|
|
4
4
|
"description": "Core test automation engine with multi-agent and multi-MCP support",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -34,8 +34,8 @@
|
|
|
34
34
|
"test:state-schema": "vitest run test/state-schema.test.js",
|
|
35
35
|
"test:state-schema:e2e": "node test/state-schema.e2e.test.js",
|
|
36
36
|
"export:workflows": "node scripts/export-default-workflows.js",
|
|
37
|
-
"lint": "eslint
|
|
38
|
-
"lint:fix": "eslint --fix
|
|
37
|
+
"lint": "eslint src test scripts --cache --cache-location node_modules/.cache/eslint/",
|
|
38
|
+
"lint:fix": "eslint --fix src test scripts --cache --cache-location node_modules/.cache/eslint/"
|
|
39
39
|
},
|
|
40
40
|
"keywords": [
|
|
41
41
|
"testing",
|