@zibby/core 0.4.1 → 0.4.3
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/index.js +99 -102
- package/dist/package.json +3 -2
- package/dist/register-built-in-strategies.js +49 -52
- package/dist/skills/session/index.js +1 -1
- package/dist/skills/session/session-skill.js +1 -1
- package/dist/skills/session/session-store.js +1 -0
- package/dist/strategies/claude-strategy.js +2 -5
- package/dist/strategies/cursor-strategy.js +32 -33
- package/dist/strategies/gemini-strategy.js +18 -19
- package/dist/strategies/index.js +47 -50
- package/dist/utils/repo-clone.js +1 -0
- package/package.json +3 -2
package/dist/strategies/index.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import{AgentStrategy as
|
|
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 W}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 F,resolve as Dt}from"node:path";import{homedir as ue}from"node:os";import ae from"chalk";var Y={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 Y.debug;if(process.env.ZIBBY_VERBOSE==="true")return Y.info;let e=process.env.LOG_LEVEL?.toLowerCase();return e&&e in Y?Y[e]:Y.info}_shouldLog(e){return Y[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 Y&&(this._level=Y[e])}getLevel(){return Object.keys(Y).find(e=>Y[e]===this._level)}},a=new Ce;var G={ASSISTANT:"gpt-5.4-nano-2026-03-17",CLAUDE:"claude-sonnet-4-6",CURSOR:"auto",CODEX:"o4-mini",GEMINI:"gemini-2.5-pro",OPENAI_POSTPROCESSING:"gpt-4o-mini"};var ke={auto:"claude-sonnet-4-6","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-20250514","opus-4-5":"claude-opus-4-20250514","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-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.4":"gpt-5.4"},Ge={auto:"gemini-2.5-pro","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 q=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 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(n)&&(this.rawText+=`${o}
|
|
3
3
|
`,r+=`${o}
|
|
4
|
-
`,this.extractedResult=n)}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 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 l=this.extractedResult,c=l?JSON.stringify(l).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,l=O,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 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
|
|
4
|
+
`,this.extractedResult=n)}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 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 l=this.extractedResult,c=l?JSON.stringify(l).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,l=O,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 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 dt}from"zod-to-json-schema";var he=class{static generateFileOutputInstructions(e,t){let r;typeof e?.parse=="function"?r=dt(e,{target:"openApi3"}):r=e;let o=this._buildExample(r);return`
|
|
5
5
|
\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
|
|
6
6
|
\u{1F6A8} MANDATORY: WRITE RESULT TO FILE \u{1F6A8}
|
|
7
7
|
\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
|
|
@@ -21,9 +21,9 @@ JSON types (strict \u2014 validators reject wrong types):
|
|
|
21
21
|
- Use true/false without quotes for booleans.
|
|
22
22
|
- Use unquoted null where a field may be null.
|
|
23
23
|
|
|
24
|
-
Rules: valid JSON only, no markdown wrapping, no extra text in the file.`}static _buildExample(e){if(!e)return{};let t=e.type;if(t==="object"&&e.properties){let r={};for(let[o,n]of Object.entries(e.properties))r[o]=this._buildExample(n);return r}if(t==="array"&&e.items)return[this._buildExample(e.items)];if(e.enum&&Array.isArray(e.enum)&&e.enum.length>0)return`<${e.enum.join("|")}>`;if(t==="string")return"<string>";if(t==="number"||t==="integer")return 0;if(t==="boolean")return!1;if(e.description)return`<${e.description}>`;if(e.nullable||e.oneOf||e.anyOf){let r=e.oneOf?.find(o=>o.type!=="null")||e.anyOf?.find(o=>o.type!=="null");return r?this._buildExample(r):null}return"<value>"}};var
|
|
24
|
+
Rules: valid JSON only, no markdown wrapping, no extra text in the file.`}static _buildExample(e){if(!e)return{};let t=e.type;if(t==="object"&&e.properties){let r={};for(let[o,n]of Object.entries(e.properties))r[o]=this._buildExample(n);return r}if(t==="array"&&e.items)return[this._buildExample(e.items)];if(e.enum&&Array.isArray(e.enum)&&e.enum.length>0)return`<${e.enum.join("|")}>`;if(t==="string")return"<string>";if(t==="number"||t==="integer")return 0;if(t==="boolean")return!1;if(e.description)return`<${e.description}>`;if(e.nullable||e.oneOf||e.anyOf){let r=e.oneOf?.find(o=>o.type!=="null")||e.anyOf?.find(o=>o.type!=="null");return r?this._buildExample(r):null}return"<value>"}};var V=class s{constructor(e=""){this.userPrompt=e,this.systemInstructions=[],this.metadata={}}setUserPrompt(e){return this.userPrompt=e,this}appendUserPrompt(e){return this.userPrompt?this.userPrompt+=`
|
|
25
25
|
|
|
26
|
-
${e}`:this.userPrompt=e,this}addSkillHints(e){return e&&this.systemInstructions.push({type:"skill_hints",content:e,position:"prepend"}),this}addStructuredOutput(e,t){if(e&&t){let r=
|
|
26
|
+
${e}`:this.userPrompt=e,this}addSkillHints(e){return e&&this.systemInstructions.push({type:"skill_hints",content:e,position:"prepend"}),this}addStructuredOutput(e,t){if(e&&t){let r=he.generateFileOutputInstructions(e,t);this.systemInstructions.push({type:"structured_output",content:r,position:"append"}),this.metadata.structuredOutputPath=t}return this}addExtraInstructions(e){if(e?.trim()){let t=`\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501
|
|
27
27
|
\u26A0\uFE0F PRIORITY OVERRIDE \u2014 THE FOLLOWING INSTRUCTIONS TAKE PRECEDENCE OVER ALL PREVIOUS CONTENT
|
|
28
28
|
\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501
|
|
29
29
|
|
|
@@ -31,19 +31,18 @@ ${e.trim()}`;this.systemInstructions.push({type:"extra_instructions",content:t,p
|
|
|
31
31
|
|
|
32
32
|
`),position:"append"}),this}addSystemInstruction(e,t="custom",r="append"){return e&&this.systemInstructions.push({type:t,content:e,position:r}),this}getUserPrompt(){return this.userPrompt}getSystemInstructions(){return this.systemInstructions}getMetadata(){return this.metadata}build(){let e=this.systemInstructions.filter(o=>o.position==="prepend").map(o=>o.content),t=this.systemInstructions.filter(o=>o.position==="append").map(o=>o.content);return[...e,this.userPrompt,...t].filter(Boolean).join(`
|
|
33
33
|
|
|
34
|
-
`)}getStats(){let e=this.userPrompt.length,t=this.build().length;return{userPromptLength:e,fullPromptLength:t,systemInstructionsLength:t-e,instructionCount:this.systemInstructions.length,instructionTypes:this.systemInstructions.map(r=>r.type)}}clone(){let e=new s(this.userPrompt);return e.systemInstructions=[...this.systemInstructions],e.metadata={...this.metadata},e}};import
|
|
34
|
+
`)}getStats(){let e=this.userPrompt.length,t=this.build().length;return{userPromptLength:e,fullPromptLength:t,systemInstructionsLength:t-e,instructionCount:this.systemInstructions.length,instructionTypes:this.systemInstructions.map(r=>r.type)}}clone(){let e=new s(this.userPrompt);return e.systemInstructions=[...this.systemInstructions],e.metadata={...this.metadata},e}};import mt from"axios";import{homedir as gt}from"node:os";import{join as ht}from"node:path";import{existsSync as yt,readFileSync as _t}from"node:fs";import{toJSONSchema as St}from"zod";function Et(){if(process.env.OPENAI_PROXY_TOKEN)return a.debug("[Auth] Using OPENAI_PROXY_TOKEN (ECS execution)"),process.env.OPENAI_PROXY_TOKEN;if(process.env.ZIBBY_USER_TOKEN)return a.debug("[Auth] Using ZIBBY_USER_TOKEN (CI/CD PAT)"),process.env.ZIBBY_USER_TOKEN;try{let s=ht(gt(),".zibby","config.json");if(yt(s)){let e=JSON.parse(_t(s,"utf-8"));if(e.sessionToken)return a.debug("[Auth] Using session token from zibby login"),e.sessionToken}}catch(s){a.debug(`[Auth] Could not read zibby login session: ${s.message}`)}return null}function Ot(){return process.env.OPENAI_PROXY_URL?process.env.OPENAI_PROXY_URL.replace(/\/v1\/?$/,""):"https://api-prod.zibby.app/openai-proxy"}function Q(s){if(!(typeof s!="object"||s===null)){if(Object.keys(s).length===0){s.type="object",s.additionalProperties=!0;return}if(s.type||(s.properties?s.type="object":s.items&&(s.type="array")),s.type==="object")if(s.properties){for(let[e,t]of Object.entries(s.properties))t.type==="object"&&t.additionalProperties&&t.additionalProperties!==!1&&(!t.properties||Object.keys(t.properties).length===0)&&(s.properties[e]={type:["object","null"]});s.additionalProperties=!1,s.required=Object.keys(s.properties),Object.values(s.properties).forEach(Q)}else"additionalProperties"in s||(s.additionalProperties=!0);s.type==="array"&&s.items&&Q(s.items),s.anyOf&&s.anyOf.forEach(Q),s.oneOf&&s.oneOf.forEach(Q),s.allOf&&s.allOf.forEach(Q)}}async function je(s,e){a.info("\u{1F527} [OpenAI Proxy] Formatting structured output...");let t=Et();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 r=Ot();a.info(`\u{1F517} Using OpenAI proxy: ${r}`);let o=St(e),n=o;if(o.$ref&&o.definitions){let u=o.$ref.split("/").pop();n=o.definitions[u]||o,a.debug(`Extracted schema from $ref: ${u}`)}delete n.$schema,Q(n);let i=4e5,l=s;s.length>i&&(a.warn(`\u26A0\uFE0F [OpenAI Proxy] Raw text (${s.length} chars) exceeds limit, keeping last ${i} chars`),l=`... [truncated early content] ...
|
|
35
35
|
${s.slice(-i)}`);let c=`Extract and format the following information into structured JSON matching the schema.
|
|
36
36
|
|
|
37
37
|
RAW CONTENT:
|
|
38
38
|
${l}
|
|
39
39
|
|
|
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:
|
|
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:G.OPENAI_POSTPROCESSING,messages:[{role:"user",content:c}],response_format:{type:"json_schema",json_schema:{name:"extract",schema:n,strict:!0}}};a.info(`\u{1F4E4} Sending to OpenAI proxy: model=${G.OPENAI_POSTPROCESSING}, schema keys=${Object.keys(n.properties||{}).join(", ")}`),a.debug(` Schema size: ${JSON.stringify(n).length} chars`),a.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 a.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 a.error(`\u274C OpenAI proxy request failed: ${h}`),a.error(` Status: ${h}`),a.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 a.error(`\u274C OpenAI proxy request failed: ${u.message}`),new Error(`Failed to format output: ${u.message}`,{cause:u})}}import{
|
|
43
|
-
`)}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,a.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 ir,WORKFLOW_GRAPH_LOG_MARKER_PREFIX as lr}from"@zibby/agent-workflow";import{copyFileSync as Nt,existsSync as Le,lstatSync as Rt,mkdirSync as He,rmSync as Lt,symlinkSync as Mt,unlinkSync as Dt}from"node:fs";import{join as X}from"node:path";import{homedir as Ut}from"node:os";import{randomBytes as Kt}from"node:crypto";var Bt=["cli-config.json","config.json","auth.json","argv.json"];function Xe(s){return!(!s||typeof s!="string"||process.env.ZIBBY_CURSOR_USE_GLOBAL_MCP==="1"||process.env.ZIBBY_CURSOR_USE_GLOBAL_MCP==="true")}function We(s){let e=X(s||process.cwd(),".zibby","tmp");He(e,{recursive:!0});let t=`${process.pid}-${Date.now()}-${Kt(4).toString("hex")}`,r=X(e,`cursor-agent-home-${t}`),o=X(r,".cursor");He(o,{recursive:!0});let n=Ut(),i=X(n,".cursor");if(Le(i))for(let l of Bt){let c=X(i,l);if(Le(c))try{Nt(c,X(o,l))}catch{}}if(process.platform==="darwin"){let l=X(n,"Library");if(Le(l))try{Mt(l,X(r,"Library"))}catch{}}return r}function Ze(s){if(!(!s||typeof s!="string"))try{let e=X(s,"Library");try{Rt(e).isSymbolicLink()&&Dt(e)}catch{}Lt(s,{recursive:!0,force:!0})}catch{}}var Se=class extends Jt{constructor(){super("cursor","Cursor (CLI)",100)}canHandle(e){let t=[Y(pe(),".local","bin","cursor-agent"),Y(pe(),".cursor","bin","cursor-agent"),"/usr/local/bin/cursor-agent","/usr/local/bin/agent","/Applications/Cursor.app/Contents/Resources/app/bin/cursor","agent","cursor-agent"];for(let r of t)try{if(r.startsWith("/")){tt(r,ot.X_OK);let o=Z(`"${r}" --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"});if(o&&o.length>0)return a.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 a.debug(`[Cursor] Found '${r}' in PATH at ${o} (version: ${n.trim().slice(0,50)})`),!0}}catch{continue}return a.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:l=null,nodeName:c=null,timeout:f=ye.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{a.debug(`[Cursor] Invoking (model: ${y}, timeout: ${f/1e3}s, skills: ${JSON.stringify(i)})`);let g=(this._setupMcpConfig(l,r,u,i,c)||{}).isolatedMcpHome??null,$=[Y(pe(),".local","bin","cursor-agent"),Y(pe(),".cursor","bin","cursor-agent"),"/usr/local/bin/cursor-agent","/usr/local/bin/agent","/Applications/Cursor.app/Contents/Resources/app/bin/cursor","agent","cursor-agent"],v=null;for(let p of $)try{if(p.startsWith("/"))tt(p,ot.X_OK),Z(`"${p}" --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"});else{if(!Z(`which ${p}`,{encoding:"utf-8",timeout:2e3}).trim())throw new Error("not in PATH");Z(`${p} --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"})}v=p,a.debug(`[Agent] Using binary: ${p}`);break}catch(S){a.debug(`[Agent] Binary '${p}' check failed: ${S.message}`);continue}if(!v)throw new Error(`Cursor Agent CLI not found or not working.
|
|
42
|
+
Response: ${JSON.stringify(m)}`,{cause:u}):new Error(`Failed to format Cursor output: ${m?.error?.message||"Unknown error"}`,{cause:u})}throw a.error(`\u274C OpenAI proxy request failed: ${u.message}`),new Error(`Failed to format output: ${u.message}`,{cause:u})}}function j(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,a.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 z,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 xt}from"node:fs";import{join as H}from"node:path";import{homedir as It}from"node:os";import{randomBytes as $t}from"node:crypto";var vt=["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=H(s||process.cwd(),".zibby","tmp");Fe(e,{recursive:!0});let t=`${process.pid}-${Date.now()}-${$t(4).toString("hex")}`,r=H(e,`cursor-agent-home-${t}`),o=H(r,".cursor");Fe(o,{recursive:!0});let n=It(),i=H(n,".cursor");if(Ne(i))for(let l of vt){let c=H(i,l);if(Ne(c))try{At(c,H(o,l))}catch{}}if(process.platform==="darwin"){let l=H(n,"Library");if(Ne(l))try{Tt(l,H(r,"Library"))}catch{}}return r}function He(s){if(!(!s||typeof s!="string"))try{let e=H(s,"Library");try{bt(e).isSymbolicLink()&&xt(e)}catch{}wt(s,{recursive:!0,force:!0})}catch{}}var ye=class extends Ct{constructor(){super("cursor","Cursor (CLI)",100)}canHandle(e){let t=[F(ue(),".local","bin","cursor-agent"),F(ue(),".cursor","bin","cursor-agent"),"/usr/local/bin/cursor-agent","/usr/local/bin/agent","/Applications/Cursor.app/Contents/Resources/app/bin/cursor","agent","cursor-agent"];for(let r of t)try{if(r.startsWith("/")){Ve(r,Qe.X_OK);let o=W(`"${r}" --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"});if(o&&o.length>0)return a.debug(`[Cursor] Found agent at: ${r} (version: ${o.trim().slice(0,50)})`),!0}else{let o=W(`which ${r}`,{encoding:"utf-8",timeout:2e3,stdio:"pipe"}).trim();if(!o)continue;let n=W(`${r} --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"});if(n&&n.length>0)return a.debug(`[Cursor] Found '${r}' in PATH at ${o} (version: ${n.trim().slice(0,50)})`),!0}}catch{continue}return a.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:l=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??G.CURSOR,O=j("CURSOR_API_KEY");try{a.debug(`[Cursor] Invoking (model: ${y}, timeout: ${f/1e3}s, skills: ${JSON.stringify(i)})`);let _=(this._setupMcpConfig(l,r,u,i,c)||{}).isolatedMcpHome??null,E=[F(ue(),".local","bin","cursor-agent"),F(ue(),".cursor","bin","cursor-agent"),"/usr/local/bin/cursor-agent","/usr/local/bin/agent","/Applications/Cursor.app/Contents/Resources/app/bin/cursor","agent","cursor-agent"],b=null;for(let T of E)try{if(T.startsWith("/"))Ve(T,Qe.X_OK),W(`"${T}" --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"});else{if(!W(`which ${T}`,{encoding:"utf-8",timeout:2e3}).trim())throw new Error("not in PATH");W(`${T} --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"})}b=T,a.debug(`[Agent] Using binary: ${T}`);break}catch(p){a.debug(`[Agent] Binary '${T}' check failed: ${p.message}`);continue}if(!b)throw new Error(`Cursor Agent CLI not found or not working.
|
|
44
43
|
|
|
45
44
|
Checked paths:
|
|
46
|
-
${
|
|
45
|
+
${E.map(T=>` - ${T}`).join(`
|
|
47
46
|
`)}
|
|
48
47
|
|
|
49
48
|
Install cursor-agent:
|
|
@@ -52,59 +51,57 @@ Install cursor-agent:
|
|
|
52
51
|
Then add to PATH:
|
|
53
52
|
echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.zshrc && source ~/.zshrc
|
|
54
53
|
|
|
55
|
-
Test with: agent --version`);let
|
|
56
|
-
\u25C6 Model: ${y||"auto"}${
|
|
57
|
-
`);let
|
|
58
|
-
${
|
|
59
|
-
`)}catch{}let
|
|
60
|
-
`):
|
|
54
|
+
Test with: agent --version`);let N=new V(e),g=null;if(n){let T=`zibby-result-${Date.now()}.json`;g=F(r,".zibby","tmp",T);let p=F(r,".zibby","tmp");ce(p)||qe(p,{recursive:!0}),N.addStructuredOutput(n,g)}let K=process.env.CURSOR_API_KEY,B=K?` | key: ***${K.slice(-4)}`:" | key: not set";console.log(`
|
|
55
|
+
\u25C6 Model: ${y||"auto"}${B}
|
|
56
|
+
`);let P=(await import("chalk")).default,A=N.getUserPrompt();console.log(`
|
|
57
|
+
${P.bold("Prompt sent to LLM:")}`),console.log(P.dim("\u2500".repeat(60))),console.log(P.dim(A)),console.log(P.dim("\u2500".repeat(60)));let x=N.build(),C=N.getStats(),w=["--print","--force","--approve-mcps","--output-format","stream-json","--stream-partial-output","--model",y||"auto"];if(process.env.CURSOR_API_KEY&&w.push("--api-key",process.env.CURSOR_API_KEY),w.push(x),a.debug(`[Agent] User prompt: ${C.userPromptLength} chars, System instructions: ${C.systemInstructionsLength} chars (${C.instructionCount} blocks), Full: ${C.fullPromptLength} chars, model: ${y||"auto"}`),a.debug(`[Agent] Workspace: ${r}`),process.env.LOG_LEVEL==="debug"||process.env.ZIBBY_LOG_CURSOR_CLI==="1")try{console.log(`\u{1F527} Cursor CLI --model ${y||"auto"} (from .zibby.config.js agent.cursor.model)
|
|
58
|
+
`)}catch{}let R,$=null;try{let T=l||(process.env.ZIBBY_SESSION_PATH?String(process.env.ZIBBY_SESSION_PATH).trim():null);R=await this._spawnWithStreaming(b,w,r,f,null,T,_,h)}catch(T){$=T}let v=R?.stdout||"";if(n){let T=typeof n.parse=="function",p=null,k=!!(g&&ce(g));if(g&&a.info(`[Agent] Result file: ${k?"present":"missing"} at ${g}`),k)try{let S=Ze(g,"utf-8").trim();p=JSON.parse(S),a.info(`[Agent] Parsed JSON from result file OK (${S.length} chars) \u2192 object ready for validation`),$&&a.debug("[Agent] Agent exited non-zero but result file was written \u2014 recovering")}catch(S){a.warn(`\u26A0\uFE0F [Agent] Result file exists on disk but is not valid JSON: ${S.message}`)}else if($)a.warn(`[Agent] Result file missing at ${g} (agent process error \u2014 may still recover if strictMode repairs)`);else throw a.error(`\u274C [Agent] Result file was never created at ${g}`),new Error(`Agent did not write required result file at ${g}`);if(p&&T)try{let S=n.parse(p);return a.info("\u2705 [Agent] Zod validation passed for structured result file"),m&&a.debug("[Agent] strictMode enabled but not needed \u2014 agent wrote valid file"),{raw:v,structured:S}}catch(S){let d=S.issues?S.issues.map(I=>` - ${I.path.join(".")}: ${I.message}`).join(`
|
|
59
|
+
`):S.message?.slice(0,400);if(a.error(`\u274C [Agent] Zod validation FAILED - invalid output schema:
|
|
61
60
|
${d}`),a.error(`\u{1F4C4} [Agent] Invalid JSON written to file:
|
|
62
|
-
${JSON.stringify(
|
|
61
|
+
${JSON.stringify(p,null,2).slice(0,500)}`),!m)throw new Error(`Agent output failed schema validation:
|
|
63
62
|
${d}
|
|
64
63
|
|
|
65
64
|
The agent wrote invalid data that doesn't match the required outputSchema.
|
|
66
|
-
Enable strictMode in .zibby.config.js for automatic repair.`,{cause:
|
|
67
|
-
`),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 l=i.message.content;if(Array.isArray(l)){let c=l.filter(f=>f.type==="text"&&f.text).map(f=>f.text).join("");c&&(r=c)}else typeof l=="string"&&l&&(r=l)}}catch{}}return r?.trim()||null}_setupMcpConfig(e,t,r,o=null,n=null){let i=r?.headless,l=
|
|
68
|
-
`;if(
|
|
69
|
-
`)){let
|
|
70
|
-
${m.slice(-2e3)}`),
|
|
71
|
-
`).filter(
|
|
72
|
-
`).filter(
|
|
65
|
+
Enable strictMode in .zibby.config.js for automatic repair.`,{cause:S})}else{if(p)return a.info("\u2705 [Agent] File-based output extracted (no Zod parse fn) \u2014 accepting as structured"),m&&a.debug("[Agent] strictMode enabled but not needed \u2014 agent wrote valid file"),{raw:v,structured:p};k&&a.error("\u274C [Agent] Result file exists but produced no in-memory JSON (parse failed earlier)")}if(m&&!$){let S=R.parsedText,d=p?JSON.stringify(p):S;a.info(`[Agent] strictMode: calling OpenAI proxy to fix structured output (${d.length} chars in)`);try{let I=await je(d,n);if(T){let M=n.parse(I.structured);return a.info("\u2705 [Agent] Proxy output passed Zod validation"),{raw:v,structured:M}}return{raw:v,...I}}catch(I){if(a.warn(`\u26A0\uFE0F [Agent] strictMode proxy failed: ${I.message}`),p)return a.warn("[Agent] Using agent's original result file as fallback"),{raw:v,structured:p}}}if($)throw $;let D=k?p==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 a.error(`\u274C [Agent] No validated structured output: ${D}`),a.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($)throw $;return this._extractFinalResult(v)||R?.parsedText||v}finally{O.dispose()}}_extractFinalResult(e){if(!e)return null;let t=e.split(`
|
|
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 l=i.message.content;if(Array.isArray(l)){let c=l.filter(f=>f.type==="text"&&f.text).map(f=>f.text).join("");c&&(r=c)}else typeof l=="string"&&l&&(r=l)}}catch{}}return r?.trim()||null}_setupMcpConfig(e,t,r,o=null,n=null){let i=r?.headless,l=F(ue(),".cursor"),c=F(l,"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=F(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 a.debug("[MCP] No MCP servers configured - agent will run without tool access"),{isolatedMcpHome:null};let L=`${JSON.stringify({mcpServers:u},null,2)}
|
|
67
|
+
`;if(Ye(e)){let _=ze(t||process.cwd()),E=F(_,".cursor","mcp.json");return We(E,L,"utf8"),a.debug(`[MCP] Isolated cursor-agent HOME (session-scoped mcp.json): ${_} | servers: ${Object.keys(u).join(", ")}`),{isolatedMcpHome:_}}return ce(l)||qe(l,{recursive:!0}),We(c,L,"utf8"),a.debug(`[MCP] Global ~/.cursor/mcp.json | servers: ${Object.keys(u).join(", ")}`),{isolatedMcpHome:null}}_ensureSkillConfigured(e,t,r,o,n=null,i){let l=t.cursorKey||t.serverName,c=e[l]?l: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},a.debug(`[MCP] Updated ${c} session \u2192 ${r}`);return}if(c)return;let f=t.resolve({sessionPath:r,nodeName:n,headless:i});f&&(e[l]={...f,...t.sessionEnvKey&&{env:{...f.env||{},[t.sessionEnvKey]:o}}},a.debug(`[MCP] Configured ${l}`))}_spawnWithStreaming(e,t,r,o,n=null,i=null,l=null,c=null){return new Promise((f,u)=>{let h=Date.now(),m="",y="",O=Date.now(),L=0,_=!1,E=null,b=!1,N=!1,g=null;if(i)try{g=F(Dt(String(i)),Nt)}catch{g=null}let K=!1,B=()=>{K||(K=!0,He(l))},P={...process.env};l&&(P.HOME=l,process.platform==="win32"&&(P.USERPROFILE=l),a.debug(`[Agent] cursor-agent HOME=${l} (isolated MCP config)`));let A=Mt(e,t,{cwd:r,shell:!1,stdio:["pipe","pipe","pipe"],env:P,...c&&{signal:c}});a.debug(`[Agent] PID: ${A.pid}`);let x=null,C=()=>{_||N||(_=!0,E="aborted",a.warn("\u{1F6D1} Abort signal \u2014 terminating cursor-agent (SIGKILL in 5s if SIGTERM trapped)"),x=setTimeout(()=>{if(!N){a.warn("\u{1F6D1} SIGTERM not honored \u2014 sending SIGKILL");try{A.kill("SIGKILL")}catch{}}},5e3))};c&&(c.aborted?C():c.addEventListener("abort",C,{once:!0})),A.stdin.on("error",p=>{p.code!=="EPIPE"&&a.warn(`[Agent] stdin error: ${p.message}`)}),A.stdout.on("error",p=>{p.code!=="EPIPE"&&a.warn(`[Agent] stdout error: ${p.message}`)}),A.stderr.on("error",p=>{p.code!=="EPIPE"&&a.warn(`[Agent] stderr error: ${p.message}`)}),n?(A.stdin.write(n,p=>{p&&p.code!=="EPIPE"&&a.warn(`[Agent] Failed to write to stdin: ${p.message}`),A.stdin.end()}),a.debug(`[Agent] Prompt also piped to stdin (${n.length} chars)`)):A.stdin.end();let w=null;g&&(w=setInterval(()=>{if(!(_||N))try{if(ce(g)){_=!0,E="aborted";try{Lt(g)}catch{}a.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 R=new Set,$=new Date(h).toISOString().replace(/\.\d+Z$/,""),v=setInterval(()=>{let p=Math.round((Date.now()-h)/1e3),k=Math.round((Date.now()-O)/1e3),D=[];try{let d=Math.ceil(p/60)+1,I=W(`find "${r}" -type f -mmin -${d} -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 M of I.split(`
|
|
68
|
+
`)){let U=M.replace(`${r}/`,"");R.has(U)||(R.add(U),D.push(U))}}catch{}let S="";D.length>0&&(S=` | \u{1F4C1} new: ${D.map(I=>I.split("/").pop()).join(", ")}`),R.size>0&&(S+=` | \u{1F4E6} total: ${R.size} files`),a.debug(`\u{1F493} [Agent] Running for ${p}s | ${L} lines output${S}`),L===0&&p>=30&&R.size===0&&(p<35&&a.warn(`\u26A0\uFE0F [Agent] No output after ${p}s \u2014 agent may be stuck. Check your CURSOR_API_KEY.`),p>=60&&(_=!0,E=E||"stall",a.error(`\u274C [Agent] No response after ${p}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),J=setTimeout(()=>{_=!0,E=E||"timeout";let p=Math.round((Date.now()-h)/1e3);a.error(`\u23F1\uFE0F [Agent] Timeout after ${p}s \u2014 killing process (PID: ${A.pid})`),m.trim()&&a.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 q;T.onToolCall=(p,k)=>{let D=p,S=k;if(p==="mcpToolCall"&&k?.name)D=k.name.replace(/^mcp_+[^_]+_+/,""),D.includes("-")&&D.split("-")[0]===D.split("-")[1]&&(D=D.split("-")[0]),S=k.args??k.input??k;else{if(p==="readToolCall"||p==="editToolCall"||p==="writeToolCall")return;(p.startsWith("mcp__")||p.includes("ToolCall"))&&(D=p.replace(/^mcp_+[^_]+_+/,"").replace(/ToolCall$/,""))}if(D.includes("memory")?z.stepMemory(`Tool: ${D}`):z.stepTool(`Tool: ${D}`),S!=null&&typeof S=="object"&&Object.keys(S).length>0&&!N){let I=JSON.stringify(S),M=I.length>100?`${I.substring(0,100)}...`:I;console.log(` Input: ${M}`)}},A.stdout.on("data",p=>{let k=p.toString();m+=k,O=Date.now(),b||(b=!0);let D=T.processChunk(k);D&&!N&&process.stdout.write(D);let S=k.split(`
|
|
70
|
+
`).filter(d=>d.trim());L+=S.length}),A.stderr.on("data",p=>{let k=p.toString();y+=k,O=Date.now(),b||(b=!0);let D=k.split(`
|
|
71
|
+
`).filter(S=>S.trim());for(let S of D)a.warn(`\u26A0\uFE0F [Agent stderr] ${S}`)}),A.on("close",(p,k)=>{if(N=!0,B(),clearTimeout(J),clearInterval(v),w&&clearInterval(w),x&&clearTimeout(x),c&&!c.aborted)try{c.removeEventListener("abort",C)}catch{}T.flush();let D=Math.round((Date.now()-h)/1e3);if(a.debug(`[Agent] Exited: code=${p}, signal=${k}, elapsed=${D}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 ${D}s (limit: ${o/1e3}s). ${L} lines produced. Last output ${Math.round((Date.now()-O)/1e3)}s ago. ${m.trim()?`
|
|
73
72
|
Partial output (last 500 chars):
|
|
74
73
|
${m.slice(-500)}`:"No output captured."}`));return}if(p!==0){u(new Error(`Cursor Agent failed: exit code ${p}, signal ${c}. ${y.trim()?`
|
|
75
74
|
Stderr: ${y.slice(-1e3)}`:""}${m.trim()?`
|
|
76
|
-
Stdout (last 500 chars): ${m.slice(-500)}`:""}`));return}let
|
|
75
|
+
Stdout (last 500 chars): ${m.slice(-500)}`:""}`));return}let S=T.getResult(),d=S?JSON.stringify(S,null,2):T.getRawText()||m||"";f({stdout:m||y||"",parsedText:d})}),A.on("error",p=>{if(B(),clearTimeout(J),clearInterval(v),w&&clearInterval(w),x&&clearTimeout(x),c&&!c.aborted)try{c.removeEventListener("abort",C)}catch{}u(new Error(`Cursor Agent spawn error: ${p.message}
|
|
77
76
|
Binary: ${e}
|
|
78
77
|
This usually means the binary is not in PATH. Try:
|
|
79
|
-
echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.zshrc && source ~/.zshrc`))})})}};import{AgentStrategy as
|
|
80
|
-
|
|
81
|
-
${e}`:e;console.log(""),console.log(` ${T.cyan("\u25C6")} ${T.bold($)}`),console.log(` ${T.dim("Auth: ")}${_}`),console.log(` ${T.dim("Workdir: ")}${o}`),console.log(""),console.log(T.bold("Prompt sent to LLM:")),console.log(T.dim("\u2500".repeat(60))),console.log(T.dim(A)),console.log(T.dim("\u2500".repeat(60)));let{allowedTools:M,mcpServers:B}=this._resolveSkills(l,{sessionPath:c,workspace:o,nodeName:f});try{let b={cwd:o,allowedTools:M,settings:{permissions:{allow:["Bash(*)","Read(*)","Write(*)","Edit(*)","MultiEdit(*)","NotebookEdit(*)","Grep(*)","Glob(*)","WebFetch(*)","WebSearch(*)","Task(*)","TodoWrite(*)","Skill(*)"]}},model:$,...Object.keys(B).length>0&&{mcpServers:B},...y&&{sessionId:y},...O&&{resume:O},...P&&{forkSession:!0}};if(n){let L=typeof n.parse=="function"?Vt(n,{target:"openApi3"}):n;b.outputFormat={type:"json_schema",schema:L},a.debug("Structured output enforced via SDK outputFormat")}a.debug(`Agent SDK options: ${JSON.stringify({cwd:b.cwd,toolCount:M.length,permissionMode:b.permissionMode,model:b.model,hasOutputFormat:!!b.outputFormat})}`);let R="",G=0,p=[];a.debug("Starting Claude Agent SDK query stream");let S;try{S=qt({prompt:A,options:b})}catch(d){throw a.error(`Failed to initialize Claude Agent SDK: ${d.message}`),d}let C=null,D=0,x=3;if(m?.aborted){let d=new Error("Aborted via signal");throw d.name="AbortError",d}try{for await(let d of S){if(m?.aborted){let k=new Error("Aborted via signal");throw k.name="AbortError",k}if(p.push(d),d.type==="error"||d.error){let k=d.error?.message||d.error||d.message||"Unknown API error";try{a.error("SDK error event raw payload",{fullMessage:JSON.stringify(d,null,2)})}catch{}throw new Error(typeof k=="string"?k:JSON.stringify(k))}let L=JSON.stringify(d.message?.content||d.text||"").slice(0,200);if(L===C){if(D++,D>=x){let k=(d.message?.content?.[0]?.text||d.text||"unknown").slice(0,100);throw new Error(`API stuck in loop (${D}x repeated): ${k}`)}}else C=L,D=1;if(d.type==="assistant"||d.constructor?.name==="AssistantMessage"){let k=d.message?.content||d.content||[];for(let U of k)if(U.type==="thinking"&&U.thinking)console.log(`${U.thinking.substring(0,200)}${U.thinking.length>200?"...":""}`);else if(U.type==="text"&&U.text)R+=U.text,U.text.length<500?console.log(`${U.text}`):console.log(`${U.text.substring(0,200)}... (${U.text.length} chars)`);else if(U.type==="tool_use"){G++,U.name.includes("memory")?H.stepMemory(`Tool: ${U.name}`):H.stepTool(`Tool: ${U.name}`);let ae=JSON.stringify(U.input).substring(0,100);console.log(` Input: ${ae}${JSON.stringify(U.input).length>100?"...":""}`)}}else if(!(d.type==="user"&&d.tool_use_result)){if(d.type==="result"||d.constructor?.name==="ResultMessage"){let k=d.result||d.text||d.content||R;try{Qt({message:d,sessionPath:c,nodeName:f,model:g,toolCallCount:G})}catch(U){a.debug(`usage.json write failed: ${U.message}`)}if(n){if(d.structured_output){a.debug("Using SDK native structured_output");let le=typeof n.parse=="function"?n.parse(d.structured_output):d.structured_output;return{raw:k,structured:le}}if(k){let U=this._extractJson(k,n);if(U)return{raw:k,structured:U}}a.warn(`Could not extract structured output \u2014 returning raw text (${(k||"").length} chars)`)}return k||""}}}if(a.warn(`Agent SDK ended without result. Collected ${p.length} messages`),R.length>0)return a.debug("Returning accumulated text from messages"),R;throw new Error("Claude Agent SDK query ended without result")}catch(d){let L={message:d?.message,name:d?.name,code:d?.code,cause:d?.cause?.message||d?.cause,stack:d?.stack?.split(`
|
|
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 ee}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||a.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:l=null,sessionPath:c=null,nodeName:f=null,timeout:u,config:h={},signal:m=null,sessionId:y,resume:O,forkSession:L,sessionStore:_}=t,E=r;(!E||E==="auto")&&(a.debug(`Model is '${E||"undefined"}', using default: ${G.CLAUDE}`),E=G.CLAUDE);let b=ke[E]||E;ke[E]&&E!==b&&a.debug(`Mapped model: ${E} \u2192 ${b}`);let N=[j("ANTHROPIC_API_KEY"),j("CLAUDE_CODE_OAUTH_TOKEN"),j("ANTHROPIC_AUTH_TOKEN")];try{a.debug(`Invoking Claude Agent SDK with model: ${b}, skills: ${JSON.stringify(l)}`);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 P=process.env.__ZIBBY_CLAUDE_PLAN,A=P?P.charAt(0).toUpperCase()+P.slice(1):null,x;g?x=A?`Claude ${A} plan \xB7 ***${g.slice(-4)}`:`Subscription \xB7 ***${g.slice(-4)}`:K?x=`API key \xB7 ***${K.slice(-4)}`:B?x=`Bearer \xB7 ***${B.slice(-4)}`:x="NONE \u2014 request will fail";let C=(await import("chalk")).default;console.log(""),console.log(` ${C.cyan("\u25C6")} ${C.bold(b)}`),console.log(` ${C.dim("Auth: ")}${x}`),console.log(` ${C.dim("Workdir: ")}${o}`),console.log(""),console.log(C.bold("Prompt sent to LLM:")),console.log(C.dim("\u2500".repeat(60))),console.log(C.dim(e)),console.log(C.dim("\u2500".repeat(60)));let{allowedTools:w,mcpServers:R}=this._resolveSkills(l,{sessionPath:c,workspace:o,nodeName:f});try{let $={cwd:o,allowedTools:w,settings:{permissions:{allow:["Bash(*)","Read(*)","Write(*)","Edit(*)","MultiEdit(*)","NotebookEdit(*)","Grep(*)","Glob(*)","WebFetch(*)","WebSearch(*)","Task(*)","TodoWrite(*)","Skill(*)"]}},model:b,...Object.keys(R).length>0&&{mcpServers:R},...y&&{sessionId:y},...O&&{resume:O},...L&&{forkSession:!0},..._&&{sessionStore:_}};if(n){let I=typeof n.parse=="function"?Jt(n,{target:"openApi3"}):n;$.outputFormat={type:"json_schema",schema:I},a.debug("Structured output enforced via SDK outputFormat")}a.debug(`Agent SDK options: ${JSON.stringify({cwd:$.cwd,toolCount:w.length,permissionMode:$.permissionMode,model:$.model,hasOutputFormat:!!$.outputFormat})}`);let v="",J=0,T=[];a.debug("Starting Claude Agent SDK query stream");let p;try{p=Bt({prompt:e,options:$})}catch(d){throw a.error(`Failed to initialize Claude Agent SDK: ${d.message}`),d}let k=null,D=0,S=3;if(m?.aborted){let d=new Error("Aborted via signal");throw d.name="AbortError",d}try{for await(let d of p){if(m?.aborted){let M=new Error("Aborted via signal");throw M.name="AbortError",M}if(T.push(d),d.type==="error"||d.error){let M=d.error?.message||d.error||d.message||"Unknown API error";try{a.error("SDK error event raw payload",{fullMessage:JSON.stringify(d,null,2)})}catch{}throw new Error(typeof M=="string"?M:JSON.stringify(M))}let I=JSON.stringify(d.message?.content||d.text||"").slice(0,200);if(I===k){if(D++,D>=S){let M=(d.message?.content?.[0]?.text||d.text||"unknown").slice(0,100);throw new Error(`API stuck in loop (${D}x repeated): ${M}`)}}else k=I,D=1;if(d.type==="assistant"||d.constructor?.name==="AssistantMessage"){let M=d.message?.content||d.content||[];for(let U of M)if(U.type==="thinking"&&U.thinking)console.log(`${U.thinking.substring(0,200)}${U.thinking.length>200?"...":""}`);else if(U.type==="text"&&U.text)v+=U.text,U.text.length<500?console.log(`${U.text}`):console.log(`${U.text.substring(0,200)}... (${U.text.length} chars)`);else if(U.type==="tool_use"){J++,U.name.includes("memory")?z.stepMemory(`Tool: ${U.name}`):z.stepTool(`Tool: ${U.name}`);let ie=JSON.stringify(U.input).substring(0,100);console.log(` Input: ${ie}${JSON.stringify(U.input).length>100?"...":""}`)}}else if(!(d.type==="user"&&d.tool_use_result)){if(d.type==="result"||d.constructor?.name==="ResultMessage"){let M=d.result||d.text||d.content||v;try{Gt({message:d,sessionPath:c,nodeName:f,model:E,toolCallCount:J})}catch(U){a.debug(`usage.json write failed: ${U.message}`)}if(n){if(d.structured_output){a.debug("Using SDK native structured_output");let se=typeof n.parse=="function"?n.parse(d.structured_output):d.structured_output;return{raw:M,structured:se}}if(M){let U=this._extractJson(M,n);if(U)return{raw:M,structured:U}}a.warn(`Could not extract structured output \u2014 returning raw text (${(M||"").length} chars)`)}return M||""}}}if(a.warn(`Agent SDK ended without result. Collected ${T.length} messages`),v.length>0)return a.debug("Returning accumulated text from messages"),v;throw new Error("Claude Agent SDK query ended without result")}catch(d){let I={message:d?.message,name:d?.name,code:d?.code,cause:d?.cause?.message||d?.cause,stack:d?.stack?.split(`
|
|
82
79
|
`).slice(0,5).join(`
|
|
83
|
-
`),stringified:(()=>{try{return JSON.stringify(d,Object.getOwnPropertyNames(Object(d)))}catch{return String(d)}})()};throw a.error(`Error during query stream: ${d?.message||d}`,
|
|
84
|
-
\u25C6 Model: ${
|
|
85
|
-
`);let
|
|
86
|
-
${
|
|
87
|
-
${
|
|
88
|
-
${
|
|
89
|
-
\u25C6 Model: ${y||"auto"}${
|
|
90
|
-
`);let
|
|
91
|
-
${
|
|
92
|
-
${
|
|
93
|
-
${
|
|
94
|
-
`,"utf-8");let u=
|
|
95
|
-
`,"utf-8")}catch{}return a.debug(`[Gemini] Created isolated config with ${Object.keys(f.mcpServers||{}).length} MCP servers`),a.debug(`[Gemini] MCP servers: ${JSON.stringify(Object.keys(f.mcpServers||{}),null,2)}`),o}};import{AgentStrategy as
|
|
96
|
-
|
|
97
|
-
[truncated for size budget]`}function
|
|
98
|
-
`);y=
|
|
99
|
-
`)||"",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){a.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
|
|
100
|
-
|
|
101
|
-
[tool result truncated for size]`}function
|
|
80
|
+
`),stringified:(()=>{try{return JSON.stringify(d,Object.getOwnPropertyNames(Object(d)))}catch{return String(d)}})()};throw a.error(`Error during query stream: ${d?.message||d}`,I),d}}catch($){throw a.error("Claude Agent SDK call failed",{message:$?.message,name:$?.name,code:$?.code,cause:$?.cause?.message||$?.cause}),$}}finally{for(let g of N)g.dispose()}}_resolveSkills(e,t){let r=["Read","Write","Edit","Bash","Grep","Glob"];if(e===null)return a.debug("No skills \u2014 pure LLM mode"),{allowedTools:[],mcpServers:{}};if(!Array.isArray(e)||e.length===0)return a.debug("Default IDE skills for code generation"),{allowedTools:[...r],mcpServers:{}};let o=[...r],n={};for(let i of e){let l=Kt(i);if(!l){a.warn(`Unknown skill "${i}" \u2014 skipping`);continue}if(l.allowedTools&&o.push(...l.allowedTools),typeof l.resolve=="function"){let c=l.resolve(t);c&&(n[l.serverName]=c,a.debug(`MCP: ${l.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),l=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:l,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=ee(e,t);try{Me(m,{recursive:!0})}catch{}Re(ee(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=ee(ot(),".claude"),r=ee(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"),a.debug(`Wrote Claude Code OAuth credentials to ${r}`)}catch(n){a.warn(`Could not write ${r}: ${n.message} \u2014 Claude SDK may fail to authenticate.`)}}function Ft(s){let e=ee(ot(),".claude"),t=ee(e,".credentials.json"),r;try{r=JSON.parse(s)}catch(o){a.warn(`CLAUDE_CODE_CREDENTIALS_JSON not valid JSON: ${o.message}`);return}if(!r?.claudeAiOauth?.accessToken){a.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"),a.debug(`Wrote full Claude Code credentials blob to ${t}`)}catch(o){a.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 a.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 a.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:l=null,nodeName:c=null,timeout:f,config:u={},signal:h=null}=t,m=[j("OPENAI_API_KEY"),j("CODEX_API_KEY")];try{let{Codex:y}=await import("@openai/codex-sdk"),O=r;(!O||O==="auto")&&(a.debug(`Model is '${O||"undefined"}', using default: ${G.CODEX}`),O=G.CODEX);let L=Pe[O]||O;Pe[O]&&O!==L&&a.debug(`Mapped model: ${O} \u2192 ${L}`),a.debug(`Invoking Codex SDK with model: ${L}, 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
|
+
\u25C6 Model: ${L}${E}
|
|
82
|
+
`);let b=(await import("chalk")).default;console.log(`
|
|
83
|
+
${b.bold("Prompt sent to LLM:")}`),console.log(b.dim("\u2500".repeat(60))),console.log(b.dim(e)),console.log(b.dim("\u2500".repeat(60)));let N=this._resolveSkillsToMcp(i,{sessionPath:l,workspace:o,nodeName:c}),g={};Object.keys(N).length>0&&(g.mcp_servers=N,a.debug(`[Codex] MCP servers: ${Object.keys(N).join(", ")}`));let B=new y({...Object.keys(g).length>0&&{config:g}}).startThread({workingDirectory:o,skipGitRepoCheck:!0,approvalPolicy:"never",sandboxMode:"danger-full-access",networkAccessEnabled:!0}),P=n&&typeof n.parse=="function",A={};if(n)try{let x=P?Xt(n,{target:"openAi"}):n;A.outputSchema=x,a.debug("Structured output via SDK outputSchema")}catch(x){a.warn(`[Codex] Schema conversion failed, will extract from text: ${x.message}`)}if(h?.aborted){let x=new Error("Aborted via signal");throw x.name="AbortError",x}try{let{events:x}=await B.runStreamed(e,A),C=0,w="";for await(let R of x){if(h?.aborted){let v=new Error("Aborted via signal");throw v.name="AbortError",v}let $=R.type;if($==="item.completed"){let v=R.item,J=v?.type;if(J==="mcp_tool_call"){C++;let T=`${v.server}/${v.tool}`;if(z.stepTool(`Tool: ${T}`),v.arguments){let p=JSON.stringify(v.arguments),k=p.length>100?`${p.substring(0,100)}...`:p;console.log(` Input: ${k}`)}}else if(J==="tool_call"||J==="function_call"||J==="command_execution"){C++;let T=v.name||v.tool||v.command||"unknown";z.stepTool(`Tool: ${T}`)}else J==="agent_message"&&(w=v.text||"",w.length<500?console.log(w):console.log(`${w.substring(0,200)}... (${w.length} chars)`))}else $==="turn.completed"?a.debug(`[Codex] Turn completed. Usage: ${JSON.stringify(R.usage||{})}`):a.debug(`[Codex] Event: ${$} ${JSON.stringify(R).slice(0,300)}`)}if(a.debug(`[Codex] Last agent message (${w.length} chars): ${w.slice(0,500)}`),n){if(!w)throw new Error("Codex agent returned no response");let R=JSON.parse(w),$=P?n.parse(R):R;return a.debug("\u2705 [Codex] Structured output validated"),{raw:w,structured:$}}return w||""}catch(x){let C=x.message||String(x);throw a.error(`\u274C [Codex] SDK call failed: ${C}`),C.includes("exited with code")&&(a.error("\u{1F4A1} [Codex] Verify: codex --version && echo $OPENAI_API_KEY"),a.error("\u{1F4A1} [Codex] If codex is missing: npm install -g @openai/codex")),x}}finally{for(let y of m)y.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){a.warn(`[Codex] Unknown skill "${o}" \u2014 skipping`);continue}if(typeof n.resolve!="function")continue;let i=n.resolve(t);if(!i)continue;let l=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),r[l]=c,a.debug(`[Codex] MCP: ${l} \u2192 ${i.command} ${(i.args||[]).join(" ")}`)}return r}};import{AgentStrategy as Wt,getSkill as Zt}from"@zibby/agent-workflow";import{execSync as qt,spawn as Vt}from"node:child_process";import{zodToJsonSchema as Qt}from"zod-to-json-schema";import{existsSync as rt,mkdirSync as nt,readFileSync as st,rmSync as eo,writeFileSync as it}from"node:fs";import{join as Z}from"node:path";function to(s){if(!s)return null;let e=String(s),t=e.match(/```(?:json)?\s*([\s\S]*?)```/i);if(t?.[1])try{return JSON.parse(t[1].trim())}catch{}let r=e.indexOf("{");if(r<0)return null;let o=0,n=!1,i=!1,l=-1;for(let c=r;c<e.length;c++){let f=e[c];if(n){i?i=!1:f==="\\"?i=!0:f==='"'&&(n=!1);continue}if(f==='"'){n=!0;continue}if(f==="{"){o===0&&(l=c),o+=1;continue}if(f==="}"){if(o===0)continue;if(o-=1,o===0&&l>=0){let u=e.slice(l,c+1);try{return JSON.parse(u)}catch{l=-1}}}}return null}function oo(s){let e=String(s||"").trim();if(!e)return null;try{return JSON.parse(e)}catch{return to(e)}}function ro(s){try{let e=JSON.parse(s);if(typeof e=="string")return e;if(typeof e?.response=="string")return e.response;if(typeof e?.text=="string")return e.text;if(typeof e?.output=="string")return e.output;if(Array.isArray(e?.candidates)&&e.candidates.length>0){let t=e.candidates[0];if(typeof t?.content=="string")return t.content;if(Array.isArray(t?.content?.parts)){let r=t.content.parts.map(o=>typeof o?.text=="string"?o.text:"").join("");if(r.trim())return r}}}catch{}return s}var Ee=class extends Wt{constructor(){super("gemini","Gemini (Google)",70)}canHandle(e){if(!!!(process.env.GEMINI_API_KEY||process.env.GEMINI_API_KEY_POOL||process.env.GOOGLE_API_KEY||process.env.GOOGLE_API_KEY_POOL))return a.debug("GeminiAgentStrategy: GEMINI_API_KEY or GOOGLE_API_KEY not set"),!1;try{return qt("gemini --version",{encoding:"utf-8",timeout:5e3,stdio:"pipe"}),!0}catch{return a.warn("[Gemini] gemini CLI not found. Install: npm install -g @google/gemini-cli"),!1}}async invoke(e,t={}){let{model:r,workspace:o=process.cwd(),schema:n=null,skills:i=null,sessionPath:l=null,nodeName:c=null,timeout:f=600*1e3,signal:u=null}=t,h=[j("GEMINI_API_KEY"),j("GOOGLE_API_KEY")];try{let m=r;(!m||m==="auto")&&(m=G.GEMINI);let y=Ge[m]||m,O=String(process.env.GEMINI_API_KEY||"").trim(),L=String(process.env.GOOGLE_API_KEY||"").trim(),_=this._resolveSkillsToMcp(i,{sessionPath:l,workspace:o,nodeName:c}),E=Object.keys(_).length>0,b=new V(e),N=n&&typeof n.parse=="function",g=null;if(n){let S;try{let d=N?Qt(n,{target:"openAi"}):n;S=JSON.stringify(d,null,2)}catch{S="{}"}if(E){b.addSystemInstruction(`Write valid JSON that matches this schema:
|
|
84
|
+
${S}`,"schema_instruction","append");let d=`zibby-result-${Date.now()}.json`,I=Z(o,".zibby","tmp");g=Z(I,d),nt(I,{recursive:!0}),b.addStructuredOutput(n,g)}else b.addSystemInstruction(`Return ONLY valid JSON (no markdown, no commentary) that matches this schema:
|
|
85
|
+
${S}`,"json_instruction","append")}let K=b.build(),B=b.getUserPrompt(),P=b.getStats(),A=String(process.env.GEMINI_API_KEY||process.env.GOOGLE_API_KEY||"").trim(),x=A?` | key: ***${A.slice(-4)}`:" | key: not set";console.log(`
|
|
86
|
+
\u25C6 Model: ${y||"auto"}${x}
|
|
87
|
+
`);let C=(await import("chalk")).default;console.log(`
|
|
88
|
+
${C.bold("Prompt sent to LLM:")}`),console.log(C.dim("\u2500".repeat(60))),console.log(C.dim(B)),console.log(C.dim("\u2500".repeat(60)));let w=this._createGeminiConfigDir(o,_),R=["--output-format","json"];y&&y!=="auto"&&R.push("--model",y);let $=Object.keys(_);if($.length>0){R.push("--approval-mode","yolo");for(let S of $)R.push("--allowed-mcp-server-names",S);a.info(`[Gemini] Enabling MCP servers: ${$.join(", ")}`)}else i&&i.length>0&&a.warn(`[Gemini] Skills requested but no MCP servers configured: ${i.join(", ")}`);R.push("-p",K);let v={...process.env,GEMINI_CLI_HOME:w};O?(v.GEMINI_API_KEY=O,delete v.GOOGLE_API_KEY):L&&(v.GOOGLE_API_KEY=L,delete v.GEMINI_API_KEY),a.debug(`[Gemini] Command: gemini ${R.slice(0,8).join(" ")}... (${R.length} total args)`),a.debug(`[Gemini] User prompt: ${P.userPromptLength} chars, System instructions: ${P.systemInstructionsLength} chars (${P.instructionCount} blocks), Full: ${P.fullPromptLength} chars`),a.debug(`[Gemini] Config home: ${w}`),a.debug(`[Gemini] GEMINI_CLI_HOME env: ${v.GEMINI_CLI_HOME}`);let J="",T=null;try{J=await new Promise((d,I)=>{let M=Vt("gemini",R,{cwd:o,env:v,stdio:["ignore","pipe","pipe"],...u&&{signal:u}}),U="",se="",ie=!1,le=null,ve=!1,Be=setTimeout(()=>{try{M.kill("SIGTERM")}catch{}},f),me=()=>{ve||ie||(ve=!0,le=setTimeout(()=>{if(!ie)try{M.kill("SIGKILL")}catch{}},5e3))};u&&(u.aborted?me():u.addEventListener("abort",me,{once:!0})),M.stdout.on("data",X=>{U+=X.toString()}),M.stderr.on("data",X=>{se+=X.toString()}),M.on("error",X=>{if(clearTimeout(Be),le&&clearTimeout(le),u&&!u.aborted)try{u.removeEventListener("abort",me)}catch{}I(X)}),M.on("close",X=>{if(ie=!0,clearTimeout(Be),le&&clearTimeout(le),u&&!u.aborted)try{u.removeEventListener("abort",me)}catch{}if(ve){let Je=new Error("Aborted via signal");return Je.name="AbortError",I(Je)}if(X===0)return d(U.trim());I(new Error(`gemini failed with code ${X}: ${(se||U).trim()}`))})})}catch(S){T=S}finally{try{eo(w,{recursive:!0,force:!0})}catch{}}let p=ro(J).trim();if(!n){if(T)throw T;return p}if(g){let S=rt(g);if(a.info(`[Gemini] Result file: ${S?"present":"missing"} at ${g}`),S)try{let d=st(g,"utf-8").trim(),I=JSON.parse(d),M=N?n.parse(I):I;return a.info("[Gemini] Structured output recovered from result file"),{raw:p,structured:M}}catch(d){a.warn(`[Gemini] Result file parse/validation failed: ${d.message}`)}else T||a.warn("[Gemini] Result file missing; falling back to stream-parsed JSON")}let k=null;if(n){let S=new q;S.zodSchema=n,S.processChunk(p),S.flush(),k=S.getResult()}if(a.info(`[Gemini] Raw stdout length: ${J.length} chars`),a.info(`[Gemini] Extracted text length: ${p.length} chars`),a.info(`[Gemini] StreamParser result: ${k?"extracted":"null"}`),k||(p.length<2e3?a.info(`[Gemini] Raw text preview:
|
|
89
|
+
${p}`):a.info(`[Gemini] Raw text preview (first 1000 chars):
|
|
90
|
+
${p.slice(0,1e3)}`),k=oo(p)),!k)throw T||(a.error("[Gemini] Failed to extract valid JSON from output"),a.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 D=N?n.parse(k):k;return{raw:p,structured:D}}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 l=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[l]=c}return r}_createGeminiConfigDir(e,t){let r=`${Date.now()}-${Math.random().toString(16).slice(2,10)}`,o=Z(e||process.cwd(),".zibby","tmp",`gemini-home-${r}`),n=Z(o,".gemini");nt(n,{recursive:!0});let i=Z(n,"settings.json"),l={},c=Z(process.env.HOME||"",".gemini","settings.json");if(rt(c))try{l=JSON.parse(st(c,"utf-8"))}catch{l={}}let f={...l,mcpServers:{...l.mcpServers&&typeof l.mcpServers=="object"?l.mcpServers:{},...t||{}}};it(i,`${JSON.stringify(f,null,2)}
|
|
91
|
+
`,"utf-8");let u=Z(e||process.cwd(),".zibby","tmp","gemini-settings-debug.json");try{it(u,`${JSON.stringify(f,null,2)}
|
|
92
|
+
`,"utf-8")}catch{}return a.debug(`[Gemini] Created isolated config with ${Object.keys(f.mcpServers||{}).length} MCP servers`),a.debug(`[Gemini] MCP servers: ${JSON.stringify(Object.keys(f.mcpServers||{}),null,2)}`),o}};import{AgentStrategy as yo,getSkill as xe}from"@zibby/agent-workflow";var pe=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 te=class extends pe{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(r=>({id:r.id,name:r.function.name,args:JSON.parse(r.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 de=class{async fetchCompletion(e,t,r={}){throw new Error("fetchCompletion() must be implemented")}async fetchStreamingCompletion(e,t,r={}){throw new Error("fetchStreamingCompletion() must be implemented")}};function Oe(s){return Buffer.byteLength(JSON.stringify(s),"utf8")}function Ae(s,e){let t=String(s||"");if(t.length<=e)return t;let r=Math.max(0,e-28);return`${t.slice(0,r)}
|
|
93
|
+
|
|
94
|
+
[truncated for size budget]`}function Le(s,e=0){if(!s||typeof s!="object"||e>8)return s;if(Array.isArray(s))return s.map(r=>Le(r,e+1));let t={};for(let[r,o]of Object.entries(s))r==="description"||r==="title"||r==="examples"||r==="default"||(t[r]=Le(o,e+1));return t}function no(s=[]){return s.map(e=>({...e,function:{...e.function,description:Ae(e.function?.description||"",180),parameters:Le(e.function?.parameters||{type:"object",properties:{}})}}))}function lt(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,...l}=o;return{...l,content:l.content||""}})}function De(s,e={}){let t=e.maxBytes||49e3,r=e.systemMaxChars||12e3,o={...s,messages:Array.isArray(s.messages)?[...s.messages]:[],tools:Array.isArray(s.tools)?no(s.tools):s.tools};o.messages.length>0&&o.messages[0]?.role==="system"&&(o.messages[0]={...o.messages[0],content:Ae(o.messages[0].content,r)});let n=!1;for(;Oe(o)>t&&o.messages.length>2;)o.messages.splice(1,1),n=!0;if(n&&(o.messages=lt(o.messages)),Oe(o)>t&&o.messages.length>0&&(o.messages[0]={...o.messages[0],content:Ae(o.messages[0].content,6e3)},n=!0),Oe(o)>t){let i=o.messages.find(c=>c.role==="system")||o.messages[0],l=o.messages.slice(-2);o.messages=lt([i,...l].filter(Boolean).map((c,f)=>({...c,content:Ae(c.content,f===0?4e3:8e3)}))),n=!0}return{body:o,meta:{bytes:Oe(o),trimmed:n,maxBytes:t,messageCount:o.messages.length}}}var at=s=>Buffer.byteLength(JSON.stringify(s),"utf8"),oe=class extends de{async fetchCompletion(e,t,r={}){let o=at(e),{body:n,meta:i}=De(e,r.payloadCompaction);r.onBudget?.({streaming:!1,beforeBytes:o,meta:i});let l=this.#e(r),c=`${t.baseUrl}${r.chatCompletionsPath||"/v1/chat/completions"}`,f=await fetch(c,{method:"POST",headers:t.headers,body:JSON.stringify(n),signal:l});if(!f.ok){let u=await f.text();throw f.status===401||f.status===403?new Error("Session expired. Run `zibby login` to re-authenticate."):new Error(`Proxy error ${f.status}: ${u}`)}return f.json()}async fetchStreamingCompletion(e,t,r={}){let o={...e,stream:!0},n=at(o),{body:i,meta:l}=De(o,r.payloadCompaction);r.onBudget?.({streaming:!0,beforeBytes:n,meta:l});let c=this.#e(r),f=`${t.baseUrl}${r.chatCompletionsPath||"/v1/chat/completions"}`,u=await fetch(f,{method:"POST",headers:t.headers,body:JSON.stringify(i),signal:c});if(!u.ok){let _=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}: ${_}`)}let h=u.body.getReader(),m=new TextDecoder,y="",O="",L=new Map;for(;;){let{done:_,value:E}=await h.read();if(_)break;y+=m.decode(E,{stream:!0});let b=y.split(`
|
|
95
|
+
`);y=b.pop();for(let N of b){if(!N.startsWith("data: "))continue;let g=N.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 P of B.tool_calls){let A=P.index??0;L.has(A)||L.set(A,{id:"",name:"",args:""});let x=L.get(A);P.id&&(x.id=P.id),P.function?.name&&(x.name=P.function.name),P.function?.arguments!=null&&(x.args+=P.function.arguments)}}}if(L.size>0){let _=[...L.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;a.debug(`[MCP] Starting ${e}: ${r} ${o.join(" ")}`);let i=new io({command:r,args:o,env:{...process.env,...n}}),l=new so({name:`zibby-chat-${e}`,version:"1.0.0"},{capabilities:{}});await l.connect(i);let c={client:l,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`);a.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(l=>l.type==="text").map(l=>l.text).join(`
|
|
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){a.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 l=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(!l)return{ok:!1,mode:i,reason:"missing_openai_proxy_url"};!o&&t&&(c.Authorization=`Bearer ${t}`)}return l?{ok:!0,mode:i,baseUrl:l,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
|
+
|
|
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,...l}=o;return{...l,content:l.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(l){let c=String(l?.message||l||"");if(!/proxy error 413|payload too large/i.test(c))throw l;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:l,dependencies:c,config:f={}}){let u=f.maxToolResultChars||3e3,{fetchCompletion:h,fetchStreamingCompletion:m,onFallbackLog:y,hasToolCalls:O,getTextContent:L,parseToolCalls:_,buildAssistantMessage:E,buildToolResultMessage:b,executeTool:N,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}),P=B?.data||B;if(!O(P))return{done:!0,text:L(P),body:B?.fallback||s};let A=_(P),x=B?.fallback||s;x.messages.push(E(P)),l&&typeof g=="function"&&g(A);let C=await Promise.all(A.map((w,R)=>(typeof t.onToolCall=="function"&&t.onToolCall(w.name,w.args,{round:i,index:R,total:A.length}),N(w,o))));for(let w=0;w<A.length;w++){let $=A[w].name==="get_skill_context"?typeof C[w]=="string"?C[w]:JSON.stringify(C[w]):mo(C[w],u);x.messages.push(b(A[w].id,$))}return typeof t.onToolCall=="function"&&t.onToolCall(null),K(x,n),{done:!1,body:x}}var _o=G.ASSISTANT,So=15,Ke="get_skill_context";function ne(s){!s||typeof s!="object"||(s.type==="object"&&s.properties&&(s.required=Object.keys(s.properties),s.additionalProperties=!1,Object.values(s.properties).forEach(ne)),s.type==="array"&&s.items&&ne(s.items),s.anyOf&&s.anyOf.forEach(ne),s.oneOf&&s.oneOf.forEach(ne),s.allOf&&s.allOf.forEach(ne))}var ft={maxBytes:49e3,systemMaxChars:12e3},re=()=>process.env.ZIBBY_VERBOSE==="true"||process.env.ZIBBY_DEBUG==="true",Eo=s=>Buffer.byteLength(JSON.stringify(s),"utf8");function Ie(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 $e=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 te,this.#t=e.completionProvider||new oe):(this.#e=e||new te,this.#t=new oe)}canHandle(e){return Ue().ok}async invoke(e,t={}){let r=j("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}],l=n.baseUrl,c=re();if(c?await this.#m(i,o,l,n.tokenPreview||"none"):a.debug(`[Assistant] ${l} | model: ${o} | messages: ${i.length}`),t.schema)return this.#c(o,i,n,t);let f=t.activeSkills||[],u=this.#f(t),h=this.#p(f,u),m=this.#d(h),y=this.#u(t),O={...t,payloadCompaction:y},L={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 N=await ut({body:E,auth:n,options:O,streaming:_,toolContext:L,activeSkills:h,round:b,verbose:c,dependencies:{fetchCompletion:this.#s.bind(this),fetchStreamingCompletion:this.#a.bind(this),onFallbackLog:(g,K)=>{re()&&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(N.done)return N.text;E.messages=N.body.messages,N.body.tools?E.tools=N.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=xe(n);if(i?.tools?.length)for(let l of i.tools)this.#r(l.name,t)&&(o.has(l.name)||(o.add(l.name),r.push({name:l.name,description:l.description,parameters:l.parameters||l.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=xe(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 re()&&(console.log(`
|
|
102
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
|
|
103
|
-
`)),y}let l=n?.get(e.name)||null;if(!l)return`Unknown tool: ${e.name}`;let c=
|
|
100
|
+
`)),y}let l=n?.get(e.name)||null;if(!l)return`Unknown tool: ${e.name}`;let c=xe(l.skillId);if(!c)return`Skill "${l.skillId}" not found for tool "${e.name}"`;if(l.mode==="handler")try{return c.handleToolCall(e.name,e.args,t)}catch(f){return`Error in ${e.name}: ${f.message}`}if(l.mode==="mcp")try{if(!this.#o.isRunning(c.serverName)){let u=c.resolve(o);if(!u)return`Skill "${l.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 "${l.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})=>{re()&&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})=>{re()&&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",l=i?n(o.schema):o.schema;delete l.$schema,ne(l);let c={model:e,messages:t,stream:!1,response_format:{type:"json_schema",json_schema:{name:"extract",schema:l,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:Ie(t.allowTools||e.allowTools),denyTools:Ie(t.denyTools||e.denyTools),denyPrefixes:Oo(t.denyPrefixes||e.denyToolPrefixes),includeSkills:Ie(t.includeSkills||e.includeSkills),excludeSkills:Ie(t.excludeSkills||e.excludeSkills),disableSkillContextTool:!!(t.disableSkillContextTool||e.disableSkillContextTool)}}#p(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(l=>r.startsWith(l)))}#d(e){let t=new Map,r=[];for(let o of e){let n=xe(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 l of n.tools){let c=String(l?.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&&re()){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(`
|
|
104
101
|
\u25C6 Model: ${t} | proxy: ${r} | token: ${o||"none"}
|
|
105
|
-
`);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 l of e)if(l.role==="system")console.log(n.dim(`[System] ${l.content||""}`));else{i||(console.log(n.dim("\u2500\u2500\u2500 chat history \u2500\u2500\u2500")),i=!0);let c=l.role==="user"?"Human":"AI",f=l.content?.length>200?`${l.content.slice(0,200)}...`:l.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 l of e)if(l.role==="system")console.log(n.dim(`[System] ${l.content||""}`));else{i||(console.log(n.dim("\u2500\u2500\u2500 chat history \u2500\u2500\u2500")),i=!0);let c=l.role==="user"?"Human":"AI",f=l.content?.length>200?`${l.content.slice(0,200)}...`:l.content||"";console.log(n.dim(`[${c}] ${f}`))}console.log(n.dim("\u2500".repeat(60)))}};import{AgentStrategy as In}from"@zibby/agent-workflow";var pt=[new $e,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");a.debug(`Agent selection: requested=${r}`);let o=pt.find(n=>n.getName()===r);if(!o)throw new Error(`Unknown agent '${r}'. Available: ${pt.map(n=>n.getName()).join(", ")}`);if(a.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 a.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,l=n.default||null,c=r.name,f=o.agent?.[c]?.model||null,u=i||l||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:L}=await import("@zibby/agent-workflow"),_=m.map(E=>{let b=L(E)?.promptFragment;return typeof b=="function"?b():b}).filter(Boolean);_.length>0&&(y+=`
|
|
106
103
|
|
|
107
|
-
${
|
|
104
|
+
${_.join(`
|
|
108
105
|
|
|
109
106
|
`)}`)}let O=e.state?._currentNodeConfig?.extraPromptInstructions?.trim();return O&&(y+=`
|
|
110
107
|
|
|
@@ -114,4 +111,4 @@ ${g.join(`
|
|
|
114
111
|
|
|
115
112
|
${O}
|
|
116
113
|
`),a.debug(`Prompt length: ${y.length} chars`),process.env.STAGE!=="prod"&&a.debug(`Full prompt:
|
|
117
|
-
${y}`),r.invoke(y,h)}export{
|
|
114
|
+
${y}`),r.invoke(y,h)}export{In as AgentStrategy,$e as AssistantStrategy,_e as ClaudeAgentStrategy,Se as CodexAgentStrategy,ye as CursorAgentStrategy,Ee as GeminiAgentStrategy,Ao as getAgentStrategy,wn as invokeAgent};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
import{execSync as w}from"node:child_process";import{existsSync as E,mkdirSync as b}from"node:fs";import{join as R}from"node:path";async function S(g={}){let{baseDir:c="/workspace/repos",repos:p=null,depth:m=1,branch:u=null}=g,h=process.env.REPOS;if(!h)throw new Error("REPOS environment variable not set. Are you running in a Zibby workflow container?");let r;try{r=JSON.parse(h)}catch(e){throw new Error(`Failed to parse REPOS env var: ${e.message}`,{cause:e})}if(!Array.isArray(r)||r.length===0)throw new Error("No repositories configured for this project");let f=p?r.filter(e=>p.includes(e.name)):r;if(f.length===0)throw new Error(`No matching repositories found. Available: ${r.map(e=>e.name).join(", ")}`);E(c)||b(c,{recursive:!0});let n={};return await Promise.all(f.map(async e=>{let o=e.provider||"github",t=o==="gitlab"?process.env.GITLAB_TOKEN:process.env.GITHUB_TOKEN;if(!t){console.error(`${o.toUpperCase()}_TOKEN not set, skipping ${e.name}`),n[e.name]=null;return}let d=e.name.replace(/\//g,"-"),l=R(c,d),s=e.cloneUrl||e.url;if(!s){console.error(`Repository "${e.name}" has no clone URL`),n[e.name]=null;return}let i;o==="gitlab"?i=s.replace(/^https:\/\//,`https://oauth2:${t}@`):i=s.replace(/^https:\/\//,`https://x-access-token:${t}@`);let a=["clone"];m>0&&a.push("--depth",m.toString()),u&&a.push("--branch",u),a.push(i,l);let y=`git ${a.join(" ")}`;console.log(`Cloning ${e.name} (${o}) to ${l}...`);try{w(y,{stdio:"pipe",env:{...process.env,GIT_TERMINAL_PROMPT:"0"}}),console.log(`Repository ${e.name} cloned successfully`),n[e.name]=l}catch($){let v=$.message.replace(t,"***").replace(i,s);console.error(`Failed to clone ${e.name}: ${v}`),n[e.name]=null}})),n}export{S as cloneRepo};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zibby/core",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.3",
|
|
4
4
|
"description": "Core test automation engine with multi-agent and multi-MCP support",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -70,12 +70,12 @@
|
|
|
70
70
|
"node": ">=18.0.0"
|
|
71
71
|
},
|
|
72
72
|
"dependencies": {
|
|
73
|
-
"@zibby/agent-workflow": "^0.3.0",
|
|
74
73
|
"@anthropic-ai/claude-agent-sdk": "^0.2.104",
|
|
75
74
|
"@anthropic-ai/sdk": "^0.88.0",
|
|
76
75
|
"@modelcontextprotocol/sdk": "^1.29.0",
|
|
77
76
|
"@openai/codex-sdk": "^0.120.0",
|
|
78
77
|
"@playwright/mcp": "^0.0.70",
|
|
78
|
+
"@zibby/agent-workflow": "^0.3.0",
|
|
79
79
|
"@zibby/mcp-browser": "^0.1.8",
|
|
80
80
|
"acorn": "^8.15.0",
|
|
81
81
|
"acorn-walk": "^8.3.5",
|
|
@@ -84,6 +84,7 @@
|
|
|
84
84
|
"dotenv": "^17.4.1",
|
|
85
85
|
"handlebars": "^4.7.9",
|
|
86
86
|
"hono": "^4.12.14",
|
|
87
|
+
"uuid": "^11.1.1",
|
|
87
88
|
"zod": "^4.3.6",
|
|
88
89
|
"zod-to-json-schema": "^3.25.2"
|
|
89
90
|
},
|