@zibby/core 0.5.32 → 0.5.34
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/constants.js +1 -1
- package/dist/index.js +54 -54
- package/dist/models.js +1 -1
- package/dist/package.json +1 -1
- package/dist/register-built-in-strategies.js +44 -44
- package/dist/strategies/assistant-strategy.js +6 -6
- package/dist/strategies/claude-strategy.js +2 -2
- package/dist/strategies/codex-strategy.js +5 -5
- package/dist/strategies/cursor-strategy.js +21 -21
- package/dist/strategies/gemini-strategy.js +9 -9
- package/dist/strategies/index.js +42 -42
- package/dist/strategies/utils/openai-proxy-formatter.js +3 -3
- package/package.json +1 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import{AgentStrategy as De,DEFAULT_OUTPUT_BASE as Fe,SESSION_INFO_FILE as Ge,STOP_REQUEST_FILE as Be,getAllSkills as Je,getSkill as pe}from"@zibby/agent-workflow";import{spawn as Ke,execSync as G}from"node:child_process";import{writeFileSync as fe,readFileSync as me,mkdirSync as ge,existsSync as Y,accessSync as he,constants as ye,unlinkSync as
|
|
1
|
+
import{AgentStrategy as De,DEFAULT_OUTPUT_BASE as Fe,SESSION_INFO_FILE as Ge,STOP_REQUEST_FILE as Be,getAllSkills as Je,getSkill as pe}from"@zibby/agent-workflow";import{spawn as Ke,execSync as G}from"node:child_process";import{writeFileSync as fe,readFileSync as me,mkdirSync as ge,existsSync as Y,accessSync as he,constants as ye,unlinkSync as ze}from"node:fs";import{join as w,resolve as Ve}from"node:path";import{homedir as H}from"node:os";import z from"chalk";var C={debug:0,info:1,warn:2,error:3,silent:4},re=class{constructor(){this._level=this._getLogLevel()}_getLogLevel(){if(process.env.ZIBBY_DEBUG==="true")return C.debug;if(process.env.ZIBBY_VERBOSE==="true")return C.info;let e=process.env.LOG_LEVEL?.toLowerCase();return e&&e in C?C[e]:C.info}_shouldLog(e){return C[e]>=this._level}_formatMessage(e,t,r={}){let s=new Date().toISOString(),n=`${this._getPrefix(e)} ${t}`;return Object.keys(r).length>0&&(n+=z.dim(` ${JSON.stringify(r)}`)),n}_getPrefix(e){return{debug:z.gray("[DEBUG]"),info:z.cyan("[INFO]"),warn:z.yellow("[WARN]"),error:z.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 C&&(this._level=C[e])}getLevel(){return Object.keys(C).find(e=>C[e]===this._level)}},i=new re;var be=[{alias:"auto",canonicalId:"claude-sonnet-4-6",vendor:"claude",label:"Claude \xB7 Sonnet 4.6",family:"claude-sonnet-4",pickerVisible:!0,isDefault:!0},{alias:"opus-4.8",canonicalId:"claude-opus-4-8",vendor:"claude",label:"Claude \xB7 Opus 4.8",family:"claude-opus-4",pickerVisible:!0},{alias:"opus-4-8",canonicalId:"claude-opus-4-8",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.8"},{alias:"sonnet-4.8",canonicalId:"claude-sonnet-4-6",vendor:"claude",family:"claude-sonnet-4"},{alias:"sonnet-4-8",canonicalId:"claude-sonnet-4-6",vendor:"claude",family:"claude-sonnet-4",aliasOf:"sonnet-4.8"},{alias:"opus-4.7",canonicalId:"claude-opus-4-7",vendor:"claude",label:"Claude \xB7 Opus 4.7",family:"claude-opus-4",pickerVisible:!0},{alias:"opus-4-7",canonicalId:"claude-opus-4-7",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.7"},{alias:"sonnet-4.7",canonicalId:"claude-sonnet-4-6",vendor:"claude",family:"claude-sonnet-4"},{alias:"sonnet-4-7",canonicalId:"claude-sonnet-4-6",vendor:"claude",family:"claude-sonnet-4",aliasOf:"sonnet-4.7"},{alias:"sonnet-4.6",canonicalId:"claude-sonnet-4-6",vendor:"claude",family:"claude-sonnet-4",aliasOf:"auto"},{alias:"sonnet-4-6",canonicalId:"claude-sonnet-4-6",vendor:"claude",family:"claude-sonnet-4",aliasOf:"auto"},{alias:"opus-4.6",canonicalId:"claude-opus-4-6",vendor:"claude",label:"Claude \xB7 Opus 4.6",family:"claude-opus-4",pickerVisible:!0},{alias:"opus-4-6",canonicalId:"claude-opus-4-6",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.6"},{alias:"sonnet-4.5",canonicalId:"claude-sonnet-4-5-20250929",vendor:"claude",label:"Claude \xB7 Sonnet 4.5",family:"claude-sonnet-4",pickerVisible:!0},{alias:"sonnet-4-5",canonicalId:"claude-sonnet-4-5-20250929",vendor:"claude",family:"claude-sonnet-4",aliasOf:"sonnet-4.5"},{alias:"opus-4.5",canonicalId:"claude-opus-4-5-20251101",vendor:"claude",label:"Claude \xB7 Opus 4.5",family:"claude-opus-4",pickerVisible:!0},{alias:"opus-4-5",canonicalId:"claude-opus-4-5-20251101",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.5"},{alias:"haiku-4.5",canonicalId:"claude-haiku-4-5-20251001",vendor:"claude",label:"Claude \xB7 Haiku 4.5",family:"claude-haiku-4"},{alias:"haiku-4-5",canonicalId:"claude-haiku-4-5-20251001",vendor:"claude",family:"claude-haiku-4",aliasOf:"haiku-4.5"},{alias:"claude-opus-4-8",canonicalId:"claude-opus-4-8",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.8"},{alias:"claude-sonnet-4-8",canonicalId:"claude-sonnet-4-6",vendor:"claude",family:"claude-sonnet-4",aliasOf:"sonnet-4.8"},{alias:"claude-opus-4-7",canonicalId:"claude-opus-4-7",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.7"},{alias:"claude-sonnet-4-7",canonicalId:"claude-sonnet-4-6",vendor:"claude",family:"claude-sonnet-4",aliasOf:"sonnet-4.7"},{alias:"claude-sonnet-4-6",canonicalId:"claude-sonnet-4-6",vendor:"claude",family:"claude-sonnet-4",aliasOf:"auto"},{alias:"claude-opus-4-6",canonicalId:"claude-opus-4-6",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.6"},{alias:"claude-sonnet-4-5-20250929",canonicalId:"claude-sonnet-4-5-20250929",vendor:"claude",family:"claude-sonnet-4",aliasOf:"sonnet-4.5"},{alias:"claude-opus-4-5-20251101",canonicalId:"claude-opus-4-5-20251101",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.5"},{alias:"claude-haiku-4-5-20251001",canonicalId:"claude-haiku-4-5-20251001",vendor:"claude",family:"claude-haiku-4",aliasOf:"haiku-4.5"},{alias:"claude-opus-4-20250514",canonicalId:"claude-opus-4-20250514",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.5"},{alias:"auto",canonicalId:"o4-mini",vendor:"codex",label:"Codex \xB7 o4-mini",family:"o4-mini",isDefault:!0},{alias:"o4-mini",canonicalId:"o4-mini",vendor:"codex",label:"Codex \xB7 o4-mini",family:"o4-mini",pickerVisible:!0},{alias:"o3",canonicalId:"o3",vendor:"codex",family:"o3"},{alias:"o3-mini",canonicalId:"o3-mini",vendor:"codex",family:"o3-mini"},{alias:"codex-mini",canonicalId:"codex-mini-latest",vendor:"codex",family:"codex-mini"},{alias:"gpt-4o",canonicalId:"gpt-4o",vendor:"codex",label:"Codex \xB7 GPT-4o",family:"gpt-4o",pickerVisible:!0},{alias:"gpt-4o-mini",canonicalId:"gpt-4o-mini",vendor:"codex",label:"Codex \xB7 GPT-4o mini",family:"gpt-4o-mini",pickerVisible:!0},{alias:"gpt-5.2-codex",canonicalId:"gpt-5.2-codex",vendor:"codex",label:"Codex \xB7 GPT-5.2",family:"gpt-5",pickerVisible:!0},{alias:"gpt-5.2",canonicalId:"gpt-5.2",vendor:"codex",label:"Codex \xB7 GPT-5.2 base",family:"gpt-5",pickerVisible:!0},{alias:"gpt-5.3",canonicalId:"gpt-5.3",vendor:"codex",label:"Codex \xB7 GPT-5.3",family:"gpt-5",pickerVisible:!0},{alias:"gpt-5.3-codex",canonicalId:"gpt-5.3-codex",vendor:"codex",family:"gpt-5"},{alias:"gpt-5.4",canonicalId:"gpt-5.4",vendor:"codex",label:"Codex \xB7 GPT-5.4",family:"gpt-5",pickerVisible:!0},{alias:"gpt-5.5",canonicalId:"gpt-5.5",vendor:"codex",label:"Codex \xB7 GPT-5.5",family:"gpt-5",pickerVisible:!0},{alias:"auto",canonicalId:"gemini-3-pro",vendor:"gemini",label:"Gemini \xB7 3 Pro",family:"gemini-3",isDefault:!0},{alias:"gemini-3-pro",canonicalId:"gemini-3-pro",vendor:"gemini",label:"Gemini \xB7 3 Pro",family:"gemini-3",pickerVisible:!0},{alias:"gemini-3-flash",canonicalId:"gemini-3-flash",vendor:"gemini",label:"Gemini \xB7 3 Flash",family:"gemini-3",pickerVisible:!0},{alias:"gemini-2.5-pro",canonicalId:"gemini-2.5-pro",vendor:"gemini",label:"Gemini \xB7 2.5 Pro",family:"gemini-2.5",pickerVisible:!0},{alias:"gemini-2.5-flash",canonicalId:"gemini-2.5-flash",vendor:"gemini",label:"Gemini \xB7 2.5 Flash",family:"gemini-2.5",pickerVisible:!0}];function W(o){let e={};for(let t of be)t.vendor===o&&(e[t.alias]=t.canonicalId);return e}var V={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 Ze=W("claude"),Xe=W("codex"),qe=W("gemini"),Z={CURSOR_AGENT_DEFAULT:1200*1e3,OPENAI_REQUEST:18e4};var X=class o{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 s of t)if(s.trim())try{let l=JSON.parse(s);this._emitToolCalls(l);let n=this.extractText(l);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(l)&&(this.rawText+=`${s}
|
|
3
3
|
`,r+=`${s}
|
|
4
|
-
`,this.extractedResult=l)}catch{if(s.includes('"text"')||s.includes('"content"')){let n=s.match(/"text"\s*:\s*"([^"]*)/),u=s.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 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=(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(e.type==="tool_use"||e.type==="tool_call"){if(e.name){t(e.name,r(e.input??e.arguments));return}let n=e.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],d=y&&typeof y=="object"?y.args??y.input??y:void 0;t(c,r(d))}return}return}if(Array.isArray(e.tool_calls)){for(let n of e.tool_calls)t(n.name,r(n.input??n.arguments));return}let s=e.message??e;if(Array.isArray(s?.tool_calls)){for(let n of s.tool_calls)t(n.name,r(n.input??n.arguments));return}let l=s?.content??e.content;if(Array.isArray(l))for(let n of l)(n.type==="tool_use"||n.type==="tool_call")&&n.name&&t(n.name,r(n.input??n.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,s;for(;(s=r.exec(e))!==null;){let m=s[1].trim();try{JSON.parse(m),t.push({text:m,source:"markdown"})}catch{}}let l=0,n=0;for(;l<e.length&&(l=e.indexOf("{",l),l!==-1);){let m=0,p=l;for(let
|
|
4
|
+
`,this.extractedResult=l)}catch{if(s.includes('"text"')||s.includes('"content"')){let n=s.match(/"text"\s*:\s*"([^"]*)/),u=s.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 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=(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(e.type==="tool_use"||e.type==="tool_call"){if(e.name){t(e.name,r(e.input??e.arguments));return}let n=e.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],d=y&&typeof y=="object"?y.args??y.input??y:void 0;t(c,r(d))}return}return}if(Array.isArray(e.tool_calls)){for(let n of e.tool_calls)t(n.name,r(n.input??n.arguments));return}let s=e.message??e;if(Array.isArray(s?.tool_calls)){for(let n of s.tool_calls)t(n.name,r(n.input??n.arguments));return}let l=s?.content??e.content;if(Array.isArray(l))for(let n of l)(n.type==="tool_use"||n.type==="tool_call")&&n.name&&t(n.name,r(n.input??n.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,s;for(;(s=r.exec(e))!==null;){let m=s[1].trim();try{JSON.parse(m),t.push({text:m,source:"markdown"})}catch{}}let l=0,n=0;for(;l<e.length&&(l=e.indexOf("{",l),l!==-1);){let m=0,p=l;for(let O=l;O<e.length;O++)if(e[O]==="{")m++;else if(e[O]==="}"&&(m--,m===0)){p=O,t.push({text:e.substring(l,p+1),source:"brace"}),n++;break}l=p+1}let u=this.extractedResult,c=u?JSON.stringify(u).length:0,y=0,d=-1;for(let m=0;m<t.length;m++){let p=t[m];try{let O=p.text.replace(/,(\s*[}\]])/g,"$1"),x=JSON.parse(O);this.isValidResult(x)&&(y++,c=JSON.stringify(x).length,u=x,d=m)}catch{}}u&&(this.extractedResult=u)}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 o;r.zodSchema=t,r.processChunk(e),r.flush();let s=r.getResult();return!s&&process.env.LOG_LEVEL==="debug"&&console.error("[StreamingParser] No result extracted from",e?.length||0,"chars"),s}};import{z as se}from"zod";import{zodToJsonSchema as Ie}from"zod-to-json-schema";function ve(o){if(!o)return null;if(typeof se?.toJSONSchema=="function")try{return se.toJSONSchema(o)}catch{}try{return Ie(o,{target:"openApi3"})}catch{return null}}var q=class{static generateFileOutputInstructions(e,t){let r;typeof e?.parse=="function"?r=ve(e):r=e;let s=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
|
|
@@ -31,15 +31,15 @@ ${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(s=>s.position==="prepend").map(s=>s.content),t=this.systemInstructions.filter(s=>s.position==="append").map(s=>s.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 o(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 o(this.userPrompt);return e.systemInstructions=[...this.systemInstructions],e.metadata={...this.metadata},e}};import Ee from"axios";import{homedir as Se}from"node:os";import{join as xe}from"node:path";import{existsSync as _e,readFileSync as Te}from"node:fs";import{toJSONSchema as Ae}from"zod";function we(){if(process.env.OPENAI_PROXY_TOKEN)return i.debug("[Auth] Using OPENAI_PROXY_TOKEN (ECS execution)"),process.env.OPENAI_PROXY_TOKEN;if(process.env.ZIBBY_USER_TOKEN)return i.debug("[Auth] Using ZIBBY_USER_TOKEN (CI/CD PAT)"),process.env.ZIBBY_USER_TOKEN;try{let o=xe(Se(),".zibby","config.json");if(_e(o)){let e=JSON.parse(Te(o,"utf-8"));if(e.sessionToken)return i.debug("[Auth] Using session token from zibby login"),e.sessionToken}}catch(o){i.debug(`[Auth] Could not read zibby login session: ${o.message}`)}return null}function $e(){return process.env.OPENAI_PROXY_URL?process.env.OPENAI_PROXY_URL.replace(/\/v1\/?$/,""):"https://api-prod.zibby.app/openai-proxy"}function B(o){if(!(typeof o!="object"||o===null)){if(Object.keys(o).length===0){o.type="object",o.additionalProperties=!0;return}if(o.type||(o.properties?o.type="object":o.items&&(o.type="array")),o.type==="object")if(o.properties){for(let[e,t]of Object.entries(o.properties))t.type==="object"&&t.additionalProperties&&t.additionalProperties!==!1&&(!t.properties||Object.keys(t.properties).length===0)&&(o.properties[e]={type:["object","null"]});o.additionalProperties=!1,o.required=Object.keys(o.properties),Object.values(o.properties).forEach(B)}else"additionalProperties"in o||(o.additionalProperties=!0);o.type==="array"&&o.items&&B(o.items),o.anyOf&&o.anyOf.forEach(B),o.oneOf&&o.oneOf.forEach(B),o.allOf&&o.allOf.forEach(B)}}async function ie(o,e){i.info("\u{1F527} [OpenAI Proxy] Formatting structured output...");let t=we();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=$e();i.info(`\u{1F517} Using OpenAI proxy: ${r}`);let s=Ae(e),l=s;if(s.$ref&&s.definitions){let d=s.$ref.split("/").pop();l=s.definitions[d]||s,i.debug(`Extracted schema from $ref: ${d}`)}delete l.$schema,B(l);let n=4e5,u=o;o.length>n&&(i.warn(`\u26A0\uFE0F [OpenAI Proxy] Raw text (${o.length} chars) exceeds limit, keeping last ${n} chars`),u=`... [truncated early content] ...
|
|
35
35
|
${o.slice(-n)}`);let c=`Extract and format the following information into structured JSON matching the schema.
|
|
36
36
|
|
|
37
37
|
RAW CONTENT:
|
|
38
38
|
${u}
|
|
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.`,y={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.`,y={model:V.OPENAI_POSTPROCESSING,messages:[{role:"user",content:c}],response_format:{type:"json_schema",json_schema:{name:"extract",schema:l,strict:!0}}};i.info(`\u{1F4E4} Sending to OpenAI proxy: model=${V.OPENAI_POSTPROCESSING}, schema keys=${Object.keys(l.properties||{}).join(", ")}`),i.debug(` Schema size: ${JSON.stringify(l).length} chars`),i.debug(` Prompt size: ${c.length} chars`);try{let d={"Content-Type":"application/json"};process.env.OPENAI_PROXY_TOKEN?(d["x-proxy-token"]=t,d["x-execution-id"]=process.env.EXECUTION_ID||""):(d.Authorization=`Bearer ${t}`,d["x-api-key"]=process.env.ZIBBY_API_KEY||"",d["x-execution-id"]=process.env.EXECUTION_ID||"");let p=(await Ee.post(r,y,{headers:d,timeout:Z.OPENAI_REQUEST})).data?.choices?.[0]?.message?.content;if(!p)throw new Error("OpenAI proxy returned empty response");let O=JSON.parse(p);return i.info("\u2705 Successfully formatted with OpenAI proxy"),{structured:O,raw:o}}catch(d){if(d.response){let m=d.response.status,p=d.response.data;throw i.error(`\u274C OpenAI proxy request failed: ${m}`),i.error(` Status: ${m}`),i.error(` Response: ${JSON.stringify(p,null,2)}`),m===401||m===403?new Error(`Authentication failed for OpenAI proxy.
|
|
41
41
|
Run \`zibby login\` or set ZIBBY_USER_TOKEN environment variable.
|
|
42
|
-
Response: ${JSON.stringify(p)}`,{cause:d}):new Error(`Failed to format Cursor output: ${p?.error?.message||"Unknown error"}`,{cause:d})}throw i.error(`\u274C OpenAI proxy request failed: ${d.message}`),new Error(`Failed to format output: ${d.message}`,{cause:d})}}function ae(o){let e=`${o}_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 s=r[Math.floor(Math.random()*r.length)],l=process.env[o];return process.env[o]=s,i.debug(`[auth-pool] ${o}: picked 1 of ${r.length} from pool (***${s.slice(-4)})`),{picked:s,count:r.length,dispose(){l===void 0?delete process.env[o]:process.env[o]=l}}}import{timeline as ne,Timeline as
|
|
42
|
+
Response: ${JSON.stringify(p)}`,{cause:d}):new Error(`Failed to format Cursor output: ${p?.error?.message||"Unknown error"}`,{cause:d})}throw i.error(`\u274C OpenAI proxy request failed: ${d.message}`),new Error(`Failed to format output: ${d.message}`,{cause:d})}}function ae(o){let e=`${o}_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 s=r[Math.floor(Math.random()*r.length)],l=process.env[o];return process.env[o]=s,i.debug(`[auth-pool] ${o}: picked 1 of ${r.length} from pool (***${s.slice(-4)})`),{picked:s,count:r.length,dispose(){l===void 0?delete process.env[o]:process.env[o]=l}}}import{timeline as ne,Timeline as Ot,WORKFLOW_GRAPH_LOG_MARKER_PREFIX as bt}from"@zibby/agent-workflow";import{copyFileSync as Pe,existsSync as oe,lstatSync as Ce,mkdirSync as le,rmSync as ke,symlinkSync as Re,unlinkSync as Ne}from"node:fs";import{join as M}from"node:path";import{homedir as Le}from"node:os";import{randomBytes as Me}from"node:crypto";var Ue=["cli-config.json","config.json","auth.json","argv.json"];function ue(o){return!(!o||typeof o!="string"||process.env.ZIBBY_CURSOR_USE_GLOBAL_MCP==="1"||process.env.ZIBBY_CURSOR_USE_GLOBAL_MCP==="true")}function ce(o){let e=M(o||process.cwd(),".zibby","tmp");le(e,{recursive:!0});let t=`${process.pid}-${Date.now()}-${Me(4).toString("hex")}`,r=M(e,`cursor-agent-home-${t}`),s=M(r,".cursor");le(s,{recursive:!0});let l=Le(),n=M(l,".cursor");if(oe(n))for(let u of Ue){let c=M(n,u);if(oe(c))try{Pe(c,M(s,u))}catch{}}if(process.platform==="darwin"){let u=M(l,"Library");if(oe(u))try{Re(u,M(r,"Library"))}catch{}}return r}function de(o){if(!(!o||typeof o!="string"))try{let e=M(o,"Library");try{Ce(e).isSymbolicLink()&&Ne(e)}catch{}ke(o,{recursive:!0,force:!0})}catch{}}var Oe=class extends De{constructor(){super("cursor","Cursor (CLI)",100)}canHandle(e){let t=[w(H(),".local","bin","cursor-agent"),w(H(),".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("/")){he(r,ye.X_OK);let s=G(`"${r}" --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"});if(s&&s.length>0)return i.debug(`[Cursor] Found agent at: ${r} (version: ${s.trim().slice(0,50)})`),!0}else{let s=G(`which ${r}`,{encoding:"utf-8",timeout:2e3,stdio:"pipe"}).trim();if(!s)continue;let l=G(`${r} --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"});if(l&&l.length>0)return i.debug(`[Cursor] Found '${r}' in PATH at ${s} (version: ${l.trim().slice(0,50)})`),!0}}catch{continue}return i.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:s=!1,schema:l=null,skills:n=null,sessionPath:u=null,nodeName:c=null,timeout:y=Z.CURSOR_AGENT_DEFAULT,config:d={},signal:m=null}=t,p=d?.agent?.strictMode||!1,O=t.model??d?.agent?.cursor?.model??V.CURSOR,x=ae("CURSOR_API_KEY");try{i.debug(`[Cursor] Invoking (model: ${O}, timeout: ${y/1e3}s, skills: ${JSON.stringify(n)})`);let g=(this._setupMcpConfig(u,r,d,n,c)||{}).isolatedMcpHome??null,T=[w(H(),".local","bin","cursor-agent"),w(H(),".cursor","bin","cursor-agent"),"/usr/local/bin/cursor-agent","/usr/local/bin/agent","agent","cursor-agent"],U=null;for(let h of T)try{if(h.startsWith("/"))he(h,ye.X_OK),G(`"${h}" --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"});else{if(!G(`which ${h}`,{encoding:"utf-8",timeout:2e3}).trim())throw new Error("not in PATH");G(`${h} --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"})}U=h,i.debug(`[Agent] Using binary: ${h}`);break}catch(a){i.debug(`[Agent] Binary '${h}' check failed: ${a.message}`);continue}if(!U)throw new Error(`Cursor Agent CLI not found or not working.
|
|
43
43
|
|
|
44
44
|
Checked paths:
|
|
45
45
|
${T.map(h=>` - ${h}`).join(`
|
|
@@ -51,28 +51,28 @@ Install cursor-agent:
|
|
|
51
51
|
Then add to PATH:
|
|
52
52
|
echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.zshrc && source ~/.zshrc
|
|
53
53
|
|
|
54
|
-
Test with: agent --version`);let A=new Q(e),
|
|
55
|
-
\u25C6 Model: ${
|
|
56
|
-
`);let D=(await import("chalk")).default,
|
|
57
|
-
${D.bold("Prompt sent to LLM:")}`),console.log(D.dim("\u2500".repeat(60))),console.log(D.dim(
|
|
58
|
-
`)}catch{}let $,L=null;try{let h=u||(process.env.ZIBBY_SESSION_PATH?String(process.env.ZIBBY_SESSION_PATH).trim():null);$=await this._spawnWithStreaming(U,N,r,y,null,h,g,m)}catch(h){L=h}let
|
|
54
|
+
Test with: agent --version`);let A=new Q(e),S=null;if(l){let h=`zibby-result-${Date.now()}.json`;S=w(r,".zibby","tmp",h);let a=w(r,".zibby","tmp");Y(a)||ge(a,{recursive:!0}),A.addStructuredOutput(l,S)}let J=process.env.CURSOR_API_KEY,j=J?` | key: ***${J.slice(-4)}`:" | key: not set";console.log(`
|
|
55
|
+
\u25C6 Model: ${O||"auto"}${j}
|
|
56
|
+
`);let D=(await import("chalk")).default,b=A.getUserPrompt();console.log(`
|
|
57
|
+
${D.bold("Prompt sent to LLM:")}`),console.log(D.dim("\u2500".repeat(60))),console.log(D.dim(b)),console.log(D.dim("\u2500".repeat(60)));let F=A.build(),R=A.getStats(),N=["--print","--force","--approve-mcps","--output-format","stream-json","--stream-partial-output","--model",O||"auto"];if(process.env.CURSOR_API_KEY&&N.push("--api-key",process.env.CURSOR_API_KEY),N.push(F),i.debug(`[Agent] User prompt: ${R.userPromptLength} chars, System instructions: ${R.systemInstructionsLength} chars (${R.instructionCount} blocks), Full: ${R.fullPromptLength} chars, model: ${O||"auto"}`),i.debug(`[Agent] Workspace: ${r}`),process.env.LOG_LEVEL==="debug"||process.env.ZIBBY_LOG_CURSOR_CLI==="1")try{console.log(`\u{1F527} Cursor CLI --model ${O||"auto"} (from .zibby.config.js agent.cursor.model)
|
|
58
|
+
`)}catch{}let $,L=null;try{let h=u||(process.env.ZIBBY_SESSION_PATH?String(process.env.ZIBBY_SESSION_PATH).trim():null);$=await this._spawnWithStreaming(U,N,r,y,null,h,g,m)}catch(h){L=h}let P=$?.stdout||"";if(l){let h=typeof l.parse=="function",a=null,v=!!(S&&Y(S));if(S&&i.info(`[Agent] Result file: ${v?"present":"missing"} at ${S}`),v)try{let f=me(S,"utf-8").trim();a=JSON.parse(f),i.info(`[Agent] Parsed JSON from result file OK (${f.length} chars) \u2192 object ready for validation`),L&&i.debug("[Agent] Agent exited non-zero but result file was written \u2014 recovering")}catch(f){i.warn(`\u26A0\uFE0F [Agent] Result file exists on disk but is not valid JSON: ${f.message}`)}else if(L)i.warn(`[Agent] Result file missing at ${S} (agent process error \u2014 may still recover if strictMode repairs)`);else throw i.error(`\u274C [Agent] Result file was never created at ${S}`),new Error(`Agent did not write required result file at ${S}`);if(a&&h)try{let f=l.parse(a);return i.info("\u2705 [Agent] Zod validation passed for structured result file"),p&&i.debug("[Agent] strictMode enabled but not needed \u2014 agent wrote valid file"),{raw:P,structured:f}}catch(f){let _=f.issues?f.issues.map(E=>` - ${E.path.join(".")}: ${E.message}`).join(`
|
|
59
59
|
`):f.message?.slice(0,400);if(i.error(`\u274C [Agent] Zod validation FAILED - invalid output schema:
|
|
60
60
|
${_}`),i.error(`\u{1F4C4} [Agent] Invalid JSON written to file:
|
|
61
61
|
${JSON.stringify(a,null,2).slice(0,500)}`),!p)throw new Error(`Agent output failed schema validation:
|
|
62
62
|
${_}
|
|
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:f})}else{if(a)return i.info("\u2705 [Agent] File-based output extracted (no Zod parse fn) \u2014 accepting as structured"),p&&i.debug("[Agent] strictMode enabled but not needed \u2014 agent wrote valid file"),{raw:
|
|
66
|
-
`),r=null;for(let s of t){let l=s.trim();if(l)try{let n=JSON.parse(l);if(n.type==="assistant"&&n.message?.content){let u=n.message.content;if(Array.isArray(u)){let c=u.filter(y=>y.type==="text"&&y.text).map(y=>y.text).join("");c&&(r=c)}else typeof u=="string"&&u&&(r=u)}}catch{}}return r?.trim()||null}_setupMcpConfig(e,t,r,s=null,l=null){let n=r?.headless,u=w(H(),".cursor"),c=w(u,"mcp.json"),y={};if(Y(c))try{y=JSON.parse(me(c,"utf-8"))}catch{}let d=y.mcpServers||{},m=r?.paths?.output||Fe,p=w(t||process.cwd(),m,Ge),
|
|
67
|
-
`;if(ue(e)){let g=ce(t||process.cwd()),T=w(g,".cursor","mcp.json");return fe(T,k,"utf8"),i.debug(`[MCP] Isolated cursor-agent HOME (session-scoped mcp.json): ${g} | servers: ${Object.keys(d).join(", ")}`),{isolatedMcpHome:g}}return Y(u)||ge(u,{recursive:!0}),fe(c,k,"utf8"),i.debug(`[MCP] Global ~/.cursor/mcp.json | servers: ${Object.keys(d).join(", ")}`),{isolatedMcpHome:null}}_ensureSkillConfigured(e,t,r,s,l=null,n){let u=t.cursorKey||t.serverName,c=e[u]?u:e[t.serverName]?t.serverName:null;if(c&&r){let d=typeof t.resolve=="function"?t.resolve({sessionPath:r,nodeName:l,headless:n}):null;d?.args?e[c].args=d.args:e[c].args=(e[c].args||[]).map(
|
|
68
|
-
`)){let te=K.replace(`${r}/`,"");$.has(te)||($.add(te),I.push(te))}}catch{}let f="";I.length>0&&(f=` | \u{1F4C1} new: ${I.map(
|
|
69
|
-
${p.slice(-2e3)}`),
|
|
70
|
-
`).filter(_=>_.trim());k+=f.length}),
|
|
71
|
-
`).filter(f=>f.trim());for(let f of I)i.warn(`\u26A0\uFE0F [Agent stderr] ${f}`)}),
|
|
65
|
+
Enable strictMode in .zibby.config.js for automatic repair.`,{cause:f})}else{if(a)return i.info("\u2705 [Agent] File-based output extracted (no Zod parse fn) \u2014 accepting as structured"),p&&i.debug("[Agent] strictMode enabled but not needed \u2014 agent wrote valid file"),{raw:P,structured:a};v&&i.error("\u274C [Agent] Result file exists but produced no in-memory JSON (parse failed earlier)")}if(p&&!L){let f=$.parsedText,_=a?JSON.stringify(a):f;i.info(`[Agent] strictMode: calling OpenAI proxy to fix structured output (${_.length} chars in)`);try{let E=await ie(_,l);if(h){let K=l.parse(E.structured);return i.info("\u2705 [Agent] Proxy output passed Zod validation"),{raw:P,structured:K}}return{raw:P,...E}}catch(E){if(i.warn(`\u26A0\uFE0F [Agent] strictMode proxy failed: ${E.message}`),a)return i.warn("[Agent] Using agent's original result file as fallback"),{raw:P,structured:a}}}if(L)throw L;let I=v?a==null?"file existed but JSON.parse failed \u2014 see WARN log above":h?"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 i.error(`\u274C [Agent] No validated structured output: ${I}`),i.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 ${S}. Enable strictMode for proxy fallback.`)}if(L)throw L;return this._extractFinalResult(P)||$?.parsedText||P}finally{x.dispose()}}_extractFinalResult(e){if(!e)return null;let t=e.split(`
|
|
66
|
+
`),r=null;for(let s of t){let l=s.trim();if(l)try{let n=JSON.parse(l);if(n.type==="assistant"&&n.message?.content){let u=n.message.content;if(Array.isArray(u)){let c=u.filter(y=>y.type==="text"&&y.text).map(y=>y.text).join("");c&&(r=c)}else typeof u=="string"&&u&&(r=u)}}catch{}}return r?.trim()||null}_setupMcpConfig(e,t,r,s=null,l=null){let n=r?.headless,u=w(H(),".cursor"),c=w(u,"mcp.json"),y={};if(Y(c))try{y=JSON.parse(me(c,"utf-8"))}catch{}let d=y.mcpServers||{},m=r?.paths?.output||Fe,p=w(t||process.cwd(),m,Ge),O=Array.isArray(s)?s.map(g=>pe(g)).filter(Boolean):[...Je()].map(([,g])=>g),x=new Set;for(let g of O)typeof g.resolve=="function"&&(x.has(g.serverName)||(x.add(g.serverName),this._ensureSkillConfigured(d,g,e,p,l,n)));if(e){let g=pe("browser");g&&typeof g.resolve=="function"&&!x.has(g.serverName)&&this._ensureSkillConfigured(d,g,e,p,"execute_live",n)}if(Object.keys(d).length===0)return i.debug("[MCP] No MCP servers configured - agent will run without tool access"),{isolatedMcpHome:null};let k=`${JSON.stringify({mcpServers:d},null,2)}
|
|
67
|
+
`;if(ue(e)){let g=ce(t||process.cwd()),T=w(g,".cursor","mcp.json");return fe(T,k,"utf8"),i.debug(`[MCP] Isolated cursor-agent HOME (session-scoped mcp.json): ${g} | servers: ${Object.keys(d).join(", ")}`),{isolatedMcpHome:g}}return Y(u)||ge(u,{recursive:!0}),fe(c,k,"utf8"),i.debug(`[MCP] Global ~/.cursor/mcp.json | servers: ${Object.keys(d).join(", ")}`),{isolatedMcpHome:null}}_ensureSkillConfigured(e,t,r,s,l=null,n){let u=t.cursorKey||t.serverName,c=e[u]?u:e[t.serverName]?t.serverName:null;if(c&&r){let d=typeof t.resolve=="function"?t.resolve({sessionPath:r,nodeName:l,headless:n}):null;d?.args?e[c].args=d.args:e[c].args=(e[c].args||[]).map(O=>O.startsWith("--output-dir=")?`--output-dir=${r}`:O);let m=d?.env||{},p=t.sessionEnvKey?{[t.sessionEnvKey]:s}:{};e[c].env={...e[c].env||{},...m,...p},i.debug(`[MCP] Updated ${c} session \u2192 ${r}`);return}if(c)return;let y=t.resolve({sessionPath:r,nodeName:l,headless:n});y&&(e[u]={...y,...t.sessionEnvKey&&{env:{...y.env||{},[t.sessionEnvKey]:s}}},i.debug(`[MCP] Configured ${u}`))}_spawnWithStreaming(e,t,r,s,l=null,n=null,u=null,c=null){return new Promise((y,d)=>{let m=Date.now(),p="",O="",x=Date.now(),k=0,g=!1,T=null,U=!1,A=!1,S=null;if(n)try{S=w(Ve(String(n)),Be)}catch{S=null}let J=!1,j=()=>{J||(J=!0,de(u))},D={...process.env};u&&(D.HOME=u,process.platform==="win32"&&(D.USERPROFILE=u),i.debug(`[Agent] cursor-agent HOME=${u} (isolated MCP config)`));let b=Ke(e,t,{cwd:r,shell:!1,stdio:["pipe","pipe","pipe"],env:D,...c&&{signal:c}});i.debug(`[Agent] PID: ${b.pid}`);let F=null,R=()=>{g||A||(g=!0,T="aborted",i.warn("\u{1F6D1} Abort signal \u2014 terminating cursor-agent (SIGKILL in 5s if SIGTERM trapped)"),F=setTimeout(()=>{if(!A){i.warn("\u{1F6D1} SIGTERM not honored \u2014 sending SIGKILL");try{b.kill("SIGKILL")}catch{}}},5e3))};c&&(c.aborted?R():c.addEventListener("abort",R,{once:!0})),b.stdin.on("error",a=>{a.code!=="EPIPE"&&i.warn(`[Agent] stdin error: ${a.message}`)}),b.stdout.on("error",a=>{a.code!=="EPIPE"&&i.warn(`[Agent] stdout error: ${a.message}`)}),b.stderr.on("error",a=>{a.code!=="EPIPE"&&i.warn(`[Agent] stderr error: ${a.message}`)}),l?(b.stdin.write(l,a=>{a&&a.code!=="EPIPE"&&i.warn(`[Agent] Failed to write to stdin: ${a.message}`),b.stdin.end()}),i.debug(`[Agent] Prompt also piped to stdin (${l.length} chars)`)):b.stdin.end();let N=null;S&&(N=setInterval(()=>{if(!(g||A))try{if(Y(S)){g=!0,T="aborted";try{ze(S)}catch{}i.warn("\u{1F6D1} External stop requested \u2014 terminating Cursor agent (and MCP browser session)"),b.kill("SIGTERM"),setTimeout(()=>{b.killed||b.kill("SIGKILL")},2e3)}}catch{}},600));let $=new Set,L=new Date(m).toISOString().replace(/\.\d+Z$/,""),P=setInterval(()=>{let a=Math.round((Date.now()-m)/1e3),v=Math.round((Date.now()-x)/1e3),I=[];try{let _=Math.ceil(a/60)+1,E=G(`find "${r}" -type f -mmin -${_} -not -path '*/node_modules/*' -not -path '*/.git/*' -not -path '*/target/*' 2>/dev/null | head -20`,{encoding:"utf-8",timeout:5e3}).trim();if(E)for(let K of E.split(`
|
|
68
|
+
`)){let te=K.replace(`${r}/`,"");$.has(te)||($.add(te),I.push(te))}}catch{}let f="";I.length>0&&(f=` | \u{1F4C1} new: ${I.map(E=>E.split("/").pop()).join(", ")}`),$.size>0&&(f+=` | \u{1F4E6} total: ${$.size} files`),i.debug(`\u{1F493} [Agent] Running for ${a}s | ${k} lines output${f}`),k===0&&a>=30&&$.size===0&&(a<35&&i.warn(`\u26A0\uFE0F [Agent] No output after ${a}s \u2014 agent may be stuck. Check your CURSOR_API_KEY.`),a>=60&&(g=!0,T=T||"stall",i.error(`\u274C [Agent] No response after ${a}s \u2014 killing. Verify CURSOR_API_KEY is valid and agent CLI works: agent --version`),b.kill("SIGTERM"),setTimeout(()=>{b.killed||b.kill("SIGKILL")},3e3)))},3e4),ee=setTimeout(()=>{g=!0,T=T||"timeout";let a=Math.round((Date.now()-m)/1e3);i.error(`\u23F1\uFE0F [Agent] Timeout after ${a}s \u2014 killing process (PID: ${b.pid})`),p.trim()&&i.warn(`\u{1F4E4} [Agent] Partial output (${p.length} chars) before timeout:
|
|
69
|
+
${p.slice(-2e3)}`),b.kill("SIGTERM"),setTimeout(()=>{b.killed||b.kill("SIGKILL")},5e3)},s),h=new X;h.onToolCall=(a,v)=>{let I=a,f=v;if(a==="mcpToolCall"&&v?.name)I=v.name.replace(/^mcp_+[^_]+_+/,""),I.includes("-")&&I.split("-")[0]===I.split("-")[1]&&(I=I.split("-")[0]),f=v.args??v.input??v;else{if(a==="readToolCall"||a==="editToolCall"||a==="writeToolCall")return;(a.startsWith("mcp__")||a.includes("ToolCall"))&&(I=a.replace(/^mcp_+[^_]+_+/,"").replace(/ToolCall$/,""))}if(I.includes("memory")?ne.stepMemory(`Tool: ${I}`):ne.stepTool(`Tool: ${I}`),f!=null&&typeof f=="object"&&Object.keys(f).length>0&&!A){let E=JSON.stringify(f),K=E.length>100?`${E.substring(0,100)}...`:E;console.log(` Input: ${K}`)}},b.stdout.on("data",a=>{let v=a.toString();p+=v,x=Date.now(),U||(U=!0);let I=h.processChunk(v);I&&!A&&process.stdout.write(I);let f=v.split(`
|
|
70
|
+
`).filter(_=>_.trim());k+=f.length}),b.stderr.on("data",a=>{let v=a.toString();O+=v,x=Date.now(),U||(U=!0);let I=v.split(`
|
|
71
|
+
`).filter(f=>f.trim());for(let f of I)i.warn(`\u26A0\uFE0F [Agent stderr] ${f}`)}),b.on("close",(a,v)=>{if(A=!0,j(),clearTimeout(ee),clearInterval(P),N&&clearInterval(N),F&&clearTimeout(F),c&&!c.aborted)try{c.removeEventListener("abort",R)}catch{}h.flush();let I=Math.round((Date.now()-m)/1e3);if(i.debug(`[Agent] Exited: code=${a}, signal=${v}, elapsed=${I}s, output=${p.length} chars`),g){if(T==="aborted"){let E=new Error("Aborted via signal");E.name="AbortError",d(E);return}d(new Error(`Cursor Agent timed out after ${I}s (limit: ${s/1e3}s). ${k} lines produced. Last output ${Math.round((Date.now()-x)/1e3)}s ago. ${p.trim()?`
|
|
72
72
|
Partial output (last 500 chars):
|
|
73
|
-
${p.slice(-500)}`:"No output captured."}`));return}if(a!==0){d(new Error(`Cursor Agent failed: exit code ${a}, signal ${c}. ${
|
|
74
|
-
Stderr: ${
|
|
75
|
-
Stdout (last 500 chars): ${p.slice(-500)}`:""}`));return}let f=h.getResult(),_=f?JSON.stringify(f,null,2):h.getRawText()||p||"";y({stdout:p||
|
|
73
|
+
${p.slice(-500)}`:"No output captured."}`));return}if(a!==0){d(new Error(`Cursor Agent failed: exit code ${a}, signal ${c}. ${O.trim()?`
|
|
74
|
+
Stderr: ${O.slice(-1e3)}`:""}${p.trim()?`
|
|
75
|
+
Stdout (last 500 chars): ${p.slice(-500)}`:""}`));return}let f=h.getResult(),_=f?JSON.stringify(f,null,2):h.getRawText()||p||"";y({stdout:p||O||"",parsedText:_})}),b.on("error",a=>{if(j(),clearTimeout(ee),clearInterval(P),N&&clearInterval(N),F&&clearTimeout(F),c&&!c.aborted)try{c.removeEventListener("abort",R)}catch{}d(new Error(`Cursor Agent spawn error: ${a.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`))})})}};export{
|
|
78
|
+
echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.zshrc && source ~/.zshrc`))})})}};export{Oe as CursorAgentStrategy};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import{AgentStrategy as
|
|
1
|
+
import{AgentStrategy as be,getSkill as xe}from"@zibby/agent-workflow";import Oe from"node:process";var Ie=Object.freeze(["GITHUB_TOKEN","GITLAB_TOKEN","GITLAB_OAUTH_TOKEN","ATLASSIAN_ACCESS_TOKEN","JIRA_API_TOKEN","JIRA_EMAIL","SENTRY_AUTH_TOKEN","SLACK_BOT_TOKEN","DISCORD_BOT_TOKEN","LINEAR_API_KEY","LINEAR_OAUTH_TOKEN","PLANE_API_KEY","PLANE_OAUTH_TOKEN","ZIBBY_INJECTED_GOOGLE_TOKEN","ZIBBY_INJECTED_LINKEDIN_TOKEN","ZIBBY_MEMORY_AWS_ACCESS_KEY_ID","ZIBBY_MEMORY_AWS_SECRET_ACCESS_KEY","ZIBBY_MEMORY_AWS_SESSION_TOKEN"]);function te(i=Oe.env){let e={},t=new Set(Ie);for(let[n,s]of Object.entries(i))t.has(n)||s!==void 0&&(e[n]=s);return e}import{execSync as Te,spawn as Ae}from"node:child_process";import{z as ne}from"zod";import{zodToJsonSchema as Ee}from"zod-to-json-schema";function _e(i){if(!i||typeof i!="object")return i;if(Array.isArray(i.type))return i.type.includes("null")||(i.type=[...i.type,"null"]),i;if(typeof i.type=="string")return i.type=[i.type,"null"],i;for(let e of["anyOf","oneOf"])if(Array.isArray(i[e]))return i[e].some(t=>t&&t.type==="null")||(i[e]=[...i[e],{type:"null"}]),i;return{anyOf:[i,{type:"null"}]}}function k(i){if(!i||typeof i!="object")return i;for(let e of["$defs","definitions"])if(i[e]&&typeof i[e]=="object")for(let t of Object.keys(i[e]))i[e][t]=k(i[e][t]);for(let e of["anyOf","oneOf","allOf"])Array.isArray(i[e])&&(i[e]=i[e].map(k));if(i.properties&&typeof i.properties=="object"){i.additionalProperties=!1;let e=Object.keys(i.properties),t=new Set(Array.isArray(i.required)?i.required:[]);for(let n of e){let s=k(i.properties[n]);t.has(n)||(s=_e(s)),i.properties[n]=s}i.required=e}return i.items&&(Array.isArray(i.items)?i.items=i.items.map(k):i.items=k(i.items)),i}function ie(i,e={target:"openApi3"}){if(!i)return null;let t=e?.target==="openAi",n=null;if(typeof ne?.toJSONSchema=="function")try{n=ne.toJSONSchema(i)}catch{}if(!n)try{n=Ee(i,e)}catch{return null}if(t&&n)try{return k(n)}catch{return n}return n}import{existsSync as ae,mkdirSync as ce,readFileSync as ue,rmSync as Ne,writeFileSync as fe}from"node:fs";import{join as b}from"node:path";import P from"chalk";var y={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 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,n={}){let s=new Date().toISOString(),r=`${this._getPrefix(e)} ${t}`;return Object.keys(n).length>0&&(r+=P.dim(` ${JSON.stringify(n)}`)),r}_getPrefix(e){return{debug:P.gray("[DEBUG]"),info:P.cyan("[INFO]"),warn:P.yellow("[WARN]"),error:P.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)}},c=new W;var re=[{alias:"auto",canonicalId:"claude-sonnet-4-6",vendor:"claude",label:"Claude \xB7 Sonnet 4.6",family:"claude-sonnet-4",pickerVisible:!0,isDefault:!0},{alias:"opus-4.8",canonicalId:"claude-opus-4-8",vendor:"claude",label:"Claude \xB7 Opus 4.8",family:"claude-opus-4",pickerVisible:!0},{alias:"opus-4-8",canonicalId:"claude-opus-4-8",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.8"},{alias:"sonnet-4.8",canonicalId:"claude-sonnet-4-6",vendor:"claude",family:"claude-sonnet-4"},{alias:"sonnet-4-8",canonicalId:"claude-sonnet-4-6",vendor:"claude",family:"claude-sonnet-4",aliasOf:"sonnet-4.8"},{alias:"opus-4.7",canonicalId:"claude-opus-4-7",vendor:"claude",label:"Claude \xB7 Opus 4.7",family:"claude-opus-4",pickerVisible:!0},{alias:"opus-4-7",canonicalId:"claude-opus-4-7",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.7"},{alias:"sonnet-4.7",canonicalId:"claude-sonnet-4-6",vendor:"claude",family:"claude-sonnet-4"},{alias:"sonnet-4-7",canonicalId:"claude-sonnet-4-6",vendor:"claude",family:"claude-sonnet-4",aliasOf:"sonnet-4.7"},{alias:"sonnet-4.6",canonicalId:"claude-sonnet-4-6",vendor:"claude",family:"claude-sonnet-4",aliasOf:"auto"},{alias:"sonnet-4-6",canonicalId:"claude-sonnet-4-6",vendor:"claude",family:"claude-sonnet-4",aliasOf:"auto"},{alias:"opus-4.6",canonicalId:"claude-opus-4-6",vendor:"claude",label:"Claude \xB7 Opus 4.6",family:"claude-opus-4",pickerVisible:!0},{alias:"opus-4-6",canonicalId:"claude-opus-4-6",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.6"},{alias:"sonnet-4.5",canonicalId:"claude-sonnet-4-5-20250929",vendor:"claude",label:"Claude \xB7 Sonnet 4.5",family:"claude-sonnet-4",pickerVisible:!0},{alias:"sonnet-4-5",canonicalId:"claude-sonnet-4-5-20250929",vendor:"claude",family:"claude-sonnet-4",aliasOf:"sonnet-4.5"},{alias:"opus-4.5",canonicalId:"claude-opus-4-5-20251101",vendor:"claude",label:"Claude \xB7 Opus 4.5",family:"claude-opus-4",pickerVisible:!0},{alias:"opus-4-5",canonicalId:"claude-opus-4-5-20251101",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.5"},{alias:"haiku-4.5",canonicalId:"claude-haiku-4-5-20251001",vendor:"claude",label:"Claude \xB7 Haiku 4.5",family:"claude-haiku-4"},{alias:"haiku-4-5",canonicalId:"claude-haiku-4-5-20251001",vendor:"claude",family:"claude-haiku-4",aliasOf:"haiku-4.5"},{alias:"claude-opus-4-8",canonicalId:"claude-opus-4-8",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.8"},{alias:"claude-sonnet-4-8",canonicalId:"claude-sonnet-4-6",vendor:"claude",family:"claude-sonnet-4",aliasOf:"sonnet-4.8"},{alias:"claude-opus-4-7",canonicalId:"claude-opus-4-7",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.7"},{alias:"claude-sonnet-4-7",canonicalId:"claude-sonnet-4-6",vendor:"claude",family:"claude-sonnet-4",aliasOf:"sonnet-4.7"},{alias:"claude-sonnet-4-6",canonicalId:"claude-sonnet-4-6",vendor:"claude",family:"claude-sonnet-4",aliasOf:"auto"},{alias:"claude-opus-4-6",canonicalId:"claude-opus-4-6",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.6"},{alias:"claude-sonnet-4-5-20250929",canonicalId:"claude-sonnet-4-5-20250929",vendor:"claude",family:"claude-sonnet-4",aliasOf:"sonnet-4.5"},{alias:"claude-opus-4-5-20251101",canonicalId:"claude-opus-4-5-20251101",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.5"},{alias:"claude-haiku-4-5-20251001",canonicalId:"claude-haiku-4-5-20251001",vendor:"claude",family:"claude-haiku-4",aliasOf:"haiku-4.5"},{alias:"claude-opus-4-20250514",canonicalId:"claude-opus-4-20250514",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.5"},{alias:"auto",canonicalId:"o4-mini",vendor:"codex",label:"Codex \xB7 o4-mini",family:"o4-mini",isDefault:!0},{alias:"o4-mini",canonicalId:"o4-mini",vendor:"codex",label:"Codex \xB7 o4-mini",family:"o4-mini",pickerVisible:!0},{alias:"o3",canonicalId:"o3",vendor:"codex",family:"o3"},{alias:"o3-mini",canonicalId:"o3-mini",vendor:"codex",family:"o3-mini"},{alias:"codex-mini",canonicalId:"codex-mini-latest",vendor:"codex",family:"codex-mini"},{alias:"gpt-4o",canonicalId:"gpt-4o",vendor:"codex",label:"Codex \xB7 GPT-4o",family:"gpt-4o",pickerVisible:!0},{alias:"gpt-4o-mini",canonicalId:"gpt-4o-mini",vendor:"codex",label:"Codex \xB7 GPT-4o mini",family:"gpt-4o-mini",pickerVisible:!0},{alias:"gpt-5.2-codex",canonicalId:"gpt-5.2-codex",vendor:"codex",label:"Codex \xB7 GPT-5.2",family:"gpt-5",pickerVisible:!0},{alias:"gpt-5.2",canonicalId:"gpt-5.2",vendor:"codex",label:"Codex \xB7 GPT-5.2 base",family:"gpt-5",pickerVisible:!0},{alias:"gpt-5.3",canonicalId:"gpt-5.3",vendor:"codex",label:"Codex \xB7 GPT-5.3",family:"gpt-5",pickerVisible:!0},{alias:"gpt-5.3-codex",canonicalId:"gpt-5.3-codex",vendor:"codex",family:"gpt-5"},{alias:"gpt-5.4",canonicalId:"gpt-5.4",vendor:"codex",label:"Codex \xB7 GPT-5.4",family:"gpt-5",pickerVisible:!0},{alias:"gpt-5.5",canonicalId:"gpt-5.5",vendor:"codex",label:"Codex \xB7 GPT-5.5",family:"gpt-5",pickerVisible:!0},{alias:"auto",canonicalId:"gemini-3-pro",vendor:"gemini",label:"Gemini \xB7 3 Pro",family:"gemini-3",isDefault:!0},{alias:"gemini-3-pro",canonicalId:"gemini-3-pro",vendor:"gemini",label:"Gemini \xB7 3 Pro",family:"gemini-3",pickerVisible:!0},{alias:"gemini-3-flash",canonicalId:"gemini-3-flash",vendor:"gemini",label:"Gemini \xB7 3 Flash",family:"gemini-3",pickerVisible:!0},{alias:"gemini-2.5-pro",canonicalId:"gemini-2.5-pro",vendor:"gemini",label:"Gemini \xB7 2.5 Pro",family:"gemini-2.5",pickerVisible:!0},{alias:"gemini-2.5-flash",canonicalId:"gemini-2.5-flash",vendor:"gemini",label:"Gemini \xB7 2.5 Flash",family:"gemini-2.5",pickerVisible:!0}];function $(i){let e={};for(let t of re)t.vendor===i&&(e[t.alias]=t.canonicalId);return e}function se(i,e){let t=typeof e=="string"?e.trim():"";if(t&&t!=="auto")return t;if(t==="auto"&&re.some(n=>n.vendor===i&&n.isDefault))return"auto";throw new Error(`[${i}] No model reached this LLM call: the node passed none, no config sets one, and the run carries none (MODEL env unset). Refusing to silently substitute a vendor default \u2014 pick a model on the agent (deploy modal / MODEL cell) or pass options.model explicitly.`)}var Ye=$("claude"),Ue=$("codex"),oe=$("gemini"),Ve={CURSOR_AGENT_DEFAULT:1200*1e3,OPENAI_REQUEST:18e4};import{z as le}from"zod";import{zodToJsonSchema as Se}from"zod-to-json-schema";function ve(i){if(!i)return null;if(typeof le?.toJSONSchema=="function")try{return le.toJSONSchema(i)}catch{}try{return Se(i,{target:"openApi3"})}catch{return null}}var D=class{static generateFileOutputInstructions(e,t){let n;typeof e?.parse=="function"?n=ve(e):n=e;let s=this._buildExample(n);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 @@ ${e.trim()}`;this.systemInstructions.push({type:"extra_instructions",content:t,p
|
|
|
31
31
|
`)}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(n=>n.type)}}clone(){let e=new i(this.userPrompt);return e.systemInstructions=[...this.systemInstructions],e.metadata={...this.metadata},e}};var K=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(`
|
|
32
32
|
`);this.buffer=t.pop()||"";let n="";for(let s of t)if(s.trim())try{let o=JSON.parse(s);this._emitToolCalls(o);let r=this.extractText(o);if(r){if(this.rawText&&r.startsWith(this.rawText)){let l=r.substring(this.rawText.length);this.rawText=r,n+=l}else(!this.rawText.includes(r)||r.length<20)&&(this.rawText+=r,n+=r);this.tryExtractResult(this.rawText)}else this.isValidResult(o)&&(this.rawText+=`${s}
|
|
33
33
|
`,n+=`${s}
|
|
34
|
-
`,this.extractedResult=o)}catch{if(s.includes('"text"')||s.includes('"content"')){let r=s.match(/"text"\s*:\s*"([^"]*)/),l=s.match(/"content"\s*:\s*"([^"]*)/),a=r?r[1]:l?l[1]:null;a&&!this.rawText.includes(a)&&(n+=a,this.rawText+=a)}}return n||null}flush(){if(!this.buffer.trim())return null;let e="";try{let t=JSON.parse(this.buffer);this._emitToolCalls(t);let n=this.extractText(t);n&&(this.rawText+=n,e+=n,this.tryExtractResult(n))}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=(r,l)=>{if(!r)return;let a=`${r}:${JSON.stringify(l??{})}`;this._lastToolEmit!==a&&(this._lastToolEmit=a,this.onToolCall(r,l??void 0))},n=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(e.type==="tool_use"||e.type==="tool_call"){if(e.name){t(e.name,n(e.input??e.arguments));return}let r=e.tool_call;if(r&&typeof r=="object"&&!Array.isArray(r)){let l=Object.keys(r);if(l.length===1){let a=l[0],u=r[a],f=u&&typeof u=="object"?u.args??u.input??u:void 0;t(a,n(f))}return}return}if(Array.isArray(e.tool_calls)){for(let r of e.tool_calls)t(r.name,n(r.input??r.arguments));return}let s=e.message??e;if(Array.isArray(s?.tool_calls)){for(let r of s.tool_calls)t(r.name,n(r.input??r.arguments));return}let o=s?.content??e.content;if(Array.isArray(o))for(let r of o)(r.type==="tool_use"||r.type==="tool_call")&&r.name&&t(r.name,n(r.input??r.arguments))}extractText(e){if(e.type==="assistant"&&e.message?.content){let t=e.message.content;if(Array.isArray(t))return t.filter(n=>n.type==="text"&&n.text).map(n=>n.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=[],n=/```json\s*\n?([\s\S]*?)\n?```/g,s;for(;(s=n.exec(e))!==null;){let
|
|
35
|
-
${d}`,"schema_instruction","append");let O=`zibby-result-${Date.now()}.json`,I=
|
|
36
|
-
${d}`,"json_instruction","append")}let
|
|
37
|
-
\u25C6 Model: ${
|
|
34
|
+
`,this.extractedResult=o)}catch{if(s.includes('"text"')||s.includes('"content"')){let r=s.match(/"text"\s*:\s*"([^"]*)/),l=s.match(/"content"\s*:\s*"([^"]*)/),a=r?r[1]:l?l[1]:null;a&&!this.rawText.includes(a)&&(n+=a,this.rawText+=a)}}return n||null}flush(){if(!this.buffer.trim())return null;let e="";try{let t=JSON.parse(this.buffer);this._emitToolCalls(t);let n=this.extractText(t);n&&(this.rawText+=n,e+=n,this.tryExtractResult(n))}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=(r,l)=>{if(!r)return;let a=`${r}:${JSON.stringify(l??{})}`;this._lastToolEmit!==a&&(this._lastToolEmit=a,this.onToolCall(r,l??void 0))},n=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(e.type==="tool_use"||e.type==="tool_call"){if(e.name){t(e.name,n(e.input??e.arguments));return}let r=e.tool_call;if(r&&typeof r=="object"&&!Array.isArray(r)){let l=Object.keys(r);if(l.length===1){let a=l[0],u=r[a],f=u&&typeof u=="object"?u.args??u.input??u:void 0;t(a,n(f))}return}return}if(Array.isArray(e.tool_calls)){for(let r of e.tool_calls)t(r.name,n(r.input??r.arguments));return}let s=e.message??e;if(Array.isArray(s?.tool_calls)){for(let r of s.tool_calls)t(r.name,n(r.input??r.arguments));return}let o=s?.content??e.content;if(Array.isArray(o))for(let r of o)(r.type==="tool_use"||r.type==="tool_call")&&r.name&&t(r.name,n(r.input??r.arguments))}extractText(e){if(e.type==="assistant"&&e.message?.content){let t=e.message.content;if(Array.isArray(t))return t.filter(n=>n.type==="text"&&n.text).map(n=>n.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=[],n=/```json\s*\n?([\s\S]*?)\n?```/g,s;for(;(s=n.exec(e))!==null;){let p=s[1].trim();try{JSON.parse(p),t.push({text:p,source:"markdown"})}catch{}}let o=0,r=0;for(;o<e.length&&(o=e.indexOf("{",o),o!==-1);){let p=0,g=o;for(let m=o;m<e.length;m++)if(e[m]==="{")p++;else if(e[m]==="}"&&(p--,p===0)){g=m,t.push({text:e.substring(o,g+1),source:"brace"}),r++;break}o=g+1}let l=this.extractedResult,a=l?JSON.stringify(l).length:0,u=0,f=-1;for(let p=0;p<t.length;p++){let g=t[p];try{let m=g.text.replace(/,(\s*[}\]])/g,"$1"),x=JSON.parse(m);this.isValidResult(x)&&(u++,a=JSON.stringify(x).length,l=x,f=p)}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 n=new i;n.zodSchema=t,n.processChunk(e),n.flush();let s=n.getResult();return!s&&process.env.LOG_LEVEL==="debug"&&console.error("[StreamingParser] No result extracted from",e?.length||0,"chars"),s}};function j(i){let e=`${i}_POOL`,t=process.env[e];if(!t||typeof t!="string")return{picked:null,count:0,dispose:()=>{}};let n=t.split(/[,\n]+/).map(r=>r.trim()).filter(Boolean);if(n.length===0)return{picked:null,count:0,dispose:()=>{}};let s=n[Math.floor(Math.random()*n.length)],o=process.env[i];return process.env[i]=s,c.debug(`[auth-pool] ${i}: picked 1 of ${n.length} from pool (***${s.slice(-4)})`),{picked:s,count:n.length,dispose(){o===void 0?delete process.env[i]:process.env[i]=o}}}function we(i){if(!i)return null;let e=String(i),t=e.match(/```(?:json)?\s*([\s\S]*?)```/i);if(t?.[1])try{return JSON.parse(t[1].trim())}catch{}let n=e.indexOf("{");if(n<0)return null;let s=0,o=!1,r=!1,l=-1;for(let a=n;a<e.length;a++){let u=e[a];if(o){r?r=!1:u==="\\"?r=!0:u==='"'&&(o=!1);continue}if(u==='"'){o=!0;continue}if(u==="{"){s===0&&(l=a),s+=1;continue}if(u==="}"){if(s===0)continue;if(s-=1,s===0&&l>=0){let f=e.slice(l,a+1);try{return JSON.parse(f)}catch{l=-1}}}}return null}function ke(i){let e=String(i||"").trim();if(!e)return null;try{return JSON.parse(e)}catch{return we(e)}}function Ge(i){try{let e=JSON.parse(i);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 n=t.content.parts.map(s=>typeof s?.text=="string"?s.text:"").join("");if(n.trim())return n}}}catch{}return i}var de=class extends be{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 c.debug("GeminiAgentStrategy: GEMINI_API_KEY or GOOGLE_API_KEY not set"),!1;try{return Te("gemini --version",{encoding:"utf-8",timeout:5e3,stdio:"pipe"}),!0}catch{return c.warn("[Gemini] gemini CLI not found. Install: npm install -g @google/gemini-cli"),!1}}async invoke(e,t={}){let{model:n,workspace:s=process.cwd(),schema:o=null,skills:r=null,sessionPath:l=null,nodeName:a=null,timeout:u=600*1e3,signal:f=null}=t,p=[j("GEMINI_API_KEY"),j("GOOGLE_API_KEY")];try{let g=se("gemini",n),m=oe[g]||g,x=String(process.env.GEMINI_API_KEY||"").trim(),Y=String(process.env.GOOGLE_API_KEY||"").trim(),C=this._resolveSkillsToMcp(r,{sessionPath:l,workspace:s,nodeName:a}),pe=Object.keys(C).length>0,T=new J(e),U=o&&typeof o.parse=="function",A=null;if(o){let d;try{let O=U?ie(o,{target:"openAi"}):o;d=JSON.stringify(O,null,2)}catch{d="{}"}if(pe){T.addSystemInstruction(`Write valid JSON that matches this schema:
|
|
35
|
+
${d}`,"schema_instruction","append");let O=`zibby-result-${Date.now()}.json`,I=b(s,".zibby","tmp");A=b(I,O),ce(I,{recursive:!0}),T.addStructuredOutput(o,A)}else T.addSystemInstruction(`Return ONLY valid JSON (no markdown, no commentary) that matches this schema:
|
|
36
|
+
${d}`,"json_instruction","append")}let me=T.build(),ge=T.getUserPrompt(),L=T.getStats(),Z=String(process.env.GEMINI_API_KEY||process.env.GOOGLE_API_KEY||"").trim(),ye=Z?` | key: ***${Z.slice(-4)}`:" | key: not set";console.log(`
|
|
37
|
+
\u25C6 Model: ${m||"auto"}${ye}
|
|
38
38
|
`);let M=(await import("chalk")).default;console.log(`
|
|
39
|
-
${M.bold("Prompt sent to LLM:")}`),console.log(M.dim("\u2500".repeat(60))),console.log(M.dim(
|
|
39
|
+
${M.bold("Prompt sent to LLM:")}`),console.log(M.dim("\u2500".repeat(60))),console.log(M.dim(ge)),console.log(M.dim("\u2500".repeat(60)));let V=this._createGeminiConfigDir(s,C),S=["--output-format","json"];m&&m!=="auto"&&S.push("--model",m);let B=Object.keys(C);if(B.length>0){S.push("--approval-mode","yolo");for(let d of B)S.push("--allowed-mcp-server-names",d);c.info(`[Gemini] Enabling MCP servers: ${B.join(", ")}`)}else r&&r.length>0&&c.warn(`[Gemini] Skills requested but no MCP servers configured: ${r.join(", ")}`);S.push("-p",me);let N={...te(process.env),GEMINI_CLI_HOME:V};x?(N.GEMINI_API_KEY=x,delete N.GOOGLE_API_KEY):Y&&(N.GOOGLE_API_KEY=Y,delete N.GEMINI_API_KEY),c.debug(`[Gemini] Command: gemini ${S.slice(0,8).join(" ")}... (${S.length} total args)`),c.debug(`[Gemini] User prompt: ${L.userPromptLength} chars, System instructions: ${L.systemInstructionsLength} chars (${L.instructionCount} blocks), Full: ${L.fullPromptLength} chars`),c.debug(`[Gemini] Config home: ${V}`),c.debug(`[Gemini] GEMINI_CLI_HOME env: ${N.GEMINI_CLI_HOME}`);let F="",w=null;try{F=await new Promise((O,I)=>{let E=Ae("gemini",S,{cwd:s,env:N,stdio:["ignore","pipe","pipe"],...f&&{signal:f}}),z="",X="",H=!1,G=null,q=!1,Q=setTimeout(()=>{try{E.kill("SIGTERM")}catch{}},u),R=()=>{q||H||(q=!0,G=setTimeout(()=>{if(!H)try{E.kill("SIGKILL")}catch{}},5e3))};f&&(f.aborted?R():f.addEventListener("abort",R,{once:!0})),E.stdout.on("data",_=>{z+=_.toString()}),E.stderr.on("data",_=>{X+=_.toString()}),E.on("error",_=>{if(clearTimeout(Q),G&&clearTimeout(G),f&&!f.aborted)try{f.removeEventListener("abort",R)}catch{}I(_)}),E.on("close",_=>{if(H=!0,clearTimeout(Q),G&&clearTimeout(G),f&&!f.aborted)try{f.removeEventListener("abort",R)}catch{}if(q){let ee=new Error("Aborted via signal");return ee.name="AbortError",I(ee)}if(_===0)return O(z.trim());I(new Error(`gemini failed with code ${_}: ${(X||z).trim()}`))})})}catch(d){w=d}finally{try{Ne(V,{recursive:!0,force:!0})}catch{}}let h=Ge(F).trim();if(!o){if(w)throw w;return h}if(A){let d=ae(A);if(c.info(`[Gemini] Result file: ${d?"present":"missing"} at ${A}`),d)try{let O=ue(A,"utf-8").trim(),I=JSON.parse(O),E=U?o.parse(I):I;return c.info("[Gemini] Structured output recovered from result file"),{raw:h,structured:E}}catch(O){c.warn(`[Gemini] Result file parse/validation failed: ${O.message}`)}else w||c.warn("[Gemini] Result file missing; falling back to stream-parsed JSON")}let v=null;if(o){let d=new K;d.zodSchema=o,d.processChunk(h),d.flush(),v=d.getResult()}if(c.info(`[Gemini] Raw stdout length: ${F.length} chars`),c.info(`[Gemini] Extracted text length: ${h.length} chars`),c.info(`[Gemini] StreamParser result: ${v?"extracted":"null"}`),v||(h.length<2e3?c.info(`[Gemini] Raw text preview:
|
|
40
40
|
${h}`):c.info(`[Gemini] Raw text preview (first 1000 chars):
|
|
41
|
-
${h.slice(0,1e3)}`),
|
|
42
|
-
`,"utf-8");let f=
|
|
43
|
-
`,"utf-8")}catch{}return c.debug(`[Gemini] Created isolated config with ${Object.keys(u.mcpServers||{}).length} MCP servers`),c.debug(`[Gemini] MCP servers: ${JSON.stringify(Object.keys(u.mcpServers||{}),null,2)}`),s}};export{
|
|
41
|
+
${h.slice(0,1e3)}`),v=ke(h)),!v)throw w||(c.error("[Gemini] Failed to extract valid JSON from output"),c.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 he=U?o.parse(v):v;return{raw:h,structured:he}}finally{for(let g of p)g.dispose()}}_resolveSkillsToMcp(e,t={}){if(!Array.isArray(e)||e.length===0)return{};let n={};for(let s of e){let o=xe(s);if(!o||typeof o.resolve!="function")continue;let r=o.resolve(t);if(!r)continue;let l=o.cursorKey||o.serverName||s,a={command:r.command};r.args?.length&&(a.args=r.args),r.env&&Object.keys(r.env).length>0&&(a.env=r.env),r.cwd&&(a.cwd=r.cwd),n[l]=a}return n}_createGeminiConfigDir(e,t){let n=`${Date.now()}-${Math.random().toString(16).slice(2,10)}`,s=b(e||process.cwd(),".zibby","tmp",`gemini-home-${n}`),o=b(s,".gemini");ce(o,{recursive:!0});let r=b(o,"settings.json"),l={},a=b(process.env.HOME||"",".gemini","settings.json");if(ae(a))try{l=JSON.parse(ue(a,"utf-8"))}catch{l={}}let u={...l,mcpServers:{...l.mcpServers&&typeof l.mcpServers=="object"?l.mcpServers:{},...t||{}}};fe(r,`${JSON.stringify(u,null,2)}
|
|
42
|
+
`,"utf-8");let f=b(e||process.cwd(),".zibby","tmp","gemini-settings-debug.json");try{fe(f,`${JSON.stringify(u,null,2)}
|
|
43
|
+
`,"utf-8")}catch{}return c.debug(`[Gemini] Created isolated config with ${Object.keys(u.mcpServers||{}).length} MCP servers`),c.debug(`[Gemini] MCP servers: ${JSON.stringify(Object.keys(u.mcpServers||{}),null,2)}`),s}};export{de as GeminiAgentStrategy};
|